193361 2019-01-11 13:17:13 -0800 Regression(PSON) View becomes blank after click a cross-site download link 2019-01-16 14:20:50 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 193509 1 cdumez cdumez achristensen beidson berto cgarcia commit-queue dbates ews-watchlist ggaren gustavo japhet koivisto mcatanzaro mkwst webkit-bug-importer oldest_to_newest 1493773 0 cdumez 2019-01-11 13:17:13 -0800 View becomes blank after click a cross-site download link when process-swap on navigation is disabled. 1493774 1 cdumez 2019-01-11 13:17:30 -0800 <rdar://problem/47099573> 1493776 2 358934 cdumez 2019-01-11 13:19:17 -0800 Created attachment 358934 Prototype Passes all ProcessSwap API tests in debug and fixes the cross-site download case. 1493840 3 358950 cdumez 2019-01-11 14:50:41 -0800 Created attachment 358950 Prototype 1493843 4 ews-watchlist 2019-01-11 14:53:38 -0800 Attachment 358950 did not pass style-queue: ERROR: /Volumes/Data/StyleQueue/WebKit/LayoutTests/TestExpectations:2912: Duplicate or ambiguous entry lines LayoutTests/TestExpectations:130 and LayoutTests/TestExpectations:2912. [test/expectations] [5] Total errors found: 1 in 22 files If any of these errors are false positives, please file a bug against check-webkit-style. 1493845 5 358953 cdumez 2019-01-11 14:57:28 -0800 Created attachment 358953 Prototype 1493872 6 358960 cdumez 2019-01-11 16:18:39 -0800 Created attachment 358960 Prototype (with test) 1493875 7 ews-watchlist 2019-01-11 16:21:58 -0800 Attachment 358960 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1470: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1472: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1474: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] Total errors found: 3 in 21 files If any of these errors are false positives, please file a bug against check-webkit-style. 1493878 8 358961 cdumez 2019-01-11 16:30:36 -0800 Created attachment 358961 Prototype (with test) 1493883 9 ews-watchlist 2019-01-11 16:35:09 -0800 Attachment 358961 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1470: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1472: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1474: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] Total errors found: 3 in 21 files If any of these errors are false positives, please file a bug against check-webkit-style. 1494183 10 359047 cdumez 2019-01-14 09:54:50 -0800 Created attachment 359047 Patch 1494184 11 ews-watchlist 2019-01-14 09:57:12 -0800 Attachment 359047 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1476: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1478: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1480: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] Total errors found: 3 in 25 files If any of these errors are false positives, please file a bug against check-webkit-style. 1494269 12 359071 cdumez 2019-01-14 13:10:32 -0800 Created attachment 359071 Patch 1494270 13 ews-watchlist 2019-01-14 13:12:37 -0800 Attachment 359071 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1476: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1478: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1480: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] Total errors found: 3 in 25 files If any of these errors are false positives, please file a bug against check-webkit-style. 1494352 14 359086 cdumez 2019-01-14 15:41:37 -0800 Created attachment 359086 Patch 1494354 15 ews-watchlist 2019-01-14 15:43:21 -0800 Attachment 359086 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1476: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1478: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1480: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] Total errors found: 3 in 25 files If any of these errors are false positives, please file a bug against check-webkit-style. 1494357 16 359088 cdumez 2019-01-14 15:49:42 -0800 Created attachment 359088 Patch 1494358 17 ews-watchlist 2019-01-14 15:51:58 -0800 Attachment 359088 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1476: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1478: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1480: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] Total errors found: 3 in 25 files If any of these errors are false positives, please file a bug against check-webkit-style. 1494369 18 359092 cdumez 2019-01-14 16:06:45 -0800 Created attachment 359092 Patch 1494371 19 ews-watchlist 2019-01-14 16:10:02 -0800 Attachment 359092 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1476: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1478: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1480: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] Total errors found: 3 in 25 files If any of these errors are false positives, please file a bug against check-webkit-style. 1494473 20 359119 cdumez 2019-01-14 19:21:44 -0800 Created attachment 359119 Patch 1494475 21 ews-watchlist 2019-01-14 19:24:20 -0800 Attachment 359119 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1476: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1478: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1480: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] Total errors found: 3 in 25 files If any of these errors are false positives, please file a bug against check-webkit-style. 1494489 22 359119 cdumez 2019-01-14 19:55:46 -0800 Comment on attachment 359119 Patch Nevermind, I found breakage. 1494582 23 359119 koivisto 2019-01-15 02:25:57 -0800 Comment on attachment 359119 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=359119&action=review > Source/WebKit/ChangeLog:77 > + Add new ProvisionalPageProxy class to wrap the provisional load in the new process > + after a swap. The provisional page is owned by the WebPageProxy and we only commit > + the provisional page when the load is committed. Until then, the WebPageProxy keeps > + using the old process and displaying the current content. Adding another proxy with message handling etc is bit unfortunate. I suppose this ends up cleaner than just expanding/renaming SuspendedPageProxy? > Source/WebKit/WebProcess/WebPage/WebPage.cpp:475 > - if (parameters.isSwapFromSuspended) > + if (parameters.isProcessSwap) > freezeLayerTree(LayerTreeFreezeReason::SwapFromSuspended); Could rename the LayerTreeFreezeReason as well. 1494643 24 359119 cdumez 2019-01-15 08:41:37 -0800 Comment on attachment 359119 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=359119&action=review >> Source/WebKit/ChangeLog:77 >> + using the old process and displaying the current content. > > Adding another proxy with message handling etc is bit unfortunate. I suppose this ends up cleaner than just expanding/renaming SuspendedPageProxy? There really isn't that much duplicated logic between SuspendedPageProxy and ProvisionalPageProxy though. The 2 classes almost have opposite purposes. Maybe I could introduce a base class and see what could be shared? Maybe some of the IPC related logic? 1494644 25 359119 cdumez 2019-01-15 08:42:50 -0800 Comment on attachment 359119 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=359119&action=review >> Source/WebKit/WebProcess/WebPage/WebPage.cpp:475 >> freezeLayerTree(LayerTreeFreezeReason::SwapFromSuspended); > > Could rename the LayerTreeFreezeReason as well. Oh, makes sense. Will do. 1494647 26 359163 cdumez 2019-01-15 08:45:27 -0800 Created attachment 359163 Patch 1494648 27 ews-watchlist 2019-01-15 08:47:30 -0800 Attachment 359163 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1476: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1478: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1480: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] Total errors found: 3 in 26 files If any of these errors are false positives, please file a bug against check-webkit-style. 1494657 28 359165 cdumez 2019-01-15 09:15:36 -0800 Created attachment 359165 Patch 1494659 29 ews-watchlist 2019-01-15 09:17:39 -0800 Attachment 359165 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1476: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1478: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1480: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] Total errors found: 3 in 26 files If any of these errors are false positives, please file a bug against check-webkit-style. 1494662 30 359166 cdumez 2019-01-15 09:37:12 -0800 Created attachment 359166 Patch 1494666 31 ews-watchlist 2019-01-15 09:40:30 -0800 Attachment 359166 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1476: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1478: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1480: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Source/WebKit/UIProcess/WebProcessProxy.cpp:707: More than one command on the same line [whitespace/newline] [4] Total errors found: 4 in 26 files If any of these errors are false positives, please file a bug against check-webkit-style. 1494667 32 359168 cdumez 2019-01-15 09:44:50 -0800 Created attachment 359168 Patch 1494670 33 ews-watchlist 2019-01-15 09:47:38 -0800 Attachment 359168 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1476: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1478: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1480: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Source/WebKit/UIProcess/WebProcessProxy.cpp:707: More than one command on the same line [whitespace/newline] [4] Total errors found: 4 in 26 files If any of these errors are false positives, please file a bug against check-webkit-style. 1494671 34 359169 cdumez 2019-01-15 09:54:02 -0800 Created attachment 359169 Patch 1494672 35 ews-watchlist 2019-01-15 09:57:42 -0800 Attachment 359169 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1476: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1478: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1480: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Source/WebKit/UIProcess/WebProcessProxy.cpp:707: More than one command on the same line [whitespace/newline] [4] Total errors found: 4 in 26 files If any of these errors are false positives, please file a bug against check-webkit-style. 1494691 36 359169 ggaren 2019-01-15 10:18:24 -0800 Comment on attachment 359169 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=359169&action=review r=me Nice and risky, just like a good old JSC patch! > Source/WebKit/UIProcess/WebPageProxy.cpp:554 > +DrawingAreaProxy* WebPageProxy::drawingArea() const > +{ > + if (m_provisionalPage && m_process.ptr() == &m_provisionalPage->process() && m_provisionalPage->drawingArea()) > + return m_provisionalPage->drawingArea(); > + return m_drawingArea.get(); > +} Why do we want to return the drawing area of the provisional page? My understanding is that we prefer to "lock the layer tree" and avoid drawing a page until it becomes committed. > Source/WebKit/UIProcess/WebPageProxy.cpp:3886 > + // The load did not fail, it merely happening in a new provisional process. it is merely happening 1494695 37 359169 cdumez 2019-01-15 10:21:37 -0800 Comment on attachment 359169 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=359169&action=review >> Source/WebKit/UIProcess/WebPageProxy.cpp:554 >> +} > > Why do we want to return the drawing area of the provisional page? My understanding is that we prefer to "lock the layer tree" and avoid drawing a page until it becomes committed. I had to make this change for the swipe gesture snapshot logic. A drawing area is associated to a particular process and it is important for WebPageProxy::drawingArea() and WebPageProxy::process() to be in sync to the ViewGestureController logic to work. 1494698 38 359176 cdumez 2019-01-15 10:24:23 -0800 Created attachment 359176 Patch 1494700 39 ews-watchlist 2019-01-15 10:27:00 -0800 Attachment 359176 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1476: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1478: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1480: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Source/WebKit/UIProcess/WebProcessProxy.cpp:707: More than one command on the same line [whitespace/newline] [4] Total errors found: 4 in 26 files If any of these errors are false positives, please file a bug against check-webkit-style. 1494720 40 commit-queue 2019-01-15 11:01:01 -0800 The commit-queue encountered the following flaky tests while processing attachment 359176: fetch/fetch-worker-crash.html bug 187257 (author: youennf@gmail.com) The commit-queue is continuing to process your patch. 1494721 41 359176 commit-queue 2019-01-15 11:01:50 -0800 Comment on attachment 359176 Patch Clearing flags on attachment: 359176 Committed r239993: <https://trac.webkit.org/changeset/239993> 1494722 42 commit-queue 2019-01-15 11:01:52 -0800 All reviewed patches have been landed. Closing bug. 1494750 43 cdumez 2019-01-15 12:05:01 -0800 Follow-up iOS build fix: <https://trac.webkit.org/changeset/239995> 1494760 44 achristensen 2019-01-15 12:30:16 -0800 Another follow-up build fix for iOS: http://trac.webkit.org/r239997 1494862 45 cdumez 2019-01-15 15:48:37 -0800 Reverted r239993, r239995, r239997, and r239999 for reason: Caused assertions under ViewGestureController::disconnectFromProcess() Committed r240015: <https://trac.webkit.org/changeset/240015> 1494863 46 cdumez 2019-01-15 15:48:39 -0800 Reverted r239993, r239995, r239997, and r239999 for reason: Caused assertions under ViewGestureController::disconnectFromProcess() Committed r240015: <https://trac.webkit.org/changeset/240015> 1495017 47 359256 cdumez 2019-01-15 22:00:15 -0800 Created attachment 359256 WIP Patch Working on a more robust iteration which does not require temporarily overriding WebPageProxy::m_process in various places. Still needs more testing though. 1495018 48 ews-watchlist 2019-01-15 22:02:29 -0800 Attachment 359256 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1476: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1478: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1480: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Source/WebKit/UIProcess/WebProcessProxy.cpp:707: More than one command on the same line [whitespace/newline] [4] Total errors found: 4 in 47 files If any of these errors are false positives, please file a bug against check-webkit-style. 1495084 49 359269 cdumez 2019-01-16 09:13:45 -0800 Created attachment 359269 WIP Patch 1495085 50 ews-watchlist 2019-01-16 09:16:19 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1495087 51 ews-watchlist 2019-01-16 09:16:56 -0800 Attachment 359269 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1476: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1478: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1480: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Source/WebKit/UIProcess/WebProcessProxy.cpp:707: More than one command on the same line [whitespace/newline] [4] Total errors found: 4 in 52 files If any of these errors are false positives, please file a bug against check-webkit-style. 1495095 52 359274 cdumez 2019-01-16 10:01:17 -0800 Created attachment 359274 Patch 1495097 53 ews-watchlist 2019-01-16 10:03:39 -0800 Attachment 359274 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1476: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1478: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1480: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Source/WebKit/UIProcess/WebProcessProxy.cpp:707: More than one command on the same line [whitespace/newline] [4] Total errors found: 4 in 57 files If any of these errors are false positives, please file a bug against check-webkit-style. 1495153 54 359274 ggaren 2019-01-16 12:02:26 -0800 Comment on attachment 359274 Patch r=me 1495170 55 359274 cdumez 2019-01-16 12:40:10 -0800 Comment on attachment 359274 Patch Clearing flags on attachment: 359274 Committed r240046: <https://trac.webkit.org/changeset/240046> 1495171 56 cdumez 2019-01-16 12:40:13 -0800 All reviewed patches have been landed. Closing bug. 1495208 57 cdumez 2019-01-16 13:45:38 -0800 Caused some non-PSON API tests failures: Test suite failed Crashed TestWebKitAPI.WebKit.ResizeWindowAfterCrash _RegisterApplication(), FAILED TO establish the default connection to the WindowServer, _CGSDefaultConnection() is NULL. _RegisterApplication(), FAILED TO establish the default connection to the WindowServer, _CGSDefaultConnection() is NULL. libc++abi.dylib: Pure virtual function called! TestWebKitAPI.WebKit.LoadPageAfterCrash _RegisterApplication(), FAILED TO establish the default connection to the WindowServer, _CGSDefaultConnection() is NULL. _RegisterApplication(), FAILED TO establish the default connection to the WindowServer, _CGSDefaultConnection() is NULL. libc++abi.dylib: Pure virtual function called! TestWebKitAPI.WebKit.EnumerateDevices _RegisterApplication(), FAILED TO establish the default connection to the WindowServer, _CGSDefaultConnection() is NULL. _RegisterApplication(), FAILED TO establish the default connection to the WindowServer, _CGSDefaultConnection() is NULL. libc++abi.dylib: Pure virtual function called! TestWebKitAPI.WKNavigation.FailureToStartWebProcessAfterCrashRecovery _RegisterApplication(), FAILED TO establish the default connection to the WindowServer, _CGSDefaultConnection() is NULL. _RegisterApplication(), FAILED TO establish the default connection to the WindowServer, _CGSDefaultConnection() is NULL. libc++abi.dylib: Pure virtual function called! TestWebKitAPI.WebKit.ReloadPageAfterCrash _RegisterApplication(), FAILED TO establish the default connection to the WindowServer, _CGSDefaultConnection() is NULL. _RegisterApplication(), FAILED TO establish the default connection to the WindowServer, _CGSDefaultConnection() is NULL. libc++abi.dylib: Pure virtual function called! Timeout TestWebKitAPI.WKNavigation.FailureToStartWebProcessRecovery _RegisterApplication(), FAILED TO establish the default connection to the WindowServer, _CGSDefaultConnection() is NULL. Investigating to see if I can quickly fix it or if I need to roll out. 1495231 58 cdumez 2019-01-16 14:20:50 -0800 (In reply to Chris Dumez from comment #57) > Caused some non-PSON API tests failures: > Test suite failed > > Crashed > > TestWebKitAPI.WebKit.ResizeWindowAfterCrash > _RegisterApplication(), FAILED TO establish the default connection > to the WindowServer, _CGSDefaultConnection() is NULL. > _RegisterApplication(), FAILED TO establish the default connection > to the WindowServer, _CGSDefaultConnection() is NULL. > libc++abi.dylib: Pure virtual function called! > > TestWebKitAPI.WebKit.LoadPageAfterCrash > _RegisterApplication(), FAILED TO establish the default connection > to the WindowServer, _CGSDefaultConnection() is NULL. > _RegisterApplication(), FAILED TO establish the default connection > to the WindowServer, _CGSDefaultConnection() is NULL. > libc++abi.dylib: Pure virtual function called! > > TestWebKitAPI.WebKit.EnumerateDevices > _RegisterApplication(), FAILED TO establish the default connection > to the WindowServer, _CGSDefaultConnection() is NULL. > _RegisterApplication(), FAILED TO establish the default connection > to the WindowServer, _CGSDefaultConnection() is NULL. > libc++abi.dylib: Pure virtual function called! > > TestWebKitAPI.WKNavigation.FailureToStartWebProcessAfterCrashRecovery > _RegisterApplication(), FAILED TO establish the default connection > to the WindowServer, _CGSDefaultConnection() is NULL. > _RegisterApplication(), FAILED TO establish the default connection > to the WindowServer, _CGSDefaultConnection() is NULL. > libc++abi.dylib: Pure virtual function called! > > TestWebKitAPI.WebKit.ReloadPageAfterCrash > _RegisterApplication(), FAILED TO establish the default connection > to the WindowServer, _CGSDefaultConnection() is NULL. > _RegisterApplication(), FAILED TO establish the default connection > to the WindowServer, _CGSDefaultConnection() is NULL. > libc++abi.dylib: Pure virtual function called! > > Timeout > > TestWebKitAPI.WKNavigation.FailureToStartWebProcessRecovery > _RegisterApplication(), FAILED TO establish the default connection > to the WindowServer, _CGSDefaultConnection() is NULL. > > Investigating to see if I can quickly fix it or if I need to roll out. Fixing those crashes / timeout via https://bugs.webkit.org/show_bug.cgi?id=193509. 358934 2019-01-11 13:19:17 -0800 2019-01-11 14:50:41 -0800 Prototype 193361_pson_provisional_process_wip.patch text/plain 67907 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDRjMjZhNjk4MWI0Li5lYmY5 NTBiYTZjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0yMDMyLDEx ICsyMDMyLDExIEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCgpCiAK ICAgICAgICAgT3B0aW9uYWw8SGFzSW5zZWN1cmVDb250ZW50PiBoYXNJbnNlY3VyZUNvbnRlbnQg PSBjYWNoZWRQYWdlLT5jYWNoZWRNYWluRnJhbWUoKS0+aGFzSW5zZWN1cmVDb250ZW50KCk7CiAK KyAgICAgICAgZGlzcGF0Y2hEaWRDb21taXRMb2FkKGhhc0luc2VjdXJlQ29udGVudCk7CisKICAg ICAgICAgLy8gRklYTUU6IFRoaXMgQVBJIHNob3VsZCBiZSB0dXJuZWQgYXJvdW5kIHNvIHRoYXQg d2UgZ3JvdW5kIENhY2hlZFBhZ2UgaW50byB0aGUgUGFnZS4KICAgICAgICAgY2FjaGVkUGFnZS0+ cmVzdG9yZSgqbV9mcmFtZS5wYWdlKCkpOwogCi0gICAgICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9h ZChoYXNJbnNlY3VyZUNvbnRlbnQpOwotCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICAg ICAgbV9mcmFtZS5wYWdlKCktPmNocm9tZSgpLnNldERpc3BhdGNoVmlld3BvcnREYXRhRGlkQ2hh bmdlU3VwcHJlc3NlZChmYWxzZSk7CiAgICAgICAgIG1fZnJhbWUucGFnZSgpLT5jaHJvbWUoKS5k aXNwYXRjaFZpZXdwb3J0UHJvcGVydGllc0RpZENoYW5nZShtX2ZyYW1lLnBhZ2UoKS0+dmlld3Bv cnRBcmd1bWVudHMoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVh dGlvblBhcmFtZXRlcnMuY3BwCmluZGV4IGNhMmRmNDBlZTFkLi42ZDA3YzAzYWQ4YyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAK KysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAK QEAgLTczLDcgKzczLDcgQEAgdm9pZCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUo SVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIuZW5jb2RlRW51bShsYXll ckhvc3RpbmdNb2RlKTsKICAgICBlbmNvZGVyIDw8IG1pbWVUeXBlc1dpdGhDdXN0b21Db250ZW50 UHJvdmlkZXJzOwogICAgIGVuY29kZXIgPDwgY29udHJvbGxlZEJ5QXV0b21hdGlvbjsKLSAgICBl bmNvZGVyIDw8IGlzU3dhcEZyb21TdXNwZW5kZWQ7CisgICAgZW5jb2RlciA8PCBpc1Byb2Nlc3NT d2FwOwogCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIGVuY29kZXIgPDwgY29sb3JTcGFjZTsKQEAg LTIyNyw3ICsyMjcsNyBAQCBPcHRpb25hbDxXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzPiBXZWJQ YWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoSVBDOjpEZWNvZAogICAgICAgICByZXR1cm4g V1RGOjpudWxsb3B0OwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5jb250cm9s bGVkQnlBdXRvbWF0aW9uKSkKICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKLSAgICBpZiAo IWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCkpCisgICAgaWYg KCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXApKQogICAgICAgICByZXR1 cm4gV1RGOjpudWxsb3B0OwogCiAjaWYgUExBVEZPUk0oTUFDKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktp dC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCmluZGV4IGFlNDMyNWNiZDVmLi5i MzgyY2VlZGQ0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlv blBhcmFtZXRlcnMuaApAQCAtMTI5LDcgKzEyOSw3IEBAIHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzIHsKICAgICBWZWN0b3I8U3RyaW5nPiBtaW1lVHlwZXNXaXRoQ3VzdG9tQ29udGVu dFByb3ZpZGVyczsKIAogICAgIGJvb2wgY29udHJvbGxlZEJ5QXV0b21hdGlvbjsKLSAgICBib29s IGlzU3dhcEZyb21TdXNwZW5kZWQgeyBmYWxzZSB9OworICAgIGJvb2wgaXNQcm9jZXNzU3dhcCB7 IGZhbHNlIH07CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgQ29sb3JTcGFjZURhdGEgY29sb3JT cGFjZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBvbGljeUFjdGlvbi5o IGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKaW5kZXggMTQyYTUxOGRm MDkuLjM5NzE3OTVjNDZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQb2xp Y3lBY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaApA QCAtMjksMTEgKzI5LDExIEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCisvLyBGSVhNRTogUmVt b3ZlIHRoaXMgdHlwZSBhbmQgdXNlIFdlYkNvcmU6OlBvbGljeUFjdGlvbiBpbnN0ZWFkLgogZW51 bSBjbGFzcyBXZWJQb2xpY3lBY3Rpb24gOiB1aW50OF90IHsKICAgICBVc2UsCiAgICAgRG93bmxv YWQsCi0gICAgSWdub3JlLAotICAgIFN1c3BlbmQKKyAgICBJZ25vcmUKIH07CiAKIH0KQEAgLTQ1 LDggKzQ1LDcgQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgRW51bVRyYWl0czxXZWJLaXQ6OldlYlBvbGlj eUFjdGlvbj4gewogICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlvbiwKICAgICAgICAgV2Vi S2l0OjpXZWJQb2xpY3lBY3Rpb246OlVzZSwKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rp b246OkRvd25sb2FkLAotICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6SWdub3JlLAot ICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6U3VzcGVuZAorICAgICAgICBXZWJLaXQ6 OldlYlBvbGljeUFjdGlvbjo6SWdub3JlCiAgICAgPjsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvU291cmNlcy50eHQgYi9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMudHh0CmluZGV4IGEw YjZmNzI4NDYwLi44YWVjYjg2NDcyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9Tb3VyY2Vz LnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMudHh0CkBAIC0yMzAsNiArMjMwLDcgQEAg VUlQcm9jZXNzL0luc3BlY3RvclRhcmdldFByb3h5LmNwcAogVUlQcm9jZXNzL1BhZ2VMb2FkU3Rh dGUuY3BwCiBVSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAKIFVJUHJvY2Vzcy9Qcm9jZXNz VGhyb3R0bGVyLmNwcAorVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmNwcAogVUlQcm9j ZXNzL1JlbW90ZVdlYkluc3BlY3RvclByb3h5LmNwcAogVUlQcm9jZXNzL1Jlc3BvbnNpdmVuZXNz VGltZXIuY3BwCiBVSVByb2Nlc3MvU2VydmljZVdvcmtlclByb2Nlc3NQcm94eS5jcHAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmluZGV4IGNmMTkx OWM5M2E3Li5jNzlmY2IyMTBiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJWaWV3Lm1tCkBAIC00NCw2ICs0NCw3IEBACiAjaW1wb3J0ICJOYXZpZ2F0aW9u U3RhdGUuaCIKICNpbXBvcnQgIk9iakNPYmplY3RHcmFwaC5oIgogI2ltcG9ydCAiUGFnZUNsaWVu dC5oIgorI2ltcG9ydCAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbXBvcnQgIlJlbW90ZUxh eWVyVHJlZVNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YS5oIgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJU cmVlVHJhbnNhY3Rpb24uaCIKICNpbXBvcnQgIlJlbW90ZU9iamVjdFJlZ2lzdHJ5LmgiCkBAIC00 NjY0LDYgKzQ2NjUsMTEgQEAgLSAodm9pZClfa2lsbFdlYkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRT dGF0ZQogewogICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nlc3NQcm94eT4gcHJvdGVjdGVkUHJvY2Vz c1Byb3h5KF9wYWdlLT5wcm9jZXNzKCkpOwogICAgIHByb3RlY3RlZFByb2Nlc3NQcm94eS0+cmVx dWVzdFRlcm1pbmF0aW9uKFdlYktpdDo6UHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpSZXF1ZXN0 ZWRCeUNsaWVudCk7CisKKyAgICBpZiAoYXV0byogcHJvdmlzaW9uYWxQYWdlUHJveHkgPSBfcGFn ZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKSkgeworICAgICAgICBSZWY8V2ViS2l0OjpXZWJQcm9j ZXNzUHJveHk+IHByb3RlY3RlZFByb2Nlc3NQcm94eShwcm92aXNpb25hbFBhZ2VQcm94eS0+cHJv Y2VzcygpKTsKKyAgICAgICAgcHJvdGVjdGVkUHJvY2Vzc1Byb3h5LT5yZXF1ZXN0VGVybWluYXRp b24oV2ViS2l0OjpQcm9jZXNzVGVybWluYXRpb25SZWFzb246OlJlcXVlc3RlZEJ5Q2xpZW50KTsK KyAgICB9CiB9CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAuLmVmNzhmYjlkMWEwCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCkBAIC0wLDAgKzEsMjMyIEBACisv KgorICogQ29weXJpZ2h0IChDKSAyMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlz dHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0 CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCBy ZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9j dW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3Ry aWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4g QU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1Q TElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJ TVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBB UlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQ UExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNU LCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VR VUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1F TlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRB LCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF RCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNU LCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhF UldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZU V0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1ZGUgIlByb3Zpc2lvbmFsUGFn ZVByb3h5LmgiCisKKyNpbmNsdWRlICJEcmF3aW5nQXJlYVByb3h5LmgiCisjaW5jbHVkZSAiTG9n Z2luZy5oIgorI2luY2x1ZGUgIldlYkVycm9ycy5oIgorI2luY2x1ZGUgIldlYk5hdmlnYXRpb25T dGF0ZS5oIgorI2luY2x1ZGUgIldlYlBhZ2VNZXNzYWdlcy5oIgorI2luY2x1ZGUgIldlYlBhZ2VQ cm94eS5oIgorI2luY2x1ZGUgIldlYlBhZ2VQcm94eU1lc3NhZ2VzLmgiCisjaW5jbHVkZSAiV2Vi UHJvY2Vzc1Byb3h5LmgiCisKK25hbWVzcGFjZSBXZWJLaXQgeworCitQcm92aXNpb25hbFBhZ2VQ cm94eTo6UHJvdmlzaW9uYWxQYWdlUHJveHkoV2ViUGFnZVByb3h5JiBwYWdlLCBSZWY8V2ViUHJv Y2Vzc1Byb3h5PiYmIHByb2Nlc3MsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+ IHN1c3BlbmRlZFBhZ2UsIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmIGRyYXdp bmdBcmVhLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGJvb2wgaXNTZXJ2ZXJSZWRpcmVjdCwgY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBQcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpCisgICAgOiBtX3BhZ2UocGFn ZSkKKyAgICAsIG1fcHJvY2VzcyhXVEZNb3ZlKHByb2Nlc3MpKQorICAgICwgbV9kcmF3aW5nQXJl YShXVEZNb3ZlKGRyYXdpbmdBcmVhKSkKKyAgICAsIG1fbmF2aWdhdGlvbklEKG5hdmlnYXRpb25J RCkKKyAgICAsIG1faXNTZXJ2ZXJSZWRpcmVjdChpc1NlcnZlclJlZGlyZWN0KQorICAgICwgbV9y ZXF1ZXN0KHJlcXVlc3QpCisgICAgLCBtX3Byb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQocHJv Y2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCkKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAg ICwgbV9zdXNwZW5zaW9uVG9rZW4obV9wcm9jZXNzLT50aHJvdHRsZXIoKS5iYWNrZ3JvdW5kQWN0 aXZpdHlUb2tlbigpKQorI2VuZGlmCit7CisgICAgbV9wcm9jZXNzLT5hZGRNZXNzYWdlUmVjZWl2 ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2Uu cGFnZUlEKCksICp0aGlzKTsKKyAgICBtX3Byb2Nlc3MtPmFkZFByb3Zpc2lvbmFsUGFnZVByb3h5 KCp0aGlzKTsKKworICAgIC8vIElmIHdlIGFyZSByZWF0dGFjaGluZyB0byBhIFN1c3BlbmRlZFBh Z2UsIHRoZW4gdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UgYWxyZWFkeSBleGlzdHMgYW5kCisgICAg Ly8gV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUoKSB3aWxsIG5vdCBiZSBjYWxsZWQg dG8gaW5pdGlhbGl6ZSBtX21haW5GcmFtZS4gSW4gc3VjaAorICAgIC8vIGNhc2UsIHdlIG5lZWQg dG8gaW5pdGlhbGl6ZSBtX21haW5GcmFtZSB0byByZWZsZWN0IHRoZSBmYWN0IHRoZSB0aGUgV2Vi UHJvY2VzcycgV2ViUGFnZQorICAgIC8vIGFscmVhZHkgZXhpc3RzIGFuZCBhbHJlYWR5IGhhcyBh IG1haW4gZnJhbWUuCisgICAgaWYgKHN1c3BlbmRlZFBhZ2UgJiYgIXN1c3BlbmRlZFBhZ2UtPmZh aWxlZFRvU3VzcGVuZCgpKSB7CisgICAgICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOworICAgICAg ICBBU1NFUlQoJnN1c3BlbmRlZFBhZ2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpOwor ICAgICAgICBzdXNwZW5kZWRQYWdlLT51bnN1c3BlbmQoKTsKKyAgICAgICAgbV9tYWluRnJhbWUg PSBXZWJGcmFtZVByb3h5OjpjcmVhdGUobV9wYWdlLCBzdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJ RCgpKTsKKyAgICAgICAgbV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoc3VzcGVuZGVkUGFnZS0+bWFp bkZyYW1lSUQoKSwgKm1fbWFpbkZyYW1lKTsKKyAgICB9Cit9CisKK1Byb3Zpc2lvbmFsUGFnZVBy b3h5Ojp+UHJvdmlzaW9uYWxQYWdlUHJveHkoKQoreworICAgIG1fcHJvY2Vzcy0+cmVtb3ZlUHJv dmlzaW9uYWxQYWdlUHJveHkoKnRoaXMpOworCisgICAgaWYgKG1fd2FzQ29tbWl0dGVkKQorICAg ICAgICByZXR1cm47CisKKyAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNz YWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQo KSk7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpDbG9zZSgpLCBtX3Bh Z2UucGFnZUlEKCkpOworCisgICAgaWYgKG1fZHJhd2luZ0FyZWEpIHsKKyAgICAgICAgYXV0byBw YWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1f cHJvY2Vzcyk7CisgICAgICAgIG1fZHJhd2luZ0FyZWEgPSBudWxscHRyOworICAgIH0KKworICAg IFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbcHJvY2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCld IHsKKyAgICAgICAgcHJvY2Vzcy0+bWF5YmVTaHV0RG93bigpOworICAgIH0pOworfQorCit2b2lk IFByb3Zpc2lvbmFsUGFnZVByb3h5OjpjYW5jZWwoKQoreworICAgIC8vIElmIHRoZSBwcm92aXNp b25hbCBsb2FkIHN0YXJ0ZWQsIHRoZW4gaW5kaWNhdGUgdGhhdCBpdCBmYWlsZWQgZHVlIHRvIGNh bmNlbGxhdGlvbiBieSBjYWxsaW5nIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSgpLgor ICAgIGlmIChtX3Byb3Zpc2lvbmFsTG9hZFVSTC5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsK KworICAgIEFTU0VSVChtX21haW5GcmFtZSk7CisgICAgYXV0byBlcnJvciA9IFdlYktpdDo6Y2Fu Y2VsbGVkRXJyb3IobV9yZXF1ZXN0KTsKKyAgICBlcnJvci5zZXRUeXBlKFdlYkNvcmU6OlJlc291 cmNlRXJyb3I6OlR5cGU6OkNhbmNlbGxhdGlvbik7CisgICAgZGlkRmFpbFByb3Zpc2lvbmFsTG9h ZEZvckZyYW1lKG1fbWFpbkZyYW1lLT5mcmFtZUlEKCksIHsgfSwgbV9uYXZpZ2F0aW9uSUQsIG1f cHJvdmlzaW9uYWxMb2FkVVJMLCBlcnJvciwgVXNlckRhdGEgeyB9KTsgLy8gV2lsbCBkZWxldGUg fHRoaXN8LgorfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJh bWUodWludDY0X3QgZnJhbWVJRCkKK3sKKyAgICBBU1NFUlQoIW1fbWFpbkZyYW1lKTsKKworICAg IG1fbWFpbkZyYW1lID0gV2ViRnJhbWVQcm94eTo6Y3JlYXRlKG1fcGFnZSwgZnJhbWVJRCk7CisK KyAgICAvLyBBZGQgdGhlIGZyYW1lIHRvIHRoZSBwcm9jZXNzIHdpZGUgbWFwLgorICAgIG1fcHJv Y2Vzcy0+ZnJhbWVDcmVhdGVkKGZyYW1lSUQsICptX21haW5GcmFtZSk7CisKKyAgICAvLyBUaGlz IG5hdmlnYXRpb24gd2FzIGRlc3Ryb3llZCBzbyBubyBuZWVkIHRvIG5vdGlmeSBvZiByZWRpcmVj dC4KKyAgICBpZiAoIW1fcGFnZS5uYXZpZ2F0aW9uU3RhdGUoKS5oYXNOYXZpZ2F0aW9uKG1fbmF2 aWdhdGlvbklEKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gUmVzdG9yZSB0aGUgbWFpbiBm cmFtZSdzIGNvbW1pdHRlZCBVUkwgYXMgc29tZSBjbGllbnRzIG1heSByZWx5IG9uIGl0IHVudGls IHRoZSBuZXh0IGxvYWQgaXMgY29tbWl0dGVkLgorICAgIGlmIChhdXRvKiBtYWluRnJhbWUgPSBt X3BhZ2UubWFpbkZyYW1lKCkpCisgICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgp LnNldFVSTChtYWluRnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkudXJsKCkpOworCisgICAgLy8gTm9y bWFsbHksIG5vdGlmaWNhdGlvbiBvZiBhIHNlcnZlciByZWRpcmVjdCBjb21lcyBmcm9tIHRoZSBX ZWJDb250ZW50IHByb2Nlc3MuCisgICAgLy8gSWYgd2UgYXJlIHByb2Nlc3Mgc3dhcHBpbmcgaW4g cmVzcG9uc2UgdG8gYSBzZXJ2ZXIgcmVkaXJlY3QgdGhlbiB0aGF0IG5vdGlmaWNhdGlvbiB3aWxs IG5vdCBjb21lIGZyb20gdGhlIG5ldyBXZWJDb250ZW50IHByb2Nlc3MuCisgICAgLy8gSW4gdGhp cyBjYXNlIHdlIGhhdmUgdGhlIFVJUHJvY2VzcyBzeW50aGVzaXplIHRoZSByZWRpcmVjdCBub3Rp ZmljYXRpb24gYXQgdGhlIGFwcHJvcHJpYXRlIHRpbWUuCisgICAgaWYgKG1faXNTZXJ2ZXJSZWRp cmVjdCkgeworICAgICAgICBtX21haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5kaWRTdGFydFBy b3Zpc2lvbmFsTG9hZChtX3JlcXVlc3QudXJsKCkpOworCisgICAgICAgIGF1dG8gcGFnZVByb2Nl c3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3Mp OworICAgICAgICBtX3BhZ2UuZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxM b2FkRm9yRnJhbWUobV9tYWluRnJhbWUtPmZyYW1lSUQoKSwgbV9uYXZpZ2F0aW9uSUQsIFdURk1v dmUobV9yZXF1ZXN0KSwgeyB9KTsKKyAgICB9Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJv eHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWlu dDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiB1cmwsIFVSTCYmIHVucmVhY2hhYmxlVVJMLCBjb25z dCBVc2VyRGF0YSYgdXNlckRhdGEpCit7CisgICAgLy8gSWYgdGhlIHByZXZpb3VzIHByb3Zpc2lv bmFsIGxvYWQgdXNlZCB0aGUgc2FtZSBwcm9jZXNzLCB3ZSBtYXkgcmVjZWl2ZSBJUEMgZm9yIHRo aXMgcHJldmlvdXMgcHJvdmlzaW9uYWwncyBtYWluIGZyYW1lIHRoYXQgd2UgbmVlZCB0byBpZ25v cmUuCisgICAgaWYgKCFtX21haW5GcmFtZSB8fCBtX21haW5GcmFtZS0+ZnJhbWVJRCgpICE9IGZy YW1lSUQpCisgICAgICAgIHJldHVybjsKKworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFsTG9hZFVS TC5pc051bGwoKSk7CisgICAgbV9wcm92aXNpb25hbExvYWRVUkwgPSB1cmw7CisKKyAgICAvLyBN ZXJlbHkgZm9sbG93aW5nIGEgc2VydmVyIHNpZGUgcmVkaXJlY3Qgc28gdGhlcmUgaXMgbm8gbmVl ZCB0byBzZW5kIGEgZGlkU3RhcnRQcm92aXNpb25hbExvYWQgYWdhaW4uCisgICAgaWYgKG1faXNT ZXJ2ZXJSZWRpcmVjdCkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gQ2xpZW50cyBleHBlY3Qg dGhlIFBhZ2UncyBtYWluIGZyYW1lJ3MgZXhwZWN0ZWRVUkwgdG8gYmUgdGhlIHByb3Zpc2lvbmFs IG9uZSB3aGVuIGEgcHJvdmlzaW9uYWwgbG9hZCBpcyBzdGFydGVkLgorICAgIGlmIChhdXRvKiBw YWdlTWFpbkZyYW1lID0gbV9wYWdlLm1haW5GcmFtZSgpKQorICAgICAgICBwYWdlTWFpbkZyYW1l LT5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZCh1cmwpOworCisgICAgYXV0byBwYWdlUHJvY2Vzc092 ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7Cisg ICAgbV9wYWdlLmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoZnJhbWVJRCwgbmF2aWdh dGlvbklELCBXVEZNb3ZlKHVybCksIFdURk1vdmUodW5yZWFjaGFibGVVUkwpLCB1c2VyRGF0YSk7 Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRG b3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRh dGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3Ry aW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYgZXJyb3Is IGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJp ZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKworICAg IG1fcHJvdmlzaW9uYWxMb2FkVVJMID0geyB9OworCisgICAgLy8gTWFrZSBzdXJlIHRoZSBQYWdl J3MgbWFpbiBmcmFtZSdzIGV4cGVjdGVkVVJMIGdldHMgY2xlYXJlZCBzaW5jZSB3ZSB1cGRhdGVk IGl0IGluIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkLgorICAgIGlmIChhdXRvKiBwYWdlTWFpbkZy YW1lID0gbV9wYWdlLm1haW5GcmFtZSgpKQorICAgICAgICBwYWdlTWFpbkZyYW1lLT5kaWRGYWls UHJvdmlzaW9uYWxMb2FkKCk7CisKKyAgICBtX3BhZ2UuZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lKGZyYW1lSUQsIGZyYW1lU2VjdXJpdHlPcmlnaW4sIG5hdmlnYXRpb25JRCwgcHJvdmlz aW9uYWxVUkwsIGVycm9yLCB1c2VyRGF0YSk7IC8vIFdpbGwgZGVsZXRlIHx0aGlzfC4KK30KKwor dm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90 IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwg Ym9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVMb2FkVHlw ZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiBjZXJ0aWZpY2F0ZUluZm8sIGJvb2wg Y29udGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250 ZW50PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkK K3sKKyAgICAvLyBJZiB0aGUgcHJldmlvdXMgcHJvdmlzaW9uYWwgbG9hZCB1c2VkIHRoZSBzYW1l IHByb2Nlc3MsIHdlIG1heSByZWNlaXZlIElQQyBmb3IgdGhpcyBwcmV2aW91cyBwcm92aXNpb25h bCdzIG1haW4gZnJhbWUgdGhhdCB3ZSBuZWVkIHRvIGlnbm9yZS4KKyAgICBpZiAoIW1fbWFpbkZy YW1lIHx8IG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkgIT0gZnJhbWVJRCkKKyAgICAgICAgcmV0dXJu OworCisgICAgbV9wcm92aXNpb25hbExvYWRVUkwgPSB7IH07CisgICAgbV9wcm9jZXNzLT5yZW1v dmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVy TmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAgbV93YXNDb21taXR0ZWQgPSB0cnVlOwor ICAgIG1fcGFnZS5jb21taXRQcm92aXNpb25hbFBhZ2UoZnJhbWVJRCwgbmF2aWdhdGlvbklELCBt aW1lVHlwZSwgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIGZyYW1lTG9hZFR5cGUsIGNl cnRpZmljYXRlSW5mbywgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgZm9yY2VkSGFzSW5zZWN1cmVD b250ZW50LCB1c2VyRGF0YSk7IC8vIFdpbGwgZGVsZXRlIHx0aGlzfC4KK30KKwordm9pZCBQcm92 aXNpb25hbFBhZ2VQcm94eTo6ZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiBjb25u ZWN0aW9uLCBJUEM6OkRlY29kZXImIGRlY29kZXIpCit7CisgICAgQVNTRVJUKGRlY29kZXIubWVz c2FnZVJlY2VpdmVyTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNl aXZlck5hbWUoKSk7CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OkRpZFN0YXJ0UHJvZ3Jlc3M6Om5hbWUoKQorICAgICAgICB8fCBkZWNv ZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ2hhbmdlUHJv Z3Jlc3M6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6QmFja0ZvcndhcmRBZGRJdGVtOjpuYW1lKCkKKyAgICAgICAgfHwg ZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkxvZ0RpYWdu b3N0aWNNZXNzYWdlOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09 IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aEVuaGFuY2Vk UHJpdmFjeTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpTZXROZXR3b3JrUmVxdWVzdHNJblByb2dyZXNzOjpuYW1lKCkK KyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6OlJlZ2lzdGVyV2ViUHJvY2Vzc0FjY2Vzc2liaWxpdHlUb2tlbjo6bmFtZSgpCisgICAgICAg IHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEZWNp ZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmM6Om5hbWUoKQorICAgICAgICB8fCBkZWNv ZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U3RhcnRVUkxTY2hl bWVUYXNrOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3Nh Z2VzOjpXZWJQYWdlUHJveHk6OkRlY2lkZVBvbGljeUZvclJlc3BvbnNlOjpuYW1lKCkKKyAgICAg ICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRp ZFBlcmZvcm1DbGllbnRSZWRpcmVjdDo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2Fn ZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDaGFuZ2VQcm92aXNpb25hbFVS TEZvckZyYW1lOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhOjpuYW1l KCkpCisgICAgeworICAgICAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVt cG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICAgICAgbV9wYWdlLmRpZFJl Y2VpdmVNZXNzYWdlKGNvbm5lY3Rpb24sIGRlY29kZXIpOworICAgICAgICByZXR1cm47CisgICAg fQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpEaWRDcmVhdGVNYWluRnJhbWU6Om5hbWUoKSkgeworICAgICAgICBJUEM6OmhhbmRsZU1l c3NhZ2U8TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ3JlYXRlTWFpbkZyYW1lPihkZWNvZGVy LCB0aGlzLCAmUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZENyZWF0ZU1haW5GcmFtZSk7CisgICAg ICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6Om5h bWUoKSkgeworICAgICAgICBJUEM6OmhhbmRsZU1lc3NhZ2U8TWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6RGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZT4oZGVjb2RlciwgdGhpcywgJlByb3Zp c2lvbmFsUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKTsKKyAgICAg ICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVz c2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOjpuYW1l KCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 OkRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZT4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lv bmFsUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOworICAgICAgICBy ZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpEaWRDb21taXRMb2FkRm9yRnJhbWU6Om5hbWUoKSkgeworICAgICAg ICBJUEM6OmhhbmRsZU1lc3NhZ2U8TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ29tbWl0TG9h ZEZvckZyYW1lPihkZWNvZGVyLCB0aGlzLCAmUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZENvbW1p dExvYWRGb3JGcmFtZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBMT0coUHJvY2Vz c1N3YXBwaW5nLCAiVW5oYW5kbGVkIG1lc3NhZ2UgJXM6OiVzIGZyb20gcHJvdmlzaW9uYWwgcHJv Y2VzcyIsIGRlY29kZXIubWVzc2FnZVJlY2VpdmVyTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgpLCBk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkudG9TdHJpbmcoKS5kYXRhKCkpOworfQorCit2b2lkIFByb3Zp c2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiBj b25uZWN0aW9uLCBJUEM6OkRlY29kZXImIGRlY29kZXIsIHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVu Y29kZXI+JiBlbmNvZGVyKQoreworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVz c2FnZXM6OldlYlBhZ2VQcm94eTo6QmFja0ZvcndhcmRJdGVtQXRJbmRleDo6bmFtZSgpIHx8IGRl Y29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpCYWNrRm9yd2Fy ZEdvVG9JdGVtOjpuYW1lKCkpIHsKKyAgICAgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0g bV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgICAgIG1f cGFnZS5kaWRSZWNlaXZlU3luY01lc3NhZ2UoY29ubmVjdGlvbiwgZGVjb2RlciwgZW5jb2Rlcik7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBMT0coUHJvY2Vzc1N3YXBwaW5nLCAiVW5o YW5kbGVkIHN5bmMgbWVzc2FnZSAlczo6JXMgZnJvbSBwcm92aXNpb25hbCBwcm9jZXNzIiwgZGVj b2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkudG9TdHJpbmcoKS5kYXRhKCksIGRlY29kZXIubWVz c2FnZU5hbWUoKS50b1N0cmluZygpLmRhdGEoKSk7Cit9CisKK30gLy8gbmFtZXNwYWNlIFdlYktp dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJv eHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmgKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLmY1ZTY1MmM5OTAyCi0tLSAvZGV2 L251bGwKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHku aApAQCAtMCwwICsxLDg0IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE5IEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwg YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICog YXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFp biB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMg aW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAg bm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFp bWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHBy b3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBS T1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBB TkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1Qg TElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZ IEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQu IElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUg TElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhF TVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1Qg TElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklD RVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJS VVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdI RVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJ TkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9G IFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9T U0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI3ByYWdtYSBvbmNlCisKKyNpbmNsdWRl ICJNZXNzYWdlUmVjZWl2ZXIuaCIKKworbmFtZXNwYWNlIFdlYkNvcmUgeworY2xhc3MgUmVzb3Vy Y2VSZXF1ZXN0OworfQorCituYW1lc3BhY2UgV2ViS2l0IHsKKworY2xhc3MgRHJhd2luZ0FyZWFQ cm94eTsKK2NsYXNzIFN1c3BlbmRlZFBhZ2VQcm94eTsKK2NsYXNzIFdlYkZyYW1lUHJveHk7Citj bGFzcyBXZWJQYWdlUHJveHk7CitjbGFzcyBXZWJQcm9jZXNzUHJveHk7CisKK2NsYXNzIFByb3Zp c2lvbmFsUGFnZVByb3h5IDogcHVibGljIElQQzo6TWVzc2FnZVJlY2VpdmVyIHsKKyAgICBXVEZf TUFLRV9GQVNUX0FMTE9DQVRFRDsKK3B1YmxpYzoKKyAgICBQcm92aXNpb25hbFBhZ2VQcm94eShX ZWJQYWdlUHJveHkmLCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmLCBzdGQ6OnVuaXF1ZV9wdHI8U3Vz cGVuZGVkUGFnZVByb3h5Piwgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+JiYsIHVp bnQ2NF90IG5hdmlnYXRpb25JRCwgYm9vbCBpc1NlcnZlclJlZGlyZWN0LCBjb25zdCBXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QmLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KTsKKyAgICB+ UHJvdmlzaW9uYWxQYWdlUHJveHkoKTsKKworICAgIFdlYlBhZ2VQcm94eSYgcGFnZSgpIHsgcmV0 dXJuIG1fcGFnZTsgfQorICAgIFdlYkZyYW1lUHJveHkqIG1haW5GcmFtZSgpIGNvbnN0IHsgcmV0 dXJuIG1fbWFpbkZyYW1lLmdldCgpOyB9CisgICAgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKCkg eyByZXR1cm4gbV9wcm9jZXNzLmdldCgpOyB9CisgICAgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNs aWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KCkgY29uc3QgeyByZXR1cm4gbV9wcm9j ZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50OyB9CisgICAgdWludDY0X3QgbmF2aWdhdGlvbklEKCkg Y29uc3QgeyByZXR1cm4gbV9uYXZpZ2F0aW9uSUQ7IH0KKworICAgIHN0ZDo6dW5pcXVlX3B0cjxE cmF3aW5nQXJlYVByb3h5PiB0YWtlRHJhd2luZ0FyZWEoKSB7IHJldHVybiBXVEZNb3ZlKG1fZHJh d2luZ0FyZWEpOyB9CisKKyAgICB2b2lkIGNhbmNlbCgpOworCitwcml2YXRlOgorICAgIC8vIElQ Qzo6TWVzc2FnZVJlY2VpdmVyCisgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5l Y3Rpb24mLCBJUEM6OkRlY29kZXImKSBmaW5hbDsKKyAgICB2b2lkIGRpZFJlY2VpdmVTeW5jTWVz c2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImLCBzdGQ6OnVuaXF1ZV9wdHI8SVBD OjpFbmNvZGVyPiYpIGZpbmFsOworCisgICAgdm9pZCBkaWRDcmVhdGVNYWluRnJhbWUodWludDY0 X3QgZnJhbWVJRCk7CisgICAgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVp bnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYsIFVSTCYmIHVucmVh Y2hhYmxlVVJMLCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkQ29tbWl0TG9hZEZvckZy YW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5n JiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3Qg ZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiwgYm9vbCBjb250 YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+ IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2b2lkIGRp ZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJD b3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5h dmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6 UmVzb3VyY2VFcnJvciYsIGNvbnN0IFVzZXJEYXRhJik7CisKKyAgICBXZWJQYWdlUHJveHkmIG1f cGFnZTsKKyAgICBSZWY8V2ViUHJvY2Vzc1Byb3h5PiBtX3Byb2Nlc3M7CisgICAgc3RkOjp1bmlx dWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IG1fZHJhd2luZ0FyZWE7CisgICAgUmVmUHRyPFdlYkZy YW1lUHJveHk+IG1fbWFpbkZyYW1lOworICAgIHVpbnQ2NF90IG1fbmF2aWdhdGlvbklEOworICAg IGJvb2wgbV9pc1NlcnZlclJlZGlyZWN0OworICAgIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCBt X3JlcXVlc3Q7CisgICAgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBtX3Byb2Nlc3NTd2Fw UmVxdWVzdGVkQnlDbGllbnQ7CisgICAgYm9vbCBtX3dhc0NvbW1pdHRlZCB7IGZhbHNlIH07Cisg ICAgVVJMIG1fcHJvdmlzaW9uYWxMb2FkVVJMOworCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkK KyAgICBQcm9jZXNzVGhyb3R0bGVyOjpCYWNrZ3JvdW5kQWN0aXZpdHlUb2tlbiBtX3N1c3BlbnNp b25Ub2tlbjsKKyNlbmRpZgorfTsKKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5n Q29vcmRpbmF0b3JQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXll clRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5jcHAKaW5kZXggYTM2N2UxNWYw MDUuLjE2NmVmNDlhOTMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1v dGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ0Nvb3Jk aW5hdG9yUHJveHkuY3BwCkBAIC00Nyw3ICs0NywxMiBAQCBSZW1vdGVTY3JvbGxpbmdDb29yZGlu YXRvclByb3h5OjpSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5KFdlYlBhZ2VQcm94eSYg dwogICAgIDogbV93ZWJQYWdlUHJveHkod2ViUGFnZVByb3h5KQogICAgICwgbV9zY3JvbGxpbmdU cmVlKFJlbW90ZVNjcm9sbGluZ1RyZWU6OmNyZWF0ZSgqdGhpcykpCiAgICAgLCBtX3JlcXVlc3Rl ZFNjcm9sbEluZm8obnVsbHB0cikKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIC8vIE9u IGlPUywgbWFpbiBmcmFtZSBzY3JvbGxzIGFyZSBzZW50IGluIHRlcm1zIG9mIHZpc2libGUgcmVj dCB1cGRhdGVzLgorICAgICwgbV9wcm9wYWdhdGVzTWFpbkZyYW1lU2Nyb2xscyhmYWxzZSkKKyNl bHNlCiAgICAgLCBtX3Byb3BhZ2F0ZXNNYWluRnJhbWVTY3JvbGxzKHRydWUpCisjZW5kaWYKIHsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVl L1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5LmgKaW5k ZXggYjMyZDc5ZmU5MjguLjc5MGQ1MTU1ZDNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5o CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3Jv bGxpbmdDb29yZGluYXRvclByb3h5LmgKQEAgLTc5LDcgKzc5LDYgQEAgcHVibGljOgogICAgIH07 CiAgICAgdm9pZCBjb21taXRTY3JvbGxpbmdUcmVlU3RhdGUoY29uc3QgUmVtb3RlU2Nyb2xsaW5n Q29vcmRpbmF0b3JUcmFuc2FjdGlvbiYsIFJlcXVlc3RlZFNjcm9sbEluZm8mKTsKIAotICAgIHZv aWQgc2V0UHJvcGFnYXRlc01haW5GcmFtZVNjcm9sbHMoYm9vbCBwcm9wYWdhdGVzTWFpbkZyYW1l U2Nyb2xscykgeyBtX3Byb3BhZ2F0ZXNNYWluRnJhbWVTY3JvbGxzID0gcHJvcGFnYXRlc01haW5G cmFtZVNjcm9sbHM7IH0KICAgICBib29sIHByb3BhZ2F0ZXNNYWluRnJhbWVTY3JvbGxzKCkgY29u c3QgeyByZXR1cm4gbV9wcm9wYWdhdGVzTWFpbkZyYW1lU2Nyb2xsczsgfQogICAgIGJvb2wgaGFz Rml4ZWRPclN0aWNreSgpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsaW5nVHJlZS0+aGFzRml4ZWRP clN0aWNreSgpOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3Bl bmRlZFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdl UHJveHkuY3BwCmluZGV4IGYxOThhODE1MzNmLi5mZjc2ZDlmN2Y5NyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwCkBAIC0xMDAsNyArMTAwLDkg QEAgU3VzcGVuZGVkUGFnZVByb3h5Ojp+U3VzcGVuZGVkUGFnZVByb3h5KCkKICAgICAvLyBJZiB0 aGUgc3VzcGVuZGVkIHBhZ2Ugd2FzIG5vdCBjb25zdW1lZCBiZWZvcmUgZ2V0dGluZyBkZXN0cm95 ZWQsIHRoZW4gY2xvc2UgdGhlIGNvcnJlc3BvbmRpbmcgcGFnZQogICAgIC8vIG9uIHRoZSBXZWJQ cm9jZXNzIHNpZGUuCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpDbG9z ZSgpLCBtX3BhZ2UucGFnZUlEKCkpOwotICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2Vp dmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdl LnBhZ2VJRCgpKTsKKworICAgIGlmIChtX3N1c3BlbnNpb25TdGF0ZSA9PSBTdXNwZW5zaW9uU3Rh dGU6OlN1c3BlbmRpbmcpCisgICAgICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVy KE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBh Z2VJRCgpKTsKIAogICAgIC8vIFdlIGNhbGwgbWF5YmVTaHV0RG93bigpIGFzeW5jaHJvbm91c2x5 IHNpbmNlIHRoZSBTdXNwZW5kZWRQYWdlIGlzIGN1cnJlbnRseSBiZWluZyByZW1vdmVkIGZyb20g dGhlIFdlYlByb2Nlc3NQb29sCiAgICAgLy8gYW5kIHdlIHdhbnQgdG8gYXZvaWQgcmUtZW50ZXJp bmcgV2ViUHJvY2Vzc1Bvb2wgbWV0aG9kcy4KQEAgLTEzNCw3ICsxMzYsNiBAQCB2b2lkIFN1c3Bl bmRlZFBhZ2VQcm94eTo6dW5zdXNwZW5kKCkKICAgICBBU1NFUlQobV9zdXNwZW5zaW9uU3RhdGUg PT0gU3VzcGVuc2lvblN0YXRlOjpTdXNwZW5kZWQpOwogCiAgICAgbV9zdXNwZW5zaW9uU3RhdGUg PSBTdXNwZW5zaW9uU3RhdGU6OlJlc3VtZWQ7Ci0gICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdl UmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBt X3BhZ2UucGFnZUlEKCkpOwogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6 U2V0SXNTdXNwZW5kZWQoZmFsc2UpLCBtX3BhZ2UucGFnZUlEKCkpOwogfQogCkBAIC0xNTEsNiAr MTUyLDggQEAgdm9pZCBTdXNwZW5kZWRQYWdlUHJveHk6OmRpZFByb2Nlc3NSZXF1ZXN0VG9TdXNw ZW5kKFN1c3BlbnNpb25TdGF0ZSBuZXdTdXNwZW5zaW8KICAgICBtX3N1c3BlbnNpb25Ub2tlbiA9 IG51bGxwdHI7CiAjZW5kaWYKIAorICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVy KE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBh Z2VJRCgpKTsKKwogICAgIGlmIChtX3JlYWR5VG9VbnN1c3BlbmRIYW5kbGVyKQogICAgICAgICBt X3JlYWR5VG9VbnN1c3BlbmRIYW5kbGVyKHRoaXMpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJGcmFtZVByb3h5LmNwcAppbmRleCBjNzdhMjZiNzQyNy4uNTNjNzE5NmMyYWEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCkBAIC0yNyw2ICsyNyw3IEBA CiAjaW5jbHVkZSAiV2ViRnJhbWVQcm94eS5oIgogCiAjaW5jbHVkZSAiQVBJTmF2aWdhdGlvbi5o IgorI2luY2x1ZGUgIlByb3Zpc2lvbmFsUGFnZVByb3h5LmgiCiAjaW5jbHVkZSAiV2ViQ2VydGlm aWNhdGVJbmZvLmgiCiAjaW5jbHVkZSAiV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5LmgiCiAj aW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2VzLmgiCkBAIC03NCw3ICs3NSw3IEBAIGJvb2wgV2ViRnJh bWVQcm94eTo6aXNNYWluRnJhbWUoKSBjb25zdAogICAgIGlmICghbV9wYWdlKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKLSAgICByZXR1cm4gdGhpcyA9PSBtX3BhZ2UtPm1haW5GcmFtZSgpOwor ICAgIHJldHVybiB0aGlzID09IG1fcGFnZS0+bWFpbkZyYW1lKCkgfHwgKG1fcGFnZS0+cHJvdmlz aW9uYWxQYWdlUHJveHkoKSAmJiB0aGlzID09IG1fcGFnZS0+cHJvdmlzaW9uYWxQYWdlUHJveHko KS0+bWFpbkZyYW1lKCkpOwogfQogCiB2b2lkIFdlYkZyYW1lUHJveHk6OmxvYWRVUkwoY29uc3Qg VVJMJiB1cmwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCAz OTI3NDNiZDU2Ny4uZTVlMzZlOGI2NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcApAQCAtNzcsNiArNzcsNyBAQAogI2luY2x1ZGUgIlBsdWdpbkluZm9ybWF0aW9u LmgiCiAjaW5jbHVkZSAiUGx1Z2luUHJvY2Vzc01hbmFnZXIuaCIKICNpbmNsdWRlICJQcmludElu Zm8uaCIKKyNpbmNsdWRlICJQcm92aXNpb25hbFBhZ2VQcm94eS5oIgogI2luY2x1ZGUgIlNhZmVC cm93c2luZ1dhcm5pbmcuaCIKICNpbmNsdWRlICJTaGFyZVNoZWV0Q2FsbGJhY2tJRC5oIgogI2lu Y2x1ZGUgIlNoYXJlZEJ1ZmZlckRhdGFSZWZlcmVuY2UuaCIKQEAgLTc2OCwzOCArNzY5LDI1IEBA IGJvb2wgV2ViUGFnZVByb3h5OjpzdXNwZW5kQ3VycmVudFBhZ2VJZlBvc3NpYmxlKEFQSTo6TmF2 aWdhdGlvbiYgbmF2aWdhdGlvbiwgT3B0CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgV2Vi UGFnZVByb3h5Ojpzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2Vz cywgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiBkZXN0aW5hdGlvblN1c3Bl bmRlZFBhZ2UsIElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1c3BlbmRlZCkKK3ZvaWQg V2ViUGFnZVByb3h5Ojpzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJv Y2Vzcywgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+JiYgZHJhd2luZ0FyZWEsIFJl ZlB0cjxXZWJGcmFtZVByb3h5PiYmIG1haW5GcmFtZSkKIHsKICAgICBBU1NFUlQoIW1faXNDbG9z ZWQpOwogICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgInN3YXBUb1dlYlByb2Nl c3M6IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lk ZW50aWZpZXIoKSwgbV9wYWdlSUQpOwogCiAgICAgbV9wcm9jZXNzID0gV1RGTW92ZShwcm9jZXNz KTsKKyAgICBBU1NFUlQoIW1fZHJhd2luZ0FyZWEpOworICAgIG1fZHJhd2luZ0FyZWEgPSBXVEZN b3ZlKGRyYXdpbmdBcmVhKTsKKyAgICBBU1NFUlQoIW1fbWFpbkZyYW1lKTsKKyAgICBtX21haW5G cmFtZSA9IFdURk1vdmUobWFpbkZyYW1lKTsKICAgICBtX2lzVmFsaWQgPSB0cnVlOwogCi0gICAg Ly8gSWYgd2UgYXJlIHJlYXR0YWNoaW5nIHRvIGEgU3VzcGVuZGVkUGFnZSwgdGhlbiB0aGUgV2Vi UHJvY2VzcycgV2ViUGFnZSBhbHJlYWR5IGV4aXN0cyBhbmQKLSAgICAvLyBXZWJQYWdlUHJveHk6 OmRpZENyZWF0ZU1haW5GcmFtZSgpIHdpbGwgbm90IGJlIGNhbGxlZCB0byBpbml0aWFsaXplIG1f bWFpbkZyYW1lLiBJbiBzdWNoCi0gICAgLy8gY2FzZSwgd2UgbmVlZCB0byBpbml0aWFsaXplIG1f bWFpbkZyYW1lIHRvIHJlZmxlY3QgdGhlIGZhY3QgdGhlIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdl Ci0gICAgLy8gYWxyZWFkeSBleGlzdHMgYW5kIGFscmVhZHkgaGFzIGEgbWFpbiBmcmFtZS4KLSAg ICBpZiAoZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlKSB7Ci0gICAgICAgIGlmICghZGVzdGluYXRp b25TdXNwZW5kZWRQYWdlLT5mYWlsZWRUb1N1c3BlbmQoKSkgewotICAgICAgICAgICAgQVNTRVJU KCFtX21haW5GcmFtZSk7Ci0gICAgICAgICAgICBBU1NFUlQoJmRlc3RpbmF0aW9uU3VzcGVuZGVk UGFnZS0+cHJvY2VzcygpID09IG1fcHJvY2Vzcy5wdHIoKSk7Ci0gICAgICAgICAgICBkZXN0aW5h dGlvblN1c3BlbmRlZFBhZ2UtPnVuc3VzcGVuZCgpOwotICAgICAgICAgICAgbV9tYWluRnJhbWUg PSBXZWJGcmFtZVByb3h5OjpjcmVhdGUoKnRoaXMsIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZS0+ bWFpbkZyYW1lSUQoKSk7Ci0gICAgICAgICAgICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChkZXN0 aW5hdGlvblN1c3BlbmRlZFBhZ2UtPm1haW5GcmFtZUlEKCksICptX21haW5GcmFtZSk7Ci0gICAg ICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAvLyBXZSBmYWlsZWQgdG8gc3VzcGVuZCB0aGUgcGFn ZSBzbyBkZXN0cm95IGl0IG5vdyBhbmQgbWVyZWx5IHJldXNlIGl0cyBXZWJDb250ZW50IHByb2Nl c3MuCi0gICAgICAgICAgICBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UgPSBudWxscHRyOwotICAg ICAgICB9Ci0gICAgfQotCiAgICAgbV9wcm9jZXNzLT5hZGRFeGlzdGluZ1dlYlBhZ2UoKnRoaXMs IG1fcGFnZUlELCBXZWJQcm9jZXNzUHJveHk6OkJlZ2luc1VzaW5nRGF0YVN0b3JlOjpObyk7CiAg ICAgbV9wcm9jZXNzLT5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6 bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2VJRCwgKnRoaXMpOwogCi0gICAgZmluaXNoQXR0 YWNoaW5nVG9XZWJQcm9jZXNzKGlzU3dhcEZyb21TdXNwZW5kZWQpOworICAgIGZpbmlzaEF0dGFj aGluZ1RvV2ViUHJvY2VzcygpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNo aW5nVG9XZWJQcm9jZXNzKElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1c3BlbmRlZCkK K3ZvaWQgV2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoKQogewogICAg IEFTU0VSVChtX3Byb2Nlc3MtPnN0YXRlKCkgIT0gQ2hpbGRQcm9jZXNzUHJveHk6OlN0YXRlOjpU ZXJtaW5hdGVkKTsKIApAQCAtODM1LDcgKzgyMyw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpmaW5p c2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3Vz CiAgICAgbV9lZGl0YWJsZUltYWdlQ29udHJvbGxlciA9IHN0ZDo6bWFrZV91bmlxdWU8RWRpdGFi bGVJbWFnZUNvbnRyb2xsZXI+KCp0aGlzKTsKICNlbmRpZgogCi0gICAgaW5pdGlhbGl6ZVdlYlBh Z2UoaXNTd2FwRnJvbVN1c3BlbmRlZCk7CisgICAgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsKIAogICAg IG1faW5zcGVjdG9yLT51cGRhdGVGb3JOZXdQYWdlUHJvY2Vzcyh0aGlzKTsKIApAQCAtOTAwLDMx ICs4ODgsMjEgQEAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gV2ViUGFnZVByb3h5OjpyZWF0dGFj aFRvV2ViUHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tGb3J3YXIKICAgICByZXR1cm4gV1RGTW92ZShu YXZpZ2F0aW9uKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKElz U3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1c3BlbmRlZCkKK3ZvaWQgV2ViUGFnZVByb3h5 Ojppbml0aWFsaXplV2ViUGFnZSgpCiB7CiAgICAgQVNTRVJUKGlzVmFsaWQoKSk7CiAKLSAgICBt X2RyYXdpbmdBcmVhID0gcGFnZUNsaWVudCgpLmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKLSAg ICBBU1NFUlQobV9kcmF3aW5nQXJlYSk7CisgICAgaWYgKCFtX2RyYXdpbmdBcmVhKSB7CisgICAg ICAgIG1fZHJhd2luZ0FyZWEgPSBwYWdlQ2xpZW50KCkuY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgp OworICAgICAgICBBU1NFUlQobV9kcmF3aW5nQXJlYSk7CisgICAgfQogCiAjaWYgRU5BQkxFKEFT WU5DX1NDUk9MTElORykgJiYgUExBVEZPUk0oQ09DT0EpCi0gICAgaWYgKG1fZHJhd2luZ0FyZWEt PnR5cGUoKSA9PSBEcmF3aW5nQXJlYVR5cGVSZW1vdGVMYXllclRyZWUpIHsKKyAgICBpZiAobV9k cmF3aW5nQXJlYS0+dHlwZSgpID09IERyYXdpbmdBcmVhVHlwZVJlbW90ZUxheWVyVHJlZSkKICAg ICAgICAgbV9zY3JvbGxpbmdDb29yZGluYXRvclByb3h5ID0gc3RkOjptYWtlX3VuaXF1ZTxSZW1v dGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5PigqdGhpcyk7Ci0jaWYgUExBVEZPUk0oSU9TX0ZB TUlMWSkKLSAgICAgICAgLy8gT24gaU9TLCBtYWluIGZyYW1lIHNjcm9sbHMgYXJlIHNlbnQgaW4g dGVybXMgb2YgdmlzaWJsZSByZWN0IHVwZGF0ZXMuCi0gICAgICAgIG1fc2Nyb2xsaW5nQ29vcmRp bmF0b3JQcm94eS0+c2V0UHJvcGFnYXRlc01haW5GcmFtZVNjcm9sbHMoZmFsc2UpOwotI2VuZGlm Ci0gICAgfQogI2VuZGlmCiAKLSAgICBhdXRvIHBhcmFtZXRlcnMgPSBjcmVhdGlvblBhcmFtZXRl cnMoKTsKLSAgICBwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQgPSBpc1N3YXBGcm9tU3Vz cGVuZGVkID09IElzU3dhcEZyb21TdXNwZW5kZWQ6OlllczsKLQotI2lmIEVOQUJMRShTRVJWSUNF X1dPUktFUikKLSAgICBwYXJhbWV0ZXJzLmhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyA9IHBy b2Nlc3MoKS5wcm9jZXNzUG9vbCgpLm1heUhhdmVSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMobV93 ZWJzaXRlRGF0YVN0b3JlKTsKLSNlbmRpZgotCi0gICAgcHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6 OldlYlByb2Nlc3M6OkNyZWF0ZVdlYlBhZ2UobV9wYWdlSUQsIHBhcmFtZXRlcnMpLCAwKTsKKyAg ICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6Q3JlYXRlV2ViUGFnZShtX3Bh Z2VJRCwgY3JlYXRpb25QYXJhbWV0ZXJzKCkpLCAwKTsKIAogICAgIG1fbmVlZHNUb0ZpbmlzaElu aXRpYWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2ggPSB0cnVlOwogICAgIGZpbmlzaElu aXRpYWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2goKTsKQEAgLTEwNzYsNyArMTA1NCw4 IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2 aWdhdGlvbiYgbmF2aWdhdGlvbiwgUmVzb3VyCiAgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFn ZUxvYWRTdGF0ZS50cmFuc2FjdGlvbigpOwogCiAgICAgYXV0byB1cmwgPSByZXF1ZXN0LnVybCgp OwotICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFuc2FjdGlv biwgdXJsKTsKKyAgICBpZiAoc2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkICE9IFNob3VsZFRy ZWF0QXNDb250aW51aW5nTG9hZDo6WWVzKQorICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0UGVu ZGluZ0FQSVJlcXVlc3RVUkwodHJhbnNhY3Rpb24sIHVybCk7CiAKICAgICBpZiAoIWlzVmFsaWQo KSkKICAgICAgICAgcmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsKQEAgLTI2OTcsNyArMjY3Niw3IEBA IHZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbihXZWJQ b2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uCiAgICAgICAgIH0KIAogICAgICAgICBpZiAocHJvY2Vz c0Zvck5hdmlnYXRpb24ucHRyKCkgIT0gJnByb2Nlc3MoKSkgewotICAgICAgICAgICAgcG9saWN5 QWN0aW9uID0gaXNQYWdlT3BlbmVkQnlET01TaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSA/ IFdlYlBvbGljeUFjdGlvbjo6SWdub3JlIDogV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kOworICAg ICAgICAgICAgcG9saWN5QWN0aW9uID0gV2ViUG9saWN5QWN0aW9uOjpJZ25vcmU7CiAgICAgICAg ICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb24sIHN3YXBwaW5nIHByb2Nlc3MgJWkgd2l0aCBwcm9jZXNzICVp IGZvciBuYXZpZ2F0aW9uLCByZWFzb246ICV7cHVibGljfXMiLCBwcm9jZXNzSWRlbnRpZmllcigp LCBwcm9jZXNzRm9yTmF2aWdhdGlvbi0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgcmVhc29uLnV0Zjgo KS5kYXRhKCkpOwogICAgICAgICAgICAgTE9HKFByb2Nlc3NTd2FwcGluZywgIihQcm9jZXNzU3dh cHBpbmcpIFN3aXRjaGluZyBmcm9tIHByb2Nlc3MgJWkgdG8gbmV3IHByb2Nlc3MgKCVpKSBmb3Ig bmF2aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMnIiwgcHJvY2Vzc0lkZW50aWZpZXIoKSwgcHJvY2Vz c0Zvck5hdmlnYXRpb24tPnByb2Nlc3NJZGVudGlmaWVyKCksIG5hdmlnYXRpb24tPm5hdmlnYXRp b25JRCgpLCBuYXZpZ2F0aW9uLT5sb2dnaW5nU3RyaW5nKCkpOwogICAgICAgICB9IGVsc2UKQEAg LTI3NDMsMjQgKzI3MjIsNDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVkUG9saWN5RGVj aXNpb24oV2ViUG9saWN5QWN0aW9uIGFjdGlvbiwgQVBJOjpOYXZpZ2F0aW8KICAgICBzZW5kZXIt PnNlbmQoYWN0aW9uLCBuYXZpZ2F0aW9uID8gbmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCkgOiAw LCBkb3dubG9hZElELCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOwogfQogCit2b2lkIFdlYlBh Z2VQcm94eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90 IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3Rv bUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6 Q2VydGlmaWNhdGVJbmZvJiBjZXJ0aWZpY2F0ZUluZm8sIGJvb2wgY29udGFpbnNQbHVnaW5Eb2N1 bWVudCwgT3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJbnNl Y3VyZUNvbnRlbnQsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICBBU1NFUlQobV9w cm92aXNpb25hbFBhZ2UpOworCisgICAgT3B0aW9uYWw8dWludDY0X3Q+IG1haW5GcmFtZUlESW5Q cmV2aW91c1Byb2Nlc3MgPSBtYWluRnJhbWUoKSA/IG1ha2VPcHRpb25hbChtYWluRnJhbWUoKS0+ ZnJhbWVJRCgpKSA6IFdURjo6bnVsbG9wdDsKKyAgICBwcm9jZXNzRGlkVGVybWluYXRlKFByb2Nl c3NUZXJtaW5hdGlvblJlYXNvbjo6TmF2aWdhdGlvblN3YXApOworICAgIHByb2Nlc3MoKS5yZW1v dmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVy TmFtZSgpLCBwYWdlSUQoKSk7CisKKyAgICBhdXRvKiBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0 YXRlKCkubmF2aWdhdGlvbihtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkpOworICAg IGJvb2wgZGlkU3VzcGVuZFByZXZpb3VzUGFnZSA9IG5hdmlnYXRpb24gPyBzdXNwZW5kQ3VycmVu dFBhZ2VJZlBvc3NpYmxlKCpuYXZpZ2F0aW9uLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNz LCBtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCgpKSA6IGZh bHNlOworICAgIC8vIFRoZXJlIGlzIG5vIHdheSB3ZSdsbCBiZSBhYmxlIHRvIHJldHVybiB0byB0 aGUgcGFnZSBpbiB0aGUgcHJldmlvdXMgcGFnZSBzbyBjbG9zZSBpdC4KKyAgICBpZiAoIWRpZFN1 c3BlbmRQcmV2aW91c1BhZ2UpCisgICAgICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQ YWdlOjpDbG9zZSgpLCBwYWdlSUQoKSk7CisKKyAgICBwcm9jZXNzKCkucmVtb3ZlV2ViUGFnZSgq dGhpcywgcGFnZUlEKCksIFdlYlByb2Nlc3NQcm94eTo6RW5kc1VzaW5nRGF0YVN0b3JlOjpObyk7 CisgICAgc3dhcFRvV2ViUHJvY2VzcyhtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2VzcygpLCBtX3By b3Zpc2lvbmFsUGFnZS0+dGFrZURyYXdpbmdBcmVhKCksIG1fcHJvdmlzaW9uYWxQYWdlLT5tYWlu RnJhbWUoKSk7CisKKyAgICBkaWRDb21taXRMb2FkRm9yRnJhbWUoZnJhbWVJRCwgbmF2aWdhdGlv bklELCBtaW1lVHlwZSwgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIGZyYW1lTG9hZFR5 cGUsIGNlcnRpZmljYXRlSW5mbywgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgZm9yY2VkSGFzSW5z ZWN1cmVDb250ZW50LCB1c2VyRGF0YSk7CisKKyAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxw dHI7Cit9CisKIHZvaWQgV2ViUGFnZVByb3h5Ojpjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nl c3MoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVk UGFnZVByb3h5PiYmIHN1c3BlbmRlZFBhZ2VQcm94eSwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBw cm9jZXNzLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVk QnlDbGllbnQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVz KQogewogICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImNvbnRpbnVlTmF2aWdh dGlvbkluTmV3UHJvY2Vzczogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9j ZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCk7CiAgICAgTE9HKExvYWRpbmcsICJD b250aW51aW5nIG5hdmlnYXRpb24gJSIgUFJJdTY0ICIgJyVzJyBpbiBhIG5ldyB3ZWIgcHJvY2Vz cyIsIG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24ubG9nZ2luZ1N0cmluZygp KTsKIAotICAgIFJlZjxXZWJQcm9jZXNzUHJveHk+IHByZXZpb3VzUHJvY2VzcyA9IG1fcHJvY2Vz cy5jb3B5UmVmKCk7Ci0gICAgT3B0aW9uYWw8dWludDY0X3Q+IG1haW5GcmFtZUlESW5QcmV2aW91 c1Byb2Nlc3MgPSBtX21haW5GcmFtZSA/IG1ha2VPcHRpb25hbChtX21haW5GcmFtZS0+ZnJhbWVJ RCgpKSA6IFdURjo6bnVsbG9wdDsKLSAgICBhdXRvIG1haW5GcmFtZVVSTCA9IG1fbWFpbkZyYW1l ID8gbV9tYWluRnJhbWUtPnVybCgpIDogVVJMKCk7Ci0KLSAgICBBU1NFUlQobV9wcm9jZXNzLnB0 cigpICE9IHByb2Nlc3MucHRyKCkpOwotCi0gICAgcHJvY2Vzc0RpZFRlcm1pbmF0ZShQcm9jZXNz VGVybWluYXRpb25SZWFzb246Ok5hdmlnYXRpb25Td2FwKTsKKyAgICBpZiAobV9wcm92aXNpb25h bFBhZ2UpIHsKKyAgICAgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSAh PSBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpKQorICAgICAgICAgICAgbV9wcm92aXNpb25hbFBh Z2UtPmNhbmNlbCgpOworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7CisgICAg fQogCi0gICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2VJRCk7Ci0gICAgYm9vbCBkaWRT dXNwZW5kUHJldmlvdXNQYWdlID0gc3VzcGVuZEN1cnJlbnRQYWdlSWZQb3NzaWJsZShuYXZpZ2F0 aW9uLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5 Q2xpZW50KTsKLSAgICBtX3Byb2Nlc3MtPnJlbW92ZVdlYlBhZ2UoKnRoaXMsIG1fcGFnZUlELCBX ZWJQcm9jZXNzUHJveHk6OkVuZHNVc2luZ0RhdGFTdG9yZTo6Tm8pOworICAgIGF1dG8gcGFnZVBy b2Nlc3NPdmVycmlkZSA9IHRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKHByb2Nlc3MpOworICAg IGF1dG8gZHJhd2luZ0FyZWEgPSBwYWdlQ2xpZW50KCkuY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgp OworICAgIEFTU0VSVChkcmF3aW5nQXJlYSk7CisgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBzdGQ6 Om1ha2VfdW5pcXVlPFByb3Zpc2lvbmFsUGFnZVByb3h5PigqdGhpcywgcHJvY2Vzcy5jb3B5UmVm KCksIFdURk1vdmUoc3VzcGVuZGVkUGFnZVByb3h5KSwgV1RGTW92ZShkcmF3aW5nQXJlYSksIG5h dmlnYXRpb24ubmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3RJc1JlZGly ZWN0KCksIG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKSwgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRC eUNsaWVudCk7CiAKLSAgICBzd2FwVG9XZWJQcm9jZXNzKFdURk1vdmUocHJvY2VzcyksIFdURk1v dmUoc3VzcGVuZGVkUGFnZVByb3h5KSwgZGlkU3VzcGVuZFByZXZpb3VzUGFnZSA/IElzU3dhcEZy b21TdXNwZW5kZWQ6OlllcyA6IElzU3dhcEZyb21TdXNwZW5kZWQ6Ok5vKTsKKyAgICBhdXRvIHBh cmFtZXRlcnMgPSBjcmVhdGlvblBhcmFtZXRlcnMoKTsKKyAgICBwYXJhbWV0ZXJzLmlzUHJvY2Vz c1N3YXAgPSB0cnVlOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6 Q3JlYXRlV2ViUGFnZShtX3BhZ2VJRCwgcGFyYW1ldGVycyksIDApOwogCiAgICAgaWYgKGF1dG8q IGl0ZW0gPSBuYXZpZ2F0aW9uLnRhcmdldEl0ZW0oKSkgewogICAgICAgICBMT0coTG9hZGluZywg IldlYlBhZ2VQcm94eSAlcCBjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MgdG8gYmFjayBp dGVtIFVSTCAlcyIsIHRoaXMsIGl0ZW0tPnVybCgpLnV0ZjgoKS5kYXRhKCkpOwpAQCAtMjc5NCw0 MSArMjc5Niw2IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpjb250aW51ZU5hdmlnYXRpb25Jbk5ld1By b2Nlc3MoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBzCiAgICAgICAgIGxvYWREYXRhV2l0 aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgeyBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5kYXRhKCks IHN1YnN0aXR1dGVEYXRhLT5jb250ZW50LnNpemUoKSB9LCBzdWJzdGl0dXRlRGF0YS0+TUlNRVR5 cGUsIHN1YnN0aXR1dGVEYXRhLT5lbmNvZGluZywgc3Vic3RpdHV0ZURhdGEtPmJhc2VVUkwsIHN1 YnN0aXR1dGVEYXRhLT51c2VyRGF0YS5nZXQoKSwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2Fk OjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiAgICAgZWxzZQogICAgICAgICBsb2Fk UmVxdWVzdFdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIFJlc291cmNlUmVxdWVzdCB7IG5hdmln YXRpb24uY3VycmVudFJlcXVlc3QoKSB9LCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxz UG9saWN5OjpTaG91bGRBbGxvd0V4dGVybmFsU2NoZW1lcywgbnVsbHB0ciwgU2hvdWxkVHJlYXRB c0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Ci0KLSAgICBB U1NFUlQoIW1fbWFpbkZyYW1lKTsKLSAgICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlciA9IFt0 aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKSwgbmF2aWdhdGlvbklEID0gbmF2aWdh dGlvbi5uYXZpZ2F0aW9uSUQoKSwgcmVxdWVzdCA9ICBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0 KCksIG1haW5GcmFtZVVSTCwgaXNTZXJ2ZXJSZWRpcmVjdCA9IG5hdmlnYXRpb24uY3VycmVudFJl cXVlc3RJc1JlZGlyZWN0KCldKCkgbXV0YWJsZSB7Ci0gICAgICAgIGlmICghd2Vha1RoaXMpCi0g ICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKLSAgICAg ICAgLy8gVGhpcyBuYXZpZ2F0aW9uIHdhcyBkZXN0cm95ZWQgc28gbm8gbmVlZCB0byBub3RpZnkg b2YgcmVkaXJlY3QuCi0gICAgICAgIGlmICghbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlvbihu YXZpZ2F0aW9uSUQpKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIC8vIFJlc3RvcmUg dGhlIG1haW4gZnJhbWUncyBjb21taXR0ZWQgVVJMIGFzIHNvbWUgY2xpZW50cyBtYXkgcmVseSBv biBpdCB1bnRpbCB0aGUgbmV4dCBsb2FkIGlzIGNvbW1pdHRlZC4KLSAgICAgICAgbV9tYWluRnJh bWUtPmZyYW1lTG9hZFN0YXRlKCkuc2V0VVJMKG1haW5GcmFtZVVSTCk7Ci0KLSAgICAgICAgLy8g Tm9ybWFsbHksIG5vdGlmaWNhdGlvbiBvZiBhIHNlcnZlciByZWRpcmVjdCBjb21lcyBmcm9tIHRo ZSBXZWJDb250ZW50IHByb2Nlc3MuCi0gICAgICAgIC8vIElmIHdlIGFyZSBwcm9jZXNzIHN3YXBw aW5nIGluIHJlc3BvbnNlIHRvIGEgc2VydmVyIHJlZGlyZWN0IHRoZW4gdGhhdCBub3RpZmljYXRp b24gd2lsbCBub3QgY29tZSBmcm9tIHRoZSBuZXcgV2ViQ29udGVudCBwcm9jZXNzLgotICAgICAg ICAvLyBJbiB0aGlzIGNhc2Ugd2UgaGF2ZSB0aGUgVUlQcm9jZXNzIHN5bnRoZXNpemUgdGhlIHJl ZGlyZWN0IG5vdGlmaWNhdGlvbiBhdCB0aGUgYXBwcm9wcmlhdGUgdGltZS4KLSAgICAgICAgaWYg KGlzU2VydmVyUmVkaXJlY3QpIHsKLSAgICAgICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxvYWRT dGF0ZSgpLmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKHJlcXVlc3QudXJsKCkpOwotICAgICAgICAg ICAgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUobV9t YWluRnJhbWUtPmZyYW1lSUQoKSwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKHJlcXVlc3QpLCB7IH0p OwotICAgICAgICB9Ci0gICAgfTsKLQotICAgIGlmICghbV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgp LmNvbmZpZ3VyYXRpb24oKS5wcm9jZXNzU3dhcHNPbldpbmRvd09wZW5XaXRoT3BlbmVyKCkgfHwg IWlzUGFnZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgfHwgIW1haW5G cmFtZUlESW5QcmV2aW91c1Byb2Nlc3MpIHsKLSAgICAgICAgLy8gVGhlcmUgaXMgbm8gd2F5IHdl J2xsIGJlIGFibGUgdG8gcmV0dXJuIHRvIHRoZSBwYWdlIGluIHRoZSBwcmV2aW91cyBwYWdlIHNv IGNsb3NlIGl0LgotICAgICAgICBpZiAoIWRpZFN1c3BlbmRQcmV2aW91c1BhZ2UpCi0gICAgICAg ICAgICBwcmV2aW91c1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNsb3NlKCksIG1f cGFnZUlEKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIG1fbWFpbkZyYW1lV2luZG93 Q3JlYXRpb25IYW5kbGVyID0gW3RoaXMsIHByZXZpb3VzUHJvY2VzcyA9IFdURk1vdmUocHJldmlv dXNQcm9jZXNzKSwgbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcyA9ICptYWluRnJhbWVJRElu UHJldmlvdXNQcm9jZXNzXShjb25zdCBHbG9iYWxXaW5kb3dJZGVudGlmaWVyJiB3aW5kb3dJZGVu dGlmaWVyKSB7Ci0gICAgICAgIEFTU0VSVChtX21haW5GcmFtZSk7Ci0gICAgICAgIEdsb2JhbEZy YW1lSWRlbnRpZmllciBuYXZpZ2F0ZWRGcmFtZUlkZW50aWZpZXJJbk5ld1Byb2Nlc3MgeyBwYWdl SUQoKSwgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSB9OwotICAgICAgICBwcmV2aW91c1Byb2Nlc3Mt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkZyYW1lQmVjYW1lUmVtb3RlKG1haW5GcmFtZUlESW5Q cmV2aW91c1Byb2Nlc3MsIG5hdmlnYXRlZEZyYW1lSWRlbnRpZmllckluTmV3UHJvY2Vzcywgd2lu ZG93SWRlbnRpZmllciksIHBhZ2VJRCgpKTsKLSAgICB9OwogfQogCiBib29sIFdlYlBhZ2VQcm94 eTo6aXNQYWdlT3BlbmVkQnlET01TaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSBjb25zdApA QCAtMzY5MywxMSArMzY2MCw2IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJh bWUodWludDY0X3QgZnJhbWVJRCkKIAogICAgIC8vIEFkZCB0aGUgZnJhbWUgdG8gdGhlIHByb2Nl c3Mgd2lkZSBtYXAuCiAgICAgbV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoZnJhbWVJRCwgKm1fbWFp bkZyYW1lKTsKLQotICAgIGlmIChtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlcikgewotICAgICAg ICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlcigpOwotICAgICAgICBtX21haW5GcmFtZUNyZWF0 aW9uSGFuZGxlciA9IG51bGxwdHI7Ci0gICAgfQogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlk Q3JlYXRlU3ViZnJhbWUodWludDY0X3QgZnJhbWVJRCkKQEAgLTM3MjIsMTAgKzM2ODQsNiBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlU3ViZnJhbWUodWludDY0X3QgZnJhbWVJRCkKIAog dm9pZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVdpbmRvdyh1aW50NjRfdCBmcmFtZUlELCBHbG9i YWxXaW5kb3dJZGVudGlmaWVyJiYgd2luZG93SWRlbnRpZmllcikKIHsKLSAgICBpZiAobV9tYWlu RnJhbWUgJiYgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSA9PSBmcmFtZUlEKSB7Ci0gICAgICAgIGlm IChhdXRvIG1haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlciA9IFdURk1vdmUobV9tYWluRnJh bWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIpKQotICAgICAgICAgICAgbWFpbkZyYW1lV2luZG93Q3Jl YXRpb25IYW5kbGVyKHdpbmRvd0lkZW50aWZpZXIpOwotICAgIH0KIH0KIAogZG91YmxlIFdlYlBh Z2VQcm94eTo6ZXN0aW1hdGVkUHJvZ3Jlc3MoKSBjb25zdApAQCAtMzc3OCw2ICszNzM2LDEwIEBA IHZvaWQgV2ViUGFnZVByb3h5OjpkaWREZXN0cm95TmF2aWdhdGlvbih1aW50NjRfdCBuYXZpZ2F0 aW9uSUQpCiB7CiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgp KTsKIAorICAgIC8vIE9uIHByb2Nlc3Mtc3dhcCwgdGhlIHByZXZpb3VzIHByb2Nlc3MgdHJpZXMg dG8gZGVzdHJveSB0aGUgbmF2aWdhdGlvbiBidXQgdGhlIHByb3Zpc2lvbmFsIHByb2Nlc3MgaXMg YWN0dWFsbHkgdGFraW5nIG92ZXIgdGhlIG5hdmlnYXRpb24uCisgICAgaWYgKG1fcHJvdmlzaW9u YWxQYWdlICYmIG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSA9PSBuYXZpZ2F0aW9u SUQpCisgICAgICAgIHJldHVybjsKKwogICAgIC8vIEZJWE1FOiBNZXNzYWdlIGNoZWNrIHRoZSBu YXZpZ2F0aW9uSUQuCiAgICAgbV9uYXZpZ2F0aW9uU3RhdGUtPmRpZERlc3Ryb3lOYXZpZ2F0aW9u KG5hdmlnYXRpb25JRCk7CiB9CkBAIC0zNzk1LDE0ICszNzU3LDYgQEAgdm9pZCBXZWJQYWdlUHJv eHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWlu dDY0X3QgbmEKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkgJiYgbmF2aWdhdGlvbklEKQog ICAgICAgICBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlvbihuYXZpZ2F0 aW9uSUQpOwogCi0gICAgLy8gSWYgdGhpcyBzZWVtaW5nbHkgbmV3IGxvYWQgaXMgYWN0dWFsbHkg Y29udGludWluZyBhIHNlcnZlciByZWRpcmVjdCBmb3IgYSBwcmV2aW91cyBuYXZpZ2F0aW9uIGlu IGEgbmV3IHByb2Nlc3MsCi0gICAgLy8gdGhlbiB3ZSBpZ25vcmUgdGhpcyBub3RpZmljYXRpb24u Ci0gICAgaWYgKG5hdmlnYXRpb24gJiYgbmF2aWdhdGlvbi0+Y3VycmVudFJlcXVlc3RJc1JlZGly ZWN0KCkpIHsKLSAgICAgICAgYXV0byBuYXZpZ2F0aW9uUHJvY2Vzc0lkZW50aWZpZXIgPSBuYXZp Z2F0aW9uLT5jdXJyZW50UmVxdWVzdFByb2Nlc3NJZGVudGlmaWVyKCk7Ci0gICAgICAgIGlmIChu YXZpZ2F0aW9uUHJvY2Vzc0lkZW50aWZpZXIgJiYgKm5hdmlnYXRpb25Qcm9jZXNzSWRlbnRpZmll ciAhPSBtX3Byb2Nlc3MtPmNvcmVQcm9jZXNzSWRlbnRpZmllcigpKQotICAgICAgICAgICAgcmV0 dXJuOwotICAgIH0KLQogICAgIExPRyhMb2FkaW5nLCAiV2ViUGFnZVByb3h5ICUiIFBSSXU2NCAi IGluIHByb2Nlc3MgcGlkICVpIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUgdG8gZnJh bWVJRCAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEICUiIFBSSXU2NCAiLCB1cmwgJXMiLCBtX3Bh Z2VJRCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBmcmFtZUlELCBuYXZpZ2F0aW9u SUQsIHVybC5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICAgICBSRUxFQVNFX0xPR19JRl9BTExP V0VEKExvYWRpbmcsICJkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOiB3ZWJQSUQgPSAl aSwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+ cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQsIGZyYW1lSUQpOwogCkBAIC0zOTEwLDYgKzM4 NjQsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFt ZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cmkKIAogICAgIFBhZ2VDbGllbnRQcm90ZWN0 b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKKyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2Ug JiYgbV9wcm92aXNpb25hbFBhZ2UtPm5hdmlnYXRpb25JRCgpID09IG5hdmlnYXRpb25JRCAmJiAm bV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3MoKSAhPSBtX3Byb2Nlc3MucHRyKCkpIHsKKyAgICAg ICAgLy8gVGhlIGxvYWQgZGlkIG5vdCBmYWlsLCBpdCBtZXJlbHkgaGFwcGVuaW5nIGluIGEgbmV3 IHByb3Zpc2lvbmFsIHByb2Nlc3MuCisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBXZWJG cmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7CiAgICAgTUVT U0FHRV9DSEVDSyhmcmFtZSk7CiAKQEAgLTM5NDgsNiArMzkwNywxMCBAQCB2b2lkIFdlYlBhZ2VQ cm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNv bnN0IFNlY3VyaQogICAgIH0KIAogICAgIG1fZmFpbGluZ1Byb3Zpc2lvbmFsTG9hZFVSTCA9IHsg fTsKKworICAgIC8vIElmIHRoZSBwcm92aXNpb25hbCBwYWdlJ3MgbG9hZCBmYWlscyB0aGVuIHdl IGRlc3Ryb3kgdGhlIHByb3Zpc2lvbmFsIHBhZ2UuCisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdl ICYmIG1fcHJvdmlzaW9uYWxQYWdlLT5tYWluRnJhbWUoKSA9PSBmcmFtZSkKKyAgICAgICAgbV9w cm92aXNpb25hbFBhZ2UgPSBudWxscHRyOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6Y2xlYXJM b2FkRGVwZW5kZW50Q2FsbGJhY2tzKCkKQEAgLTQzMzksOCArNDMwMiw4IEBAIHZvaWQgV2ViUGFn ZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmModWludDY0X3QgZnJh bWVJRCwgV2ViQ29yCiAgICAgYXV0byogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1l SUQpOwogICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOwogCi0gICAgZGVjaWRlUG9saWN5Rm9yTmF2 aWdhdGlvbkFjdGlvbigqZnJhbWUsIFdURk1vdmUoZnJhbWVTZWN1cml0eU9yaWdpbiksIG5hdmln YXRpb25JRCwgV1RGTW92ZShuYXZpZ2F0aW9uQWN0aW9uRGF0YSksIFdURk1vdmUoZnJhbWVJbmZv RGF0YSksIG9yaWdpbmF0aW5nUGFnZUlELCBvcmlnaW5hbFJlcXVlc3QsIFdURk1vdmUocmVxdWVz dCksIFdURk1vdmUocmVxdWVzdEJvZHkpLCBXVEZNb3ZlKHJlZGlyZWN0UmVzcG9uc2UpLCB1c2Vy RGF0YSwgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9 IG1ha2VSZWYoKnRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklEXSAoYXV0by4uLiBhcmdzKSB7Ci0g ICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGlj eURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CisgICAg ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbigqZnJhbWUsIFdURk1vdmUoZnJhbWVTZWN1 cml0eU9yaWdpbiksIG5hdmlnYXRpb25JRCwgV1RGTW92ZShuYXZpZ2F0aW9uQWN0aW9uRGF0YSks IFdURk1vdmUoZnJhbWVJbmZvRGF0YSksIG9yaWdpbmF0aW5nUGFnZUlELCBvcmlnaW5hbFJlcXVl c3QsIFdURk1vdmUocmVxdWVzdCksIFdURk1vdmUocmVxdWVzdEJvZHkpLCBXVEZNb3ZlKHJlZGly ZWN0UmVzcG9uc2UpLCB1c2VyRGF0YSwgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShbdGhp cywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklELCBw cm9jZXNzID0gbV9wcm9jZXNzLmNvcHlSZWYoKV0gKGF1dG8uLi4gYXJncykgeworICAgICAgICBw cm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRSZWNlaXZlUG9saWN5RGVjaXNpb24o ZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJncy4uLiksIG1fcGFnZUlEKTsKICAgICB9KSk7CiB9CiAK QEAgLTQ1NzQsMTIgKzQ1MzcsMTIgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZv clJlc3BvbnNlKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaXR5T3JpZ2kKICAgICBNRVNT QUdFX0NIRUNLX1VSTChyZXNwb25zZS51cmwoKSk7CiAKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0 aW9uPiBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvbklEID8gbV9uYXZpZ2F0aW9uU3RhdGUtPm5hdmln YXRpb24obmF2aWdhdGlvbklEKSA6IG51bGxwdHI7Ci0gICAgYXV0byBsaXN0ZW5lciA9IG1ha2VS ZWYoZnJhbWUtPnNldFVwUG9saWN5TGlzdGVuZXJQcm94eShbdGhpcywgcHJvdGVjdGVkVGhpcyA9 IG1ha2VSZWYoKnRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklELCBuYXZpZ2F0aW9uID0gV1RGTW92 ZShuYXZpZ2F0aW9uKV0gKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0 ZVBvbGljaWVzKiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVl c3RlZEJ5Q2xpZW50LCBSZWZQdHI8U2FmZUJyb3dzaW5nV2FybmluZz4mJiBzYWZlQnJvd3NpbmdX YXJuaW5nKSBtdXRhYmxlIHsKKyAgICBhdXRvIGxpc3RlbmVyID0gbWFrZVJlZihmcmFtZS0+c2V0 VXBQb2xpY3lMaXN0ZW5lclByb3h5KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhp cyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIG5hdmlnYXRpb24gPSBXVEZNb3ZlKG5hdmlnYXRpb24p LCBwcm9jZXNzID0gbV9wcm9jZXNzLmNvcHlSZWYoKV0gKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lB Y3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVu dCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBSZWZQdHI8U2FmZUJyb3dzaW5nV2Fybmlu Zz4mJiBzYWZlQnJvd3NpbmdXYXJuaW5nKSBtdXRhYmxlIHsKICAgICAgICAgLy8gRklYTUU6IEFz c2VydCB0aGUgQVBJOjpXZWJzaXRlUG9saWNpZXMqIGlzIG51bGxwdHIgaGVyZSBvbmNlIGNsaWVu dHMgb2YgV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNlV2l0aFBvbGljaWVzIGdvIGF3YXkuCiAgICAg ICAgIFJFTEVBU0VfQVNTRVJUKHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgPT0gUHJvY2Vz c1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDo6Tm8pOwogICAgICAgICBBU1NFUlRfVU5VU0VEKHNhZmVC cm93c2luZ1dhcm5pbmcsICFzYWZlQnJvd3NpbmdXYXJuaW5nKTsKLSAgICAgICAgcmVjZWl2ZWRQ b2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24sIG5hdmlnYXRpb24uZ2V0KCksIFdURjo6bnVsbG9w dCwgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFdU Rk1vdmUocHJvdGVjdGVkVGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySURdIChhdXRvLi4uIGFyZ3Mp IHsKLSAgICAgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkUmVj ZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4pLCBtX3BhZ2VJ RCk7CisgICAgICAgIHJlY2VpdmVkUG9saWN5RGVjaXNpb24ocG9saWN5QWN0aW9uLCBuYXZpZ2F0 aW9uLmdldCgpLCBXVEY6Om51bGxvcHQsIFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3Ro aXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCBmcmFtZUlELCBsaXN0 ZW5lcklELCBwcm9jZXNzID0gV1RGTW92ZShwcm9jZXNzKV0gKGF1dG8uLi4gYXJncykgeworICAg ICAgICAgICAgcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGlj eURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CiAgICAg ICAgIH0pKTsKICAgICB9LCBTaG91bGRFeHBlY3RTYWZlQnJvd3NpbmdSZXN1bHQ6Ok5vKSk7CiAK QEAgLTY0ODYsOCArNjQ0OSw2IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpwcm9jZXNzV2lsbEJlY29t ZUZvcmVncm91bmQoKQogdm9pZCBXZWJQYWdlUHJveHk6OnJlc2V0U3RhdGUoUmVzZXRTdGF0ZVJl YXNvbiByZXNldFN0YXRlUmVhc29uKQogewogICAgIG1fbWFpbkZyYW1lID0gbnVsbHB0cjsKLSAg ICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlciA9IG51bGxwdHI7Ci0gICAgbV9tYWluRnJhbWVX aW5kb3dDcmVhdGlvbkhhbmRsZXIgPSBudWxscHRyOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAg ICAgbV9zY3JvbGxpbmdQZXJmb3JtYW5jZURhdGEgPSBudWxscHRyOwpAQCAtNjc3OCw2ICs2NzM5 LDEwIEBAIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMgV2ViUGFnZVByb3h5OjpjcmVhdGlvblBh cmFtZXRlcnMoKQogICAgIHBhcmFtZXRlcnMuYXBwbGljYXRpb25NYW5pZmVzdCA9IG1fY29uZmln dXJhdGlvbi0+YXBwbGljYXRpb25NYW5pZmVzdCgpID8gT3B0aW9uYWw8V2ViQ29yZTo6QXBwbGlj YXRpb25NYW5pZmVzdD4obV9jb25maWd1cmF0aW9uLT5hcHBsaWNhdGlvbk1hbmlmZXN0KCktPmFw cGxpY2F0aW9uTWFuaWZlc3QoKSkgOiBXVEY6Om51bGxvcHQ7CiAjZW5kaWYKIAorI2lmIEVOQUJM RShTRVJWSUNFX1dPUktFUikKKyAgICBwYXJhbWV0ZXJzLmhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29y a2VycyA9IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLm1heUhhdmVSZWdpc3RlcmVkU2VydmljZVdv cmtlcnMobV93ZWJzaXRlRGF0YVN0b3JlKTsKKyNlbmRpZgorCiAgICAgcGFyYW1ldGVycy5uZWVk c0ZvbnRBdHRyaWJ1dGVzID0gbV9uZWVkc0ZvbnRBdHRyaWJ1dGVzOwogCiAgICAgbV9wcm9jZXNz LT5hZGRXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eShtX3VzZXJDb250ZW50Q29udHJvbGxl ciwgcGFyYW1ldGVycyk7CkBAIC04NTM5LDYgKzg1MDQsMjEgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OnNpbXVsYXRlRGV2aWNlT3JpZW50YXRpb25DaGFuZ2UoZG91YmxlIGFscGhhLCBkb3VibGUgYmV0 YSwgZG8KICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNpbXVsYXRlRGV2 aWNlT3JpZW50YXRpb25DaGFuZ2UoYWxwaGEsIGJldGEsIGdhbW1hKSwgbV9wYWdlSUQpOwogfQog CitXZWJQYWdlUHJveHk6OlBhZ2VQcm9jZXNzT3ZlcnJpZGU6OlBhZ2VQcm9jZXNzT3ZlcnJpZGUo V2ViUGFnZVByb3h5JiBwYWdlLCBXZWJQcm9jZXNzUHJveHkmIG5ld1Byb2Nlc3MpCisgICAgOiBt X3BhZ2UoJnBhZ2UpCisgICAgLCBtX3ByZXZpb3VzUHJvY2VzcyhwYWdlLnByb2Nlc3MoKSkKK3sK KyAgICBwYWdlLm1fcHJvY2VzcyA9IG5ld1Byb2Nlc3M7Cit9CisKK1dlYlBhZ2VQcm94eTo6UGFn ZVByb2Nlc3NPdmVycmlkZTo6UGFnZVByb2Nlc3NPdmVycmlkZShQYWdlUHJvY2Vzc092ZXJyaWRl JiYpID0gZGVmYXVsdDsKKworV2ViUGFnZVByb3h5OjpQYWdlUHJvY2Vzc092ZXJyaWRlOjp+UGFn ZVByb2Nlc3NPdmVycmlkZSgpCit7CisgICAgaWYgKG1fcGFnZSkKKyAgICAgICAgbV9wYWdlLT5t X3Byb2Nlc3MgPSBXVEZNb3ZlKG1fcHJldmlvdXNQcm9jZXNzKTsKK30KKwogI2lmIEVOQUJMRShE QVRBX0RFVEVDVElPTikKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRldGVjdERhdGFJbkFsbEZyYW1l cyhXZWJDb3JlOjpEYXRhRGV0ZWN0b3JUeXBlcyB0eXBlcywgQ29tcGxldGlvbkhhbmRsZXI8dm9p ZChjb25zdCBEYXRhRGV0ZWN0aW9uUmVzdWx0Jik+JiYgY29tcGxldGlvbkhhbmRsZXIpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGNkODAxYjgwOGM0Li41OGMwZTY1 NmEzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTIyNSw2ICsy MjUsNyBAQCBjbGFzcyBOYXRpdmVXZWJLZXlib2FyZEV2ZW50OwogY2xhc3MgTmF0aXZlV2ViTW91 c2VFdmVudDsKIGNsYXNzIE5hdGl2ZVdlYldoZWVsRXZlbnQ7CiBjbGFzcyBQYWdlQ2xpZW50Owor Y2xhc3MgUHJvdmlzaW9uYWxQYWdlUHJveHk7CiBjbGFzcyBSZW1vdGVMYXllclRyZWVIb3N0Owog Y2xhc3MgUmVtb3RlTGF5ZXJUcmVlU2Nyb2xsaW5nUGVyZm9ybWFuY2VEYXRhOwogY2xhc3MgUmVt b3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb247CkBAIC00NTgsOCArNDU5LDcgQEAgcHVibGljOgogICAg IEFQSTo6SWNvbkxvYWRpbmdDbGllbnQmIGljb25Mb2FkaW5nQ2xpZW50KCkgeyByZXR1cm4gKm1f aWNvbkxvYWRpbmdDbGllbnQ7IH0KICAgICB2b2lkIHNldEljb25Mb2FkaW5nQ2xpZW50KHN0ZDo6 dW5pcXVlX3B0cjxBUEk6Okljb25Mb2FkaW5nQ2xpZW50PiYmKTsKIAotICAgIGVudW0gY2xhc3Mg SXNTd2FwRnJvbVN1c3BlbmRlZCB7IE5vLCBZZXMgfTsKLSAgICB2b2lkIGluaXRpYWxpemVXZWJQ YWdlKElzU3dhcEZyb21TdXNwZW5kZWQgPSBJc1N3YXBGcm9tU3VzcGVuZGVkOjpObyk7CisgICAg dm9pZCBpbml0aWFsaXplV2ViUGFnZSgpOwogCiAgICAgV2Vha1B0cjxTZWNLZXlQcm94eVN0b3Jl PiBzZWNLZXlQcm94eVN0b3JlKGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl Jik7CiAgICAgICAgIApAQCAtMTAyNSw2ICsxMDI1LDE5IEBAIHB1YmxpYzoKICAgICBXZWJQcm9j ZXNzUHJveHkmIHByb2Nlc3MoKSB7IHJldHVybiBtX3Byb2Nlc3M7IH0KICAgICBQcm9jZXNzSUQg cHJvY2Vzc0lkZW50aWZpZXIoKSBjb25zdDsKIAorICAgIGNsYXNzIFBhZ2VQcm9jZXNzT3ZlcnJp ZGUgeworICAgIHB1YmxpYzoKKyAgICAgICAgUGFnZVByb2Nlc3NPdmVycmlkZShXZWJQYWdlUHJv eHkmLCBXZWJQcm9jZXNzUHJveHkmIG5ld1Byb2Nlc3MpOworICAgICAgICBQYWdlUHJvY2Vzc092 ZXJyaWRlKFBhZ2VQcm9jZXNzT3ZlcnJpZGUmJik7CisgICAgICAgIH5QYWdlUHJvY2Vzc092ZXJy aWRlKCk7CisKKyAgICBwcml2YXRlOgorICAgICAgICBSZWZQdHI8V2ViUGFnZVByb3h5PiBtX3Bh Z2U7CisgICAgICAgIFJlZjxXZWJQcm9jZXNzUHJveHk+IG1fcHJldmlvdXNQcm9jZXNzOworICAg IH07CisKKyAgICBQYWdlUHJvY2Vzc092ZXJyaWRlIHRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNz KFdlYlByb2Nlc3NQcm94eSYgbmV3UHJvY2VzcykgeyByZXR1cm4gUGFnZVByb2Nlc3NPdmVycmlk ZSgqdGhpcywgbmV3UHJvY2Vzcyk7IH0KKwogICAgIFdlYlByZWZlcmVuY2VzJiBwcmVmZXJlbmNl cygpIHsgcmV0dXJuIG1fcHJlZmVyZW5jZXM7IH0KICAgICB2b2lkIHNldFByZWZlcmVuY2VzKFdl YlByZWZlcmVuY2VzJik7CiAKQEAgLTE0MTQsNiArMTQyNywxOSBAQCBwdWJsaWM6CiAgICAgRWRp dGFibGVJbWFnZUNvbnRyb2xsZXImIGVkaXRhYmxlSW1hZ2VDb250cm9sbGVyKCkgeyByZXR1cm4g Km1fZWRpdGFibGVJbWFnZUNvbnRyb2xsZXI7IH0KICNlbmRpZgogCisgICAgUHJvdmlzaW9uYWxQ YWdlUHJveHkqIHByb3Zpc2lvbmFsUGFnZVByb3h5KCkgY29uc3QgeyByZXR1cm4gbV9wcm92aXNp b25hbFBhZ2UuZ2V0KCk7IH0KKworICAgIHZvaWQgY29tbWl0UHJvdmlzaW9uYWxQYWdlKHVpbnQ2 NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlw ZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVMb2Fk VHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiwgYm9vbCBjb250YWluc1BsdWdp bkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhh c0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmKTsKKworICAgIHZvaWQgZGlkU3RhcnRQ cm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0 aW9uSUQsIFVSTCYmLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmKTsKKyAg ICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBj b25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVp bnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRS ZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBm cmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYm LCBjb25zdCBVc2VyRGF0YSYpOworCisgICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKKyAgICAv LyBJbXBsZW1lbnRlZCBpbiBnZW5lcmF0ZWQgV2ViUGFnZVByb3h5TWVzc2FnZVJlY2VpdmVyLmNw cAorICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNv ZGVyJikgb3ZlcnJpZGU7CisgICAgdm9pZCBkaWRSZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpDb25u ZWN0aW9uJiwgSVBDOjpEZWNvZGVyJiwgc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mKSBv dmVycmlkZTsKKwogcHJpdmF0ZToKICAgICBXZWJQYWdlUHJveHkoUGFnZUNsaWVudCYsIFdlYlBy b2Nlc3NQcm94eSYsIHVpbnQ2NF90IHBhZ2VJRCwgUmVmPEFQSTo6UGFnZUNvbmZpZ3VyYXRpb24+ JiYpOwogICAgIHZvaWQgcGxhdGZvcm1Jbml0aWFsaXplKCk7CkBAIC0xNDM4LDEyICsxNDY0LDYg QEAgcHJpdmF0ZToKIAogICAgIHZvaWQgc2V0VXNlckFnZW50KFN0cmluZyYmKTsKIAotICAgIC8v IElQQzo6TWVzc2FnZVJlY2VpdmVyCi0gICAgLy8gSW1wbGVtZW50ZWQgaW4gZ2VuZXJhdGVkIFdl YlBhZ2VQcm94eU1lc3NhZ2VSZWNlaXZlci5jcHAKLSAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdl KElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIG92ZXJyaWRlOwotICAgIHZvaWQgZGlk UmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYsIHN0ZDo6 dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+Jikgb3ZlcnJpZGU7Ci0KLQogICAgIC8vIElQQzo6TWVz c2FnZVNlbmRlcgogICAgIGJvb2wgc2VuZE1lc3NhZ2Uoc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5j b2Rlcj4sIE9wdGlvblNldDxJUEM6OlNlbmRPcHRpb24+KSBvdmVycmlkZTsKICAgICBJUEM6OkNv bm5lY3Rpb24qIG1lc3NhZ2VTZW5kZXJDb25uZWN0aW9uKCkgb3ZlcnJpZGU7CkBAIC0xNDY1LDEy ICsxNDg1LDkgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZENyZWF0ZVN1YmZyYW1lKHVpbnQ2NF90 IGZyYW1lSUQpOwogICAgIHZvaWQgZGlkQ3JlYXRlV2luZG93KHVpbnQ2NF90IGZyYW1lSUQsIFdl YkNvcmU6Okdsb2JhbFdpbmRvd0lkZW50aWZpZXImJik7CiAKLSAgICB2b2lkIGRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlv bklELCBVUkwmJiwgVVJMJiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJEYXRhJik7Ci0gICAg dm9pZCBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1 aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFdlYkNvcmU6OlJlc291cmNl UmVxdWVzdCYmLCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgd2lsbFBlcmZvcm1DbGllbnRS ZWRpcmVjdEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgdXJsLCBkb3Vi bGUgZGVsYXksIFdlYkNvcmU6OkxvY2tCYWNrRm9yd2FyZExpc3QpOwogICAgIHZvaWQgZGlkQ2Fu Y2VsQ2xpZW50UmVkaXJlY3RGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlEKTsKICAgICB2b2lkIGRp ZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3Qg bmF2aWdhdGlvbklELCBVUkwmJik7Ci0gICAgdm9pZCBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRh JiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmlu ZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBjb25zdCBV c2VyRGF0YSYpOwogICAgIHZvaWQgZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1l SUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBm cmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29u c3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiwgYm9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50 LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJl Q29udGVudCwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2b2lkIGRpZEZpbmlzaERvY3VtZW50TG9h ZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3Qg VXNlckRhdGEmKTsKICAgICB2b2lkIGRpZEZpbmlzaExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFt ZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFVzZXJEYXRhJik7CkBAIC0xNTc0LDEx ICsxNTkxLDExIEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRDYW5TaG9ydENpcmN1aXRIb3Jpem9u dGFsV2hlZWxFdmVudHMoYm9vbCBjYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMp IHsgbV9jYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMgPSBjYW5TaG9ydENpcmN1 aXRIb3Jpem9udGFsV2hlZWxFdmVudHM7IH0KIAogICAgIHZvaWQgcmVhdHRhY2hUb1dlYlByb2Nl c3MoKTsKLSAgICB2b2lkIHN3YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiwg c3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiwgSXNTd2FwRnJvbVN1c3BlbmRl ZCk7CisgICAgdm9pZCBzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIHN0 ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmLCBSZWZQdHI8V2ViRnJhbWVQcm94eT4m JiBtYWluRnJhbWUpOwogICAgIHZvaWQgZGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAo KTsKICAgICB2b2lkIGRpZFN1c3BlbmRBZnRlclByb2Nlc3NTd2FwKCk7CiAKLSAgICB2b2lkIGZp bmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhJc1N3YXBGcm9tU3VzcGVuZGVkID0gSXNTd2FwRnJv bVN1c3BlbmRlZDo6Tm8pOworICAgIHZvaWQgZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKCk7 CiAKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiByZWF0dGFjaFRvV2ViUHJvY2Vzc0ZvclJl bG9hZCgpOwogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IHJlYXR0YWNoVG9XZWJQcm9jZXNz V2l0aEl0ZW0oV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYpOwpAQCAtMTk1MSw4ICsxOTY4LDYgQEAg cHJpdmF0ZToKICAgICBSZWY8V2Vic2l0ZURhdGFTdG9yZT4gbV93ZWJzaXRlRGF0YVN0b3JlOwog CiAgICAgUmVmUHRyPFdlYkZyYW1lUHJveHk+IG1fbWFpbkZyYW1lOwotICAgIEZ1bmN0aW9uPHZv aWQoKT4gbV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXI7Ci0gICAgRnVuY3Rpb248dm9pZChjb25z dCBXZWJDb3JlOjpHbG9iYWxXaW5kb3dJZGVudGlmaWVyJik+IG1fbWFpbkZyYW1lV2luZG93Q3Jl YXRpb25IYW5kbGVyOwogCiAgICAgUmVmUHRyPFdlYkZyYW1lUHJveHk+IG1fZm9jdXNlZEZyYW1l OwogICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5PiBtX2ZyYW1lU2V0TGFyZ2VzdEZyYW1lOwpAQCAt MjMyMiw2ICsyMzM3LDggQEAgcHJpdmF0ZToKICAgICBib29sIG1fbmVlZHNGb250QXR0cmlidXRl cyB7IGZhbHNlIH07CiAgICAgYm9vbCBtX21heUhhdmVVbml2ZXJzYWxGaWxlUmVhZFNhbmRib3hF eHRlbnNpb24geyBmYWxzZSB9OwogCisgICAgc3RkOjp1bmlxdWVfcHRyPFByb3Zpc2lvbmFsUGFn ZVByb3h5PiBtX3Byb3Zpc2lvbmFsUGFnZTsKKwogI2lmIEhBVkUoUEVOQ0lMS0lUKQogICAgIHN0 ZDo6dW5pcXVlX3B0cjxFZGl0YWJsZUltYWdlQ29udHJvbGxlcj4gbV9lZGl0YWJsZUltYWdlQ29u dHJvbGxlcjsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Byb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94 eS5jcHAKaW5kZXggZGIxZmQ1OGI5M2QuLmY3ZGZhZTg2MjZjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNsdWRl ICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiUGx1Z2luSW5mb1N0b3JlLmgiCiAjaW5jbHVkZSAiUGx1 Z2luUHJvY2Vzc01hbmFnZXIuaCIKKyNpbmNsdWRlICJQcm92aXNpb25hbFBhZ2VQcm94eS5oIgog I2luY2x1ZGUgIlRleHRDaGVja2VyLmgiCiAjaW5jbHVkZSAiVGV4dENoZWNrZXJTdGF0ZS5oIgog I2luY2x1ZGUgIlVJTWVzc2FnZVBvcnRDaGFubmVsUHJvdmlkZXIuaCIKQEAgLTQzNiw3ICs0Mzcs NyBAQCBSZWY8V2ViUGFnZVByb3h5PiBXZWJQcm9jZXNzUHJveHk6OmNyZWF0ZVdlYlBhZ2UoUGFn ZUNsaWVudCYgcGFnZUNsaWVudCwgUmVmPEFQSQogdm9pZCBXZWJQcm9jZXNzUHJveHk6OmFkZEV4 aXN0aW5nV2ViUGFnZShXZWJQYWdlUHJveHkmIHdlYlBhZ2UsIHVpbnQ2NF90IHBhZ2VJRCwgQmVn aW5zVXNpbmdEYXRhU3RvcmUgYmVnaW5zVXNpbmdEYXRhU3RvcmUpCiB7CiAgICAgQVNTRVJUKCFt X3BhZ2VNYXAuY29udGFpbnMocGFnZUlEKSk7Ci0gICAgQVNTRVJUKCFnbG9iYWxQYWdlTWFwKCku Y29udGFpbnMocGFnZUlEKSk7CisgICAgQVNTRVJUKCFnbG9iYWxQYWdlTWFwKCkuY29udGFpbnMo cGFnZUlEKSB8fCBnbG9iYWxQYWdlTWFwKCkuZ2V0KHBhZ2VJRCkgPT0gJndlYlBhZ2UpOwogCiAg ICAgaWYgKGJlZ2luc1VzaW5nRGF0YVN0b3JlID09IEJlZ2luc1VzaW5nRGF0YVN0b3JlOjpZZXMp CiAgICAgICAgIG1fcHJvY2Vzc1Bvb2wtPnBhZ2VCZWdpblVzaW5nV2Vic2l0ZURhdGFTdG9yZSh3 ZWJQYWdlKTsKQEAgLTU4NCw2ICs1ODUsMTUgQEAgYm9vbCBXZWJQcm9jZXNzUHJveHk6OmZ1bGxL ZXlib2FyZEFjY2Vzc0VuYWJsZWQoKQogfQogI2VuZGlmCiAKK2Jvb2wgV2ViUHJvY2Vzc1Byb3h5 OjpoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQodWludDY0X3QgcGFnZUlEKSBjb25zdAoreworICAg IGZvciAoYXV0byogcHJvdmlzaW9uYWxQYWdlIDogbV9wcm92aXNpb25hbFBhZ2VzKSB7CisgICAg ICAgIGlmIChwcm92aXNpb25hbFBhZ2UtPnBhZ2UoKS5wYWdlSUQoKSA9PSBwYWdlSUQpCisgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorCiB2b2lk IFdlYlByb2Nlc3NQcm94eTo6dXBkYXRlQmFja0ZvcndhcmRJdGVtKGNvbnN0IEJhY2tGb3J3YXJk TGlzdEl0ZW1TdGF0ZSYgaXRlbVN0YXRlKQogewogICAgIGlmIChhdXRvKiBpdGVtID0gV2ViQmFj a0ZvcndhcmRMaXN0SXRlbTo6aXRlbUZvcklEKGl0ZW1TdGF0ZS5pZGVudGlmaWVyKSkgewpAQCAt NTkxLDcgKzYwMSw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojp1cGRhdGVCYWNrRm9yd2FyZEl0 ZW0oY29uc3QgQmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlJiBpdGVtCiAgICAgICAgIC8vIHRoZSBi YWNrL2ZvcndhcmQgaXRlbXMgcGFnZS4KICAgICAgICAgLy8gZS5nLiBUaGUgb2xkIHdlYiBwcm9j ZXNzIGlzIG5hdmlnYXRpbmcgdG8gYWJvdXQ6YmxhbmsgZm9yIHN1c3BlbnNpb24uCiAgICAgICAg IC8vIFdlIGlnbm9yZSB0aGVzZSB1cGRhdGVzLgotICAgICAgICBpZiAobV9wYWdlTWFwLmNvbnRh aW5zKGl0ZW0tPnBhZ2VJRCgpKSkKKyAgICAgICAgaWYgKG1fcGFnZU1hcC5jb250YWlucyhpdGVt LT5wYWdlSUQoKSkgfHwgaGFzUHJvdmlzaW9uYWxQYWdlV2l0aElEKGl0ZW0tPnBhZ2VJRCgpKSkK ICAgICAgICAgICAgIGl0ZW0tPnNldFBhZ2VTdGF0ZShpdGVtU3RhdGUucGFnZVN0YXRlKTsKICAg ICB9CiB9CkBAIC04NzMsNyArODgzLDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6Om1heWJlU2h1 dERvd24oKQogCiBib29sIFdlYlByb2Nlc3NQcm94eTo6Y2FuVGVybWluYXRlQ2hpbGRQcm9jZXNz KCkKIHsKLSAgICBpZiAoIW1fcGFnZU1hcC5pc0VtcHR5KCkgfHwgbV9wcm9jZXNzUG9vbC0+aGFz U3VzcGVuZGVkUGFnZUZvcigqdGhpcykpCisgICAgaWYgKCFtX3BhZ2VNYXAuaXNFbXB0eSgpIHx8 IG1fcHJvY2Vzc1Bvb2wtPmhhc1N1c3BlbmRlZFBhZ2VGb3IoKnRoaXMpIHx8ICFtX3Byb3Zpc2lv bmFsUGFnZXMuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAoIW1f cHJvY2Vzc1Bvb2wtPnNob3VsZFRlcm1pbmF0ZSh0aGlzKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUHJvY2Vzc1Byb3h5LmgKaW5kZXggNzVmNjVhN2Y3ZWIuLjUwNDI2MzBkZTM3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaApAQCAtNzAsNiArNzAsNyBA QCBuYW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIE5ldHdvcmtQcm9jZXNzUHJveHk7CiBjbGFzcyBP YmpDT2JqZWN0R3JhcGg7CiBjbGFzcyBQYWdlQ2xpZW50OworY2xhc3MgUHJvdmlzaW9uYWxQYWdl UHJveHk7CiBjbGFzcyBVc2VyTWVkaWFDYXB0dXJlTWFuYWdlclByb3h5OwogY2xhc3MgVmlzaXRl ZExpbmtTdG9yZTsKIGNsYXNzIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW07CkBAIC0xMjQsNiArMTI1 LDkgQEAgcHVibGljOgogICAgIGVudW0gY2xhc3MgRW5kc1VzaW5nRGF0YVN0b3JlIDogYm9vbCB7 IE5vLCBZZXMgfTsKICAgICB2b2lkIHJlbW92ZVdlYlBhZ2UoV2ViUGFnZVByb3h5JiwgdWludDY0 X3QgcGFnZUlELCBFbmRzVXNpbmdEYXRhU3RvcmUpOwogCisgICAgdm9pZCBhZGRQcm92aXNpb25h bFBhZ2VQcm94eShQcm92aXNpb25hbFBhZ2VQcm94eSYgcHJvdmlzaW9uYWxQYWdlKSB7IEFTU0VS VCghbV9wcm92aXNpb25hbFBhZ2VzLmNvbnRhaW5zKCZwcm92aXNpb25hbFBhZ2UpKTsgbV9wcm92 aXNpb25hbFBhZ2VzLmFkZCgmcHJvdmlzaW9uYWxQYWdlKTsgfQorICAgIHZvaWQgcmVtb3ZlUHJv dmlzaW9uYWxQYWdlUHJveHkoUHJvdmlzaW9uYWxQYWdlUHJveHkmIHByb3Zpc2lvbmFsUGFnZSkg eyBBU1NFUlQobV9wcm92aXNpb25hbFBhZ2VzLmNvbnRhaW5zKCZwcm92aXNpb25hbFBhZ2UpKTsg bV9wcm92aXNpb25hbFBhZ2VzLnJlbW92ZSgmcHJvdmlzaW9uYWxQYWdlKTsgfQorCiAgICAgdHlw ZW5hbWUgV2ViUGFnZVByb3h5TWFwOjpWYWx1ZXNDb25zdEl0ZXJhdG9yUmFuZ2UgcGFnZXMoKSBj b25zdCB7IHJldHVybiBtX3BhZ2VNYXAudmFsdWVzKCk7IH0KICAgICB1bnNpZ25lZCBwYWdlQ291 bnQoKSBjb25zdCB7IHJldHVybiBtX3BhZ2VNYXAuc2l6ZSgpOyB9CiAgICAgdW5zaWduZWQgdmlz aWJsZVBhZ2VDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fdmlzaWJsZVBhZ2VDb3VudGVyLnZhbHVl KCk7IH0KQEAgLTMzMCw2ICszMzQsOCBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBsb2dEaWFnbm9z dGljTWVzc2FnZUZvclJlc291cmNlTGltaXRUZXJtaW5hdGlvbihjb25zdCBTdHJpbmcmIGxpbWl0 S2V5KTsKIAorICAgIGJvb2wgaGFzUHJvdmlzaW9uYWxQYWdlV2l0aElEKHVpbnQ2NF90IHBhZ2VJ RCkgY29uc3Q7CisKICAgICBlbnVtIGNsYXNzIElzV2VhayB7IE5vLCBZZXMgfTsKICAgICB0ZW1w bGF0ZTx0eXBlbmFtZSBUPiBjbGFzcyBXZWFrT3JTdHJvbmdQdHIgewogICAgIHB1YmxpYzoKQEAg LTM3Myw2ICszNzksNyBAQCBwcml2YXRlOgogCiAgICAgV2ViUGFnZVByb3h5TWFwIG1fcGFnZU1h cDsKICAgICBXZWJGcmFtZVByb3h5TWFwIG1fZnJhbWVNYXA7CisgICAgSGFzaFNldDxQcm92aXNp b25hbFBhZ2VQcm94eSo+IG1fcHJvdmlzaW9uYWxQYWdlczsKICAgICBVc2VySW5pdGlhdGVkQWN0 aW9uTWFwIG1fdXNlckluaXRpYXRlZEFjdGlvbk1hcDsKIAogICAgIEhhc2hTZXQ8VmlzaXRlZExp bmtTdG9yZSo+IG1fdmlzaXRlZExpbmtTdG9yZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYktpdC9XZWJLaXQu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA1MDdlZGI3M2U3NC4uNzA3OWIyNjk4ODUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2oKKysrIGIvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpA QCAtMzA5NSw2ICszMDk1LDggQEAKIAkJNDY2QkMwMzgxRkEyNjZDOTAwMkZBOUMxIC8qIFdlYlNX Q29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNw cDsgcGF0aCA9IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJNDY2QkMwMzkxRkEyNjZDOTAwMkZBOUMxIC8qIFdlYlNXQ29udGV4 dE1hbmFnZXJDb25uZWN0aW9uLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdl YlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTQ2NkJDMDNBMUZBMjY2QzkwMDJGQTlDMSAvKiBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVj dGlvbi5tZXNzYWdlcy5pbiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7IHBhdGggPSBXZWJTV0NvbnRleHRNYW5h Z2VyQ29ubmVjdGlvbi5tZXNzYWdlcy5pbjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJ NDY4MzU2OUEyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmggKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFByb3Zpc2lvbmFsUGFnZVByb3h5Lmg7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTQ2ODM1NjlCMjFFODFDQzcwMDZFMjdBMyAvKiBQcm92 aXNpb25hbFBhZ2VQcm94eS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGgg PSBQcm92aXNpb25hbFBhZ2VQcm94eS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CTQ2QTJCNjA2MUU1Njc1QTIwMEMzREVEQSAvKiBCYWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVu ZXNzVGltZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gQmFja2dy b3VuZFByb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJNDZBMkI2MDcxRTU2NzVBMjAwQzNERURBIC8qIEJhY2tncm91bmRQcm9jZXNzUmVz cG9uc2l2ZW5lc3NUaW1lci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBCYWNr Z3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVuZXNzVGltZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJNDZERjA2MzkxRjM5MDVFNTAwMTk4MEJCIC8qIE5ldHdvcmtDT1JTUHJlZmxpZ2h0 Q2hlY2tlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBOZXR3b3Jr Q09SU1ByZWZsaWdodENoZWNrZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAt NzM1MCw2ICs3MzUyLDggQEAKIAkJCQk4NkU2N0EyMjE5MEY0MTE4MDAwMDRBQjcgLyogUHJvY2Vz c1Rocm90dGxlci5jcHAgKi8sCiAJCQkJODZFNjdBMjExOTBGNDExODAwMDA0QUI3IC8qIFByb2Nl c3NUaHJvdHRsZXIuaCAqLywKIAkJCQk4MzA0OEFFNTFBQ0E0NURDMDA4MkM4MzIgLyogUHJvY2Vz c1Rocm90dGxlckNsaWVudC5oICovLAorCQkJCTQ2ODM1NjlCMjFFODFDQzcwMDZFMjdBMyAvKiBQ cm92aXNpb25hbFBhZ2VQcm94eS5jcHAgKi8sCisJCQkJNDY4MzU2OUEyMUU4MUNDNzAwNkUyN0Ez IC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmggKi8sCiAJCQkJQTU1QkE4MUIxQkEyNUIxRTAwN0NE MzNEIC8qIFJlbW90ZVdlYkluc3BlY3RvclByb3h5LmNwcCAqLywKIAkJCQlBNTVCQTgxOTFCQTI1 QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkuaCAqLywKIAkJCQlBNTVCQTgx QTFCQTI1QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkubWVzc2FnZXMuaW4g Ki8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFt ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAKaW5k ZXggMDA3NDliNDc3YTIuLmZmZWQwMGM4MjA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwCkBAIC0yNjMsOCArMjYzLDYgQEAgc3RhdGljIFdlYkNv cmU6OlBvbGljeUFjdGlvbiB0b1BvbGljeUFjdGlvbihXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0 aW9uKQogICAgICAgICByZXR1cm4gV2ViQ29yZTo6UG9saWN5QWN0aW9uOjpJZ25vcmU7CiAgICAg Y2FzZSBXZWJQb2xpY3lBY3Rpb246OkRvd25sb2FkOgogICAgICAgICByZXR1cm4gV2ViQ29yZTo6 UG9saWN5QWN0aW9uOjpEb3dubG9hZDsKLSAgICBjYXNlIFdlYlBvbGljeUFjdGlvbjo6U3VzcGVu ZDoKLSAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAg IHJldHVybiBXZWJDb3JlOjpQb2xpY3lBY3Rpb246Oklnbm9yZTsKQEAgLTI3MiwxMSArMjcwLDgg QEAgc3RhdGljIFdlYkNvcmU6OlBvbGljeUFjdGlvbiB0b1BvbGljeUFjdGlvbihXZWJQb2xpY3lB Y3Rpb24gcG9saWN5QWN0aW9uKQogCiB2b2lkIFdlYkZyYW1lOjpkaWRSZWNlaXZlUG9saWN5RGVj aXNpb24odWludDY0X3QgbGlzdGVuZXJJRCwgV2ViUG9saWN5QWN0aW9uIGFjdGlvbiwgdWludDY0 X3QgbmF2aWdhdGlvbklELCBEb3dubG9hZElEIGRvd25sb2FkSUQsIE9wdGlvbmFsPFdlYnNpdGVQ b2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQogewotICAgIGlmICghbV9jb3JlRnJhbWUg fHwgIW1fcG9saWN5TGlzdGVuZXJJRCB8fCBsaXN0ZW5lcklEICE9IG1fcG9saWN5TGlzdGVuZXJJ RCB8fCAhbV9wb2xpY3lGdW5jdGlvbikgewotICAgICAgICBpZiAoYWN0aW9uID09IFdlYlBvbGlj eUFjdGlvbjo6U3VzcGVuZCkKLSAgICAgICAgICAgIHBhZ2UoKS0+c2VuZChNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjpEaWRGYWlsVG9TdXNwZW5kQWZ0ZXJQcm9jZXNzU3dhcCgpKTsKKyAgICBpZiAo IW1fY29yZUZyYW1lIHx8ICFtX3BvbGljeUxpc3RlbmVySUQgfHwgbGlzdGVuZXJJRCAhPSBtX3Bv bGljeUxpc3RlbmVySUQgfHwgIW1fcG9saWN5RnVuY3Rpb24pCiAgICAgICAgIHJldHVybjsKLSAg ICB9CiAKICAgICBGcmFtZVBvbGljeUZ1bmN0aW9uIGZ1bmN0aW9uID0gV1RGTW92ZShtX3BvbGlj eUZ1bmN0aW9uKTsKICAgICBib29sIGZvck5hdmlnYXRpb25BY3Rpb24gPSBtX3BvbGljeUZ1bmN0 aW9uRm9yTmF2aWdhdGlvbkFjdGlvbiA9PSBGb3JOYXZpZ2F0aW9uQWN0aW9uOjpZZXM7CkBAIC0y OTIsMTYgKzI4Nyw3IEBAIHZvaWQgV2ViRnJhbWU6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1 aW50NjRfdCBsaXN0ZW5lcklELCBXZWJQb2xpY3lBY3Rpb24gYWN0CiAgICAgICAgICAgICBkb2N1 bWVudExvYWRlci0+c2V0TmF2aWdhdGlvbklEKG5hdmlnYXRpb25JRCk7CiAgICAgfQogCi0gICAg Ym9vbCBzaG91bGRTdXNwZW5kID0gZmFsc2U7Ci0gICAgaWYgKGFjdGlvbiA9PSBXZWJQb2xpY3lB Y3Rpb246OlN1c3BlbmQpIHsKLSAgICAgICAgc2hvdWxkU3VzcGVuZCA9IHRydWU7Ci0gICAgICAg IGFjdGlvbiA9IFdlYlBvbGljeUFjdGlvbjo6SWdub3JlOwotICAgIH0KLQogICAgIGZ1bmN0aW9u KHRvUG9saWN5QWN0aW9uKGFjdGlvbikpOwotCi0gICAgaWYgKHNob3VsZFN1c3BlbmQpCi0gICAg ICAgIHBhZ2UoKS0+c3VzcGVuZEZvclByb2Nlc3NTd2FwKCk7CiB9CiAKIHZvaWQgV2ViRnJhbWU6 OnN0YXJ0RG93bmxvYWQoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBj b25zdCBTdHJpbmcmIHN1Z2dlc3RlZE5hbWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDI1ZDZkZmI3MWQwLi5lNDkxODI0N2E2NyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTQwMSw3ICs0 MDEsNyBAQCBXZWJQYWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCwgV2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAgICAgLCBtX292ZXJyaWRlQ29udGVudFNlY3VyaXR5 UG9saWN5IHsgcGFyYW1ldGVycy5vdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSB9CiAgICAg LCBtX2NwdUxpbWl0KHBhcmFtZXRlcnMuY3B1TGltaXQpCiAjaWYgUExBVEZPUk0oTUFDKQotICAg ICwgbV9zaG91bGRBdHRhY2hEcmF3aW5nQXJlYU9uUGFnZVRyYW5zaXRpb24ocGFyYW1ldGVycy5p c1N3YXBGcm9tU3VzcGVuZGVkKQorICAgICwgbV9zaG91bGRBdHRhY2hEcmF3aW5nQXJlYU9uUGFn ZVRyYW5zaXRpb24ocGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwKQogI2VuZGlmCiB7CiAgICAgQVNT RVJUKG1fcGFnZUlEKTsKQEAgLTQ3MSw3ICs0NzEsNyBAQCBXZWJQYWdlOjpXZWJQYWdlKHVpbnQ2 NF90IHBhZ2VJRCwgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAgICAg bV9kcmF3aW5nQXJlYS0+c2V0UGFpbnRpbmdFbmFibGVkKGZhbHNlKTsKICAgICBtX2RyYXdpbmdB cmVhLT5zZXRTaG91bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50KHBhcmFtZXRlcnMuc2hvdWxkU2Nh bGVWaWV3VG9GaXREb2N1bWVudCk7CiAKLSAgICBpZiAocGFyYW1ldGVycy5pc1N3YXBGcm9tU3Vz cGVuZGVkKQorICAgIGlmIChwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXApCiAgICAgICAgIGZyZWV6 ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlN3YXBGcm9tU3VzcGVuZGVkKTsKIAog I2lmIEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpCkBAIC02OTYsNyArNjk2LDcgQEAgdm9pZCBXZWJQ YWdlOjpyZWluaXRpYWxpemVXZWJQYWdlKFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmJiBwYXJh bWV0ZXJzKQogICAgICAgICBtX2RyYXdpbmdBcmVhLT51cGRhdGVQcmVmZXJlbmNlcyhwYXJhbWV0 ZXJzLnN0b3JlKTsKICAgICAgICAgbV9kcmF3aW5nQXJlYS0+c2V0UGFpbnRpbmdFbmFibGVkKHRy dWUpOwogI2lmIFBMQVRGT1JNKE1BQykKLSAgICAgICAgbV9zaG91bGRBdHRhY2hEcmF3aW5nQXJl YU9uUGFnZVRyYW5zaXRpb24gPSBwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQ7CisgICAg ICAgIG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uID0gcGFyYW1ldGVy cy5pc1Byb2Nlc3NTd2FwOwogI2VuZGlmCiAgICAgICAgIHVuZnJlZXplTGF5ZXJUcmVlKExheWVy VHJlZUZyZWV6ZVJlYXNvbjo6UGFnZVN1c3BlbmRlZCk7CiAgICAgfQpAQCAtMzA1MywxMiArMzA1 Myw2IEBAIHZvaWQgV2ViUGFnZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKHVpbnQ2NF90IGZy YW1lSUQsIHVpbnQ2NF90IGxpc3RlbmVySUQsIFdlCiAgICAgV2ViRnJhbWUqIGZyYW1lID0gV2Vi UHJvY2Vzczo6c2luZ2xldG9uKCkud2ViRnJhbWUoZnJhbWVJRCk7CiAgICAgaWYgKCFmcmFtZSkK ICAgICAgICAgcmV0dXJuOwotICAgIGlmIChwb2xpY3lBY3Rpb24gPT0gV2ViUG9saWN5QWN0aW9u OjpTdXNwZW5kKSB7Ci0gICAgICAgIEFTU0VSVChmcmFtZSA9PSBtX21haW5GcmFtZSk7Ci0gICAg ICAgIHNldElzU3VzcGVuZGVkKHRydWUpOwotCi0gICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRv bigpLnNlbmRQcmV3YXJtSW5mb3JtYXRpb24obWFpbldlYkZyYW1lKCktPnVybCgpKTsKLSAgICB9 CiAgICAgZnJhbWUtPmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihsaXN0ZW5lcklELCBwb2xpY3lB Y3Rpb24sIG5hdmlnYXRpb25JRCwgZG93bmxvYWRJRCwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMp KTsKIH0KIApAQCAtNjMxMiw2ICs2MzA2LDEwIEBAIHZvaWQgV2ViUGFnZTo6c2V0SXNTdXNwZW5k ZWQoYm9vbCBzdXNwZW5kZWQpCiAgICAgaWYgKG1faXNTdXNwZW5kZWQpIHsKICAgICAgICAgLy8g VW5mcm96ZW4gb24gZHJhd2luZyBhcmVhIHJlc2V0LgogICAgICAgICBmcmVlemVMYXllclRyZWUo TGF5ZXJUcmVlRnJlZXplUmVhc29uOjpQYWdlU3VzcGVuZGVkKTsKKworICAgICAgICBXZWJQcm9j ZXNzOjpzaW5nbGV0b24oKS5zZW5kUHJld2FybUluZm9ybWF0aW9uKG1haW5XZWJGcmFtZSgpLT51 cmwoKSk7CisKKyAgICAgICAgc3VzcGVuZEZvclByb2Nlc3NTd2FwKCk7CiAgICAgfSBlbHNlCiAg ICAgICAgIG1fc2hvdWxkUmVzZXREcmF3aW5nQXJlYUFmdGVyU3VzcGVuZCA9IHRydWU7CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWEubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KaW5kZXggOTFhZDcxYWRlMWIu LjgzYjY1OTkyNzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KKysrIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1t CkBAIC05Nyw3ICs5Nyw3IEBAIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpUaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYShXZWJQYWdlJiB3ZWJQYWdlLCBjCiAgICAgdXBkYXRlTGF5 ZXJIb3N0aW5nQ29udGV4dCgpOwogICAgIHNldENvbG9yU3BhY2UocGFyYW1ldGVycy5jb2xvclNw YWNlKTsKIAotICAgIGlmICghcGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKQorICAgIGlm ICghcGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwKQogICAgICAgICBhdHRhY2goKTsKIH0KIApkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dh cE9uTmF2aWdhdGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev UHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KaW5kZXggZjM1ZDhiYWEzNTMuLjUzZWU3ZDU4YWRj IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nl c3NTd2FwT25OYXZpZ2F0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KQEAgLTE0MDUsNyArMTQwNSw3IEBA IFRFU1QoUHJvY2Vzc1N3YXAsIFNlcnZlclJlZGlyZWN0KQogCiAgICAgRVhQRUNUX0ZBTFNFKHNl cnZlclJlZGlyZWN0ZWQpOwogICAgIEVYUEVDVF9FUSgzLCBudW1iZXJPZkRlY2lkZVBvbGljeUNh bGxzKTsKLSAgICBFWFBFQ1RfRVEoMnUsIHNlZW5QSURzLnNpemUoKSk7CisgICAgRVhQRUNUX0VR KDN1LCBzZWVuUElEcy5zaXplKCkpOwogfQogCiBURVNUKFByb2Nlc3NTd2FwLCBTZXJ2ZXJSZWRp cmVjdDIpCkBAIC0yMjMyLDEyICsyMjMyLDI3IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIFBhZ2VTaG93 SGlkZSkKIAogICAgIEVYUEVDVF9FUSg3dSwgW3JlY2VpdmVkTWVzc2FnZXMgY291bnRdKTsKICAg ICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFn ZXNob3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMF0pOwotICAgIEVY UEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlk ZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKLSAgICBFWFBFQ1RfV0tf U1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlc2hvdyBOT1QgcGVy c2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVR KEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwg cmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjov L3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2VpdmVk TWVzc2FnZXMuZ2V0KClbNF0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Vi a2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2Vz LmdldCgpWzVdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9t YWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZd KTsKKyAgICBpZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0gaGFzUHJlZml4OkAicHNvbjov L3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShA InBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCBy ZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNv bjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgTk9UIHBlcnNpc3RlZCIsIHJl Y2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOworICAgIH0gZWxzZSB7CisgICAgICAgIEVYUEVDVF9X S19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93IE5PVCBw ZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKKyAgICAgICAgRVhQRUNUX1dL X1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNp c3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOworICAgIH0KKyAgICBpZiAoW3JlY2Vp dmVkTWVzc2FnZXMuZ2V0KClbM10gaGFzUHJlZml4OkAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFp bi5odG1sIl0pIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5j b20vbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQo KVszXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9t YWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRd KTsKKyAgICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lndl YmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdl cy5nZXQoKVszXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUu Y29tL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0 KClbNF0pOworICAgIH0KKyAgICBpZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0gaGFzUHJl Zml4OkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVD VF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBw ZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdKTsKKyAgICAgICAgRVhQRUNUX1dL X1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lz dGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAg RVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNo b3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7CisgICAgICAgIEVYUEVD VF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBw ZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAgICB9CiB9CiAKIC8vIERp c2FibGluZyB0aGUgcGFnZSBjYWNoZSBleHBsaWNpdGx5IGlzIChmb3Igc29tZSByZWFzb24pIG5v dCBhdmFpbGFibGUgb24gaU9TLgo= 358950 2019-01-11 14:50:41 -0800 2019-01-11 14:57:28 -0800 Prototype 193361_pson_provisional_process_wip.patch text/plain 75975 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9U ZXN0RXhwZWN0YXRpb25zCmluZGV4IGRkZjMyNGU5ZDgzLi5jMjk3MjRiYzBlYSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhw ZWN0YXRpb25zCkBAIC0yOTA3LDYgKzI5MDcsOSBAQCB3ZWJraXQub3JnL2IvMTg3NzczIGh0dHAv dGVzdHMvd2ViQVBJU3RhdGlzdGljcyBbIFNraXAgXQogCiB3ZWJraXQub3JnL2IvMTg5OTk3IGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvcmVzb3VyY2UtdGltaW5nL3Jlc291cmNlX3Rp bWluZy53b3JrZXIuaHRtbCBbIEZhaWx1cmUgXQogCisjIFRoaXMgZmVhdHVyZSBpcyBjdXJyZW50 bHkgZGlzYWJsZWQgYnkgZGVmYXVsdCBhbmQgdW5maW5pc2hlZCA8cmRhcjovL3Byb2JsZW0vMzg5 MjUwNzc+LgoraHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3Byb2Nlc3Mtc3dhcC13aW5kb3ctb3Blbi5o dG1sIFsgU2tpcCBdCisKICMgVGhpcyBpcyBmYWxsb3V0IGZyb20gdHVybmluZyBXZWIgQW5pbWF0 aW9ucyBvbi4KIHdlYmtpdC5vcmcvYi8xOTAwMzIgYW5pbWF0aW9ucy9hbmltYXRpb24tcGxheXN0 YXRlLXBhdXNlZC1zdHlsZS1yZXNvbHV0aW9uLmh0bWwgWyBGYWlsdXJlIF0KIHdlYmtpdC5vcmcv Yi8xOTAwMzIgY29tcG9zaXRpbmcvYmFja2luZy9iYWNraW5nLXN0b3JlLWF0dGFjaG1lbnQtZmls bC1mb3J3YXJkcy1hbmltYXRpb24uaHRtbCBbIEZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAKaW5kZXggNGMyNmE2OTgxYjQuLmViZjk1MGJhNmMyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTIwMzIsMTEgKzIwMzIsMTEgQEAgdm9pZCBG cmFtZUxvYWRlcjo6Y29tbWl0UHJvdmlzaW9uYWxMb2FkKCkKIAogICAgICAgICBPcHRpb25hbDxI YXNJbnNlY3VyZUNvbnRlbnQ+IGhhc0luc2VjdXJlQ29udGVudCA9IGNhY2hlZFBhZ2UtPmNhY2hl ZE1haW5GcmFtZSgpLT5oYXNJbnNlY3VyZUNvbnRlbnQoKTsKIAorICAgICAgICBkaXNwYXRjaERp ZENvbW1pdExvYWQoaGFzSW5zZWN1cmVDb250ZW50KTsKKwogICAgICAgICAvLyBGSVhNRTogVGhp cyBBUEkgc2hvdWxkIGJlIHR1cm5lZCBhcm91bmQgc28gdGhhdCB3ZSBncm91bmQgQ2FjaGVkUGFn ZSBpbnRvIHRoZSBQYWdlLgogICAgICAgICBjYWNoZWRQYWdlLT5yZXN0b3JlKCptX2ZyYW1lLnBh Z2UoKSk7CiAKLSAgICAgICAgZGlzcGF0Y2hEaWRDb21taXRMb2FkKGhhc0luc2VjdXJlQ29udGVu dCk7Ci0KICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgICAgICBtX2ZyYW1lLnBhZ2UoKS0+ Y2hyb21lKCkuc2V0RGlzcGF0Y2hWaWV3cG9ydERhdGFEaWRDaGFuZ2VTdXBwcmVzc2VkKGZhbHNl KTsKICAgICAgICAgbV9mcmFtZS5wYWdlKCktPmNocm9tZSgpLmRpc3BhdGNoVmlld3BvcnRQcm9w ZXJ0aWVzRGlkQ2hhbmdlKG1fZnJhbWUucGFnZSgpLT52aWV3cG9ydEFyZ3VtZW50cygpKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMu Y3BwIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAK aW5kZXggY2EyZGY0MGVlMWQuLjZkMDdjMDNhZDhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcApAQCAtNzMsNyArNzMsNyBAQCB2 b2lkIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZShJUEM6OkVuY29kZXImIGVuY29k ZXIpIGNvbnN0CiAgICAgZW5jb2Rlci5lbmNvZGVFbnVtKGxheWVySG9zdGluZ01vZGUpOwogICAg IGVuY29kZXIgPDwgbWltZVR5cGVzV2l0aEN1c3RvbUNvbnRlbnRQcm92aWRlcnM7CiAgICAgZW5j b2RlciA8PCBjb250cm9sbGVkQnlBdXRvbWF0aW9uOwotICAgIGVuY29kZXIgPDwgaXNTd2FwRnJv bVN1c3BlbmRlZDsKKyAgICBlbmNvZGVyIDw8IGlzUHJvY2Vzc1N3YXA7CiAKICNpZiBQTEFURk9S TShNQUMpCiAgICAgZW5jb2RlciA8PCBjb2xvclNwYWNlOwpAQCAtMjI3LDcgKzIyNyw3IEBAIE9w dGlvbmFsPFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM+IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnM6OmRlY29kZShJUEM6OkRlY29kCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAgICAg aWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmNvbnRyb2xsZWRCeUF1dG9tYXRpb24pKQog ICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFy YW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKSkKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBh cmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAK ICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQ YWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzLmgKaW5kZXggYWU0MzI1Y2JkNWYuLmIzODJjZWVkZDQ0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgKKysr IGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCkBAIC0x MjksNyArMTI5LDcgQEAgc3RydWN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMgewogICAgIFZl Y3RvcjxTdHJpbmc+IG1pbWVUeXBlc1dpdGhDdXN0b21Db250ZW50UHJvdmlkZXJzOwogCiAgICAg Ym9vbCBjb250cm9sbGVkQnlBdXRvbWF0aW9uOwotICAgIGJvb2wgaXNTd2FwRnJvbVN1c3BlbmRl ZCB7IGZhbHNlIH07CisgICAgYm9vbCBpc1Byb2Nlc3NTd2FwIHsgZmFsc2UgfTsKIAogI2lmIFBM QVRGT1JNKE1BQykKICAgICBDb2xvclNwYWNlRGF0YSBjb2xvclNwYWNlOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQb2xpY3lBY3Rpb24uaAppbmRleCAxNDJhNTE4ZGYwOS4uMzk3MTc5NWM0NmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oCkBAIC0yOSwxMSArMjksMTEgQEAK IAogbmFtZXNwYWNlIFdlYktpdCB7CiAKKy8vIEZJWE1FOiBSZW1vdmUgdGhpcyB0eXBlIGFuZCB1 c2UgV2ViQ29yZTo6UG9saWN5QWN0aW9uIGluc3RlYWQuCiBlbnVtIGNsYXNzIFdlYlBvbGljeUFj dGlvbiA6IHVpbnQ4X3QgewogICAgIFVzZSwKICAgICBEb3dubG9hZCwKLSAgICBJZ25vcmUsCi0g ICAgU3VzcGVuZAorICAgIElnbm9yZQogfTsKIAogfQpAQCAtNDUsOCArNDUsNyBAQCB0ZW1wbGF0 ZTw+IHN0cnVjdCBFbnVtVHJhaXRzPFdlYktpdDo6V2ViUG9saWN5QWN0aW9uPiB7CiAgICAgICAg IFdlYktpdDo6V2ViUG9saWN5QWN0aW9uLAogICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlv bjo6VXNlLAogICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6RG93bmxvYWQsCi0gICAg ICAgIFdlYktpdDo6V2ViUG9saWN5QWN0aW9uOjpJZ25vcmUsCi0gICAgICAgIFdlYktpdDo6V2Vi UG9saWN5QWN0aW9uOjpTdXNwZW5kCisgICAgICAgIFdlYktpdDo6V2ViUG9saWN5QWN0aW9uOjpJ Z25vcmUKICAgICA+OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9Tb3VyY2VzLnR4 dCBiL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQKaW5kZXggYTBiNmY3Mjg0NjAuLjhhZWNiODY0 NzI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMudHh0CisrKyBiL1NvdXJjZS9X ZWJLaXQvU291cmNlcy50eHQKQEAgLTIzMCw2ICsyMzAsNyBAQCBVSVByb2Nlc3MvSW5zcGVjdG9y VGFyZ2V0UHJveHkuY3BwCiBVSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5jcHAKIFVJUHJvY2Vzcy9Q cm9jZXNzQXNzZXJ0aW9uLmNwcAogVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuY3BwCitVSVBy b2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCiBVSVByb2Nlc3MvUmVtb3RlV2ViSW5zcGVj dG9yUHJveHkuY3BwCiBVSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NUaW1lci5jcHAKIFVJUHJvY2Vz cy9TZXJ2aWNlV29ya2VyUHJvY2Vzc1Byb3h5LmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggY2YxOTE5YzkzYTcuLmM3OWZjYjIxMGI1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0K QEAgLTQ0LDYgKzQ0LDcgQEAKICNpbXBvcnQgIk5hdmlnYXRpb25TdGF0ZS5oIgogI2ltcG9ydCAi T2JqQ09iamVjdEdyYXBoLmgiCiAjaW1wb3J0ICJQYWdlQ2xpZW50LmgiCisjaW1wb3J0ICJQcm92 aXNpb25hbFBhZ2VQcm94eS5oIgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJUcmVlU2Nyb2xsaW5nUGVy Zm9ybWFuY2VEYXRhLmgiCiAjaW1wb3J0ICJSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5oIgog I2ltcG9ydCAiUmVtb3RlT2JqZWN0UmVnaXN0cnkuaCIKQEAgLTQ2NjQsNiArNDY2NSwxMSBAQCAt ICh2b2lkKV9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0YXRlCiB7CiAgICAgUmVmPFdl YktpdDo6V2ViUHJvY2Vzc1Byb3h5PiBwcm90ZWN0ZWRQcm9jZXNzUHJveHkoX3BhZ2UtPnByb2Nl c3MoKSk7CiAgICAgcHJvdGVjdGVkUHJvY2Vzc1Byb3h5LT5yZXF1ZXN0VGVybWluYXRpb24oV2Vi S2l0OjpQcm9jZXNzVGVybWluYXRpb25SZWFzb246OlJlcXVlc3RlZEJ5Q2xpZW50KTsKKworICAg IGlmIChhdXRvKiBwcm92aXNpb25hbFBhZ2VQcm94eSA9IF9wYWdlLT5wcm92aXNpb25hbFBhZ2VQ cm94eSgpKSB7CisgICAgICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nlc3NQcm94eT4gcHJvdGVjdGVk UHJvY2Vzc1Byb3h5KHByb3Zpc2lvbmFsUGFnZVByb3h5LT5wcm9jZXNzKCkpOworICAgICAgICBw cm90ZWN0ZWRQcm9jZXNzUHJveHktPnJlcXVlc3RUZXJtaW5hdGlvbihXZWJLaXQ6OlByb2Nlc3NU ZXJtaW5hdGlvblJlYXNvbjo6UmVxdWVzdGVkQnlDbGllbnQpOworICAgIH0KIH0KIAogI2lmIFBM QVRGT1JNKE1BQykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VDbGll bnQuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAppbmRleCAwYjg1OGM0 NmVlNC4uNmYzZGY4NDUyYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Bh Z2VDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKQEAg LTQ4LDYgKzQ4LDcgQEAKIAogT0JKQ19DTEFTUyBDQUxheWVyOwogT0JKQ19DTEFTUyBOU0ZpbGVX cmFwcGVyOworT0JKQ19DTEFTUyBOU01lbnU7CiBPQkpDX0NMQVNTIE5TU2V0OwogT0JKQ19DTEFT UyBXS0RyYXdpbmdWaWV3OwogT0JKQ19DTEFTUyBfV0tSZW1vdGVPYmplY3RSZWdpc3RyeTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmNw cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmNwcApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uYTFjYWYxOWViYzYKLS0tIC9kZXYv bnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5j cHAKQEAgLTAsMCArMSwyODIgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTkgQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisg KiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0 YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9u cyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAg ICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMg cHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMg UFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAq IEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5P VCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJ VFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1F RC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBC RSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBF WEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5P VCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJW SUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRF UlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwg V0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xV RElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQg T0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQ T1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisj aW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKKworI2luY2x1ZGUgIkFQSU5hdmlnYXRp b24uaCIKKyNpbmNsdWRlICJEcmF3aW5nQXJlYVByb3h5LmgiCisjaW5jbHVkZSAiTG9nZ2luZy5o IgorI2luY2x1ZGUgIlBhZ2VDbGllbnQuaCIKKyNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3Qu aCIKKyNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3RJdGVtLmgiCisjaW5jbHVkZSAiV2ViRXJy b3JzLmgiCisjaW5jbHVkZSAiV2ViTmF2aWdhdGlvblN0YXRlLmgiCisjaW5jbHVkZSAiV2ViUGFn ZU1lc3NhZ2VzLmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCisjaW5jbHVkZSAiV2ViUGFn ZVByb3h5TWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNzTWVzc2FnZXMuaCIKKyNpbmNs dWRlICJXZWJQcm9jZXNzUHJveHkuaCIKKyNpbmNsdWRlIDxXZWJDb3JlL1Nob3VsZFRyZWF0QXND b250aW51aW5nTG9hZC5oPgorCituYW1lc3BhY2UgV2ViS2l0IHsKKworUHJvdmlzaW9uYWxQYWdl UHJveHk6OlByb3Zpc2lvbmFsUGFnZVByb3h5KFdlYlBhZ2VQcm94eSYgcGFnZSwgUmVmPFdlYlBy b2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5 PiBzdXNwZW5kZWRQYWdlLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGJvb2wgaXNTZXJ2ZXJSZWRp cmVjdCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBQcm9jZXNzU3dh cFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpCisgICAgOiBt X3BhZ2UocGFnZSkKKyAgICAsIG1fcHJvY2VzcyhXVEZNb3ZlKHByb2Nlc3MpKQorICAgICwgbV9u YXZpZ2F0aW9uSUQobmF2aWdhdGlvbklEKQorICAgICwgbV9pc1NlcnZlclJlZGlyZWN0KGlzU2Vy dmVyUmVkaXJlY3QpCisgICAgLCBtX3JlcXVlc3QocmVxdWVzdCkKKyAgICAsIG1fcHJvY2Vzc1N3 YXBSZXF1ZXN0ZWRCeUNsaWVudChwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KQorI2lmIFBM QVRGT1JNKElPU19GQU1JTFkpCisgICAgLCBtX3N1c3BlbnNpb25Ub2tlbihtX3Byb2Nlc3MtPnRo cm90dGxlcigpLmJhY2tncm91bmRBY3Rpdml0eVRva2VuKCkpCisjZW5kaWYKK3sKKyAgICBtX3By b2Nlc3MtPmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdl UmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSwgKnRoaXMpOworICAgIG1fcHJvY2Vzcy0+ YWRkUHJvdmlzaW9uYWxQYWdlUHJveHkoKnRoaXMpOworCisgICAgLy8gSWYgd2UgYXJlIHJlYXR0 YWNoaW5nIHRvIGEgU3VzcGVuZGVkUGFnZSwgdGhlbiB0aGUgV2ViUHJvY2VzcycgV2ViUGFnZSBh bHJlYWR5IGV4aXN0cyBhbmQKKyAgICAvLyBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZU1haW5GcmFt ZSgpIHdpbGwgbm90IGJlIGNhbGxlZCB0byBpbml0aWFsaXplIG1fbWFpbkZyYW1lLiBJbiBzdWNo CisgICAgLy8gY2FzZSwgd2UgbmVlZCB0byBpbml0aWFsaXplIG1fbWFpbkZyYW1lIHRvIHJlZmxl Y3QgdGhlIGZhY3QgdGhlIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdlCisgICAgLy8gYWxyZWFkeSBl eGlzdHMgYW5kIGFscmVhZHkgaGFzIGEgbWFpbiBmcmFtZS4KKyAgICBpZiAoc3VzcGVuZGVkUGFn ZSkgeworICAgICAgICBpZiAoIXN1c3BlbmRlZFBhZ2UtPmZhaWxlZFRvU3VzcGVuZCgpKSB7Cisg ICAgICAgIEFTU0VSVCgmc3VzcGVuZGVkUGFnZS0+cHJvY2VzcygpID09IG1fcHJvY2Vzcy5wdHIo KSk7CisgICAgICAgIHN1c3BlbmRlZFBhZ2UtPnVuc3VzcGVuZCgpOworICAgICAgICBtX21haW5G cmFtZSA9IFdlYkZyYW1lUHJveHk6OmNyZWF0ZShtX3BhZ2UsIHN1c3BlbmRlZFBhZ2UtPm1haW5G cmFtZUlEKCkpOworICAgICAgICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChzdXNwZW5kZWRQYWdl LT5tYWluRnJhbWVJRCgpLCAqbV9tYWluRnJhbWUpOworICAgICAgICB9IGVsc2UKKyAgICAgICAg ICAgIHN1c3BlbmRlZFBhZ2UgPSBudWxscHRyOworICAgIH0KKworICAgIGluaXRpYWxpemVXZWJQ YWdlKCk7Cit9CisKK1Byb3Zpc2lvbmFsUGFnZVByb3h5Ojp+UHJvdmlzaW9uYWxQYWdlUHJveHko KQoreworICAgIG1fcHJvY2Vzcy0+cmVtb3ZlUHJvdmlzaW9uYWxQYWdlUHJveHkoKnRoaXMpOwor CisgICAgaWYgKG1fd2FzQ29tbWl0dGVkKQorICAgICAgICByZXR1cm47CisKKyAgICBtX3Byb2Nl c3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdl UmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1l c3NhZ2VzOjpXZWJQYWdlOjpDbG9zZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAgaWYgKG1f ZHJhd2luZ0FyZWEpIHsKKyAgICAgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdl LnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgICAgIG1fZHJhd2lu Z0FyZWEgPSBudWxscHRyOworICAgIH0KKworICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChb cHJvY2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCldIHsKKyAgICAgICAgcHJvY2Vzcy0+bWF5YmVT aHV0RG93bigpOworICAgIH0pOworfQorCitzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94 eT4gUHJvdmlzaW9uYWxQYWdlUHJveHk6OnRha2VEcmF3aW5nQXJlYSgpCit7CisgICAgcmV0dXJu IFdURk1vdmUobV9kcmF3aW5nQXJlYSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6 OmNhbmNlbCgpCit7CisgICAgLy8gSWYgdGhlIHByb3Zpc2lvbmFsIGxvYWQgc3RhcnRlZCwgdGhl biBpbmRpY2F0ZSB0aGF0IGl0IGZhaWxlZCBkdWUgdG8gY2FuY2VsbGF0aW9uIGJ5IGNhbGxpbmcg ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKCkuCisgICAgaWYgKG1fcHJvdmlzaW9uYWxM b2FkVVJMLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgQVNTRVJUKG1fbWFpbkZy YW1lKTsKKyAgICBhdXRvIGVycm9yID0gV2ViS2l0OjpjYW5jZWxsZWRFcnJvcihtX3JlcXVlc3Qp OworICAgIGVycm9yLnNldFR5cGUoV2ViQ29yZTo6UmVzb3VyY2VFcnJvcjo6VHlwZTo6Q2FuY2Vs bGF0aW9uKTsKKyAgICBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUobV9tYWluRnJhbWUt PmZyYW1lSUQoKSwgeyB9LCBtX25hdmlnYXRpb25JRCwgbV9wcm92aXNpb25hbExvYWRVUkwsIGVy cm9yLCBVc2VyRGF0YSB7IH0pOyAvLyBXaWxsIGRlbGV0ZSB8dGhpc3wuCit9CisKK3ZvaWQgUHJv dmlzaW9uYWxQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKCkKK3sKKyAgICBhdXRvIHBhZ2VQ cm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9j ZXNzKTsKKyAgICBtX2RyYXdpbmdBcmVhID0gbV9wYWdlLnBhZ2VDbGllbnQoKS5jcmVhdGVEcmF3 aW5nQXJlYVByb3h5KCk7CisKKyAgICBhdXRvIHBhcmFtZXRlcnMgPSBtX3BhZ2UuY3JlYXRpb25Q YXJhbWV0ZXJzKCk7CisgICAgcGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwID0gdHJ1ZTsKKyAgICBt X3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OkNyZWF0ZVdlYlBhZ2UobV9wYWdl LnBhZ2VJRCgpLCBwYXJhbWV0ZXJzKSwgMCk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJv eHk6OmxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBj b25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNv bnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpPYmplY3Qq IHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2ll cykKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlP dmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBtX3BhZ2UubG9hZERhdGFXaXRoTmF2aWdh dGlvbihuYXZpZ2F0aW9uLCBkYXRhLCBNSU1FVHlwZSwgZW5jb2RpbmcsIGJhc2VVUkwsIHVzZXJE YXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3 ZWJzaXRlUG9saWNpZXMpKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6bG9hZFJl cXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIFdlYkNvcmU6 OlJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVS THNQb2xpY3kgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgQVBJOjpPYmplY3QqIHVzZXJE YXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3sK KyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlk ZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBtX3BhZ2UubG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlv bihuYXZpZ2F0aW9uLCBXVEZNb3ZlKHJlcXVlc3QpLCBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9s aWN5LCB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMs IFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJv eHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0oQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBXZWJC YWNrRm9yd2FyZExpc3RJdGVtJiBpdGVtLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYm IHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBhdXRvIGl0ZW1TdGF0ZXMgPSBtX3BhZ2UuYmFja0Zv cndhcmRMaXN0KCkuZmlsdGVyZWRJdGVtU3RhdGVzKFt0aGlzLCB0YXJnZXRJdGVtID0gJml0ZW1d KGF1dG8mIGl0ZW0pIHsKKyAgICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBpdGVtLnN1c3BlbmRlZFBh Z2UoKSkgeworICAgICAgICAgICAgaWYgKCZwYWdlLT5wcm9jZXNzKCkgPT0gbV9wcm9jZXNzLnB0 cigpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAgICAgICBy ZXR1cm4gJml0ZW0gIT0gdGFyZ2V0SXRlbTsKKyAgICB9KTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQo TWVzc2FnZXM6OldlYlBhZ2U6OlVwZGF0ZUJhY2tGb3J3YXJkTGlzdEZvclJlYXR0YWNoKFdURk1v dmUoaXRlbVN0YXRlcykpLCBtX3BhZ2UucGFnZUlEKCkpOworICAgIG1fcHJvY2Vzcy0+c2VuZChN ZXNzYWdlczo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uLm5hdmlnYXRp b25JRCgpLCBpdGVtLml0ZW1JRCgpLCAqbmF2aWdhdGlvbi5iYWNrRm9yd2FyZEZyYW1lTG9hZFR5 cGUoKSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUo d2Vic2l0ZVBvbGljaWVzKSksIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgbV9wcm9jZXNzLT5yZXNw b25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94 eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCit7CisgICAgQVNTRVJUKCFt X21haW5GcmFtZSk7CisKKyAgICBtX21haW5GcmFtZSA9IFdlYkZyYW1lUHJveHk6OmNyZWF0ZSht X3BhZ2UsIGZyYW1lSUQpOworCisgICAgLy8gQWRkIHRoZSBmcmFtZSB0byB0aGUgcHJvY2VzcyB3 aWRlIG1hcC4KKyAgICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChmcmFtZUlELCAqbV9tYWluRnJh bWUpOworCisgICAgLy8gVGhpcyBuYXZpZ2F0aW9uIHdhcyBkZXN0cm95ZWQgc28gbm8gbmVlZCB0 byBub3RpZnkgb2YgcmVkaXJlY3QuCisgICAgaWYgKCFtX3BhZ2UubmF2aWdhdGlvblN0YXRlKCku aGFzTmF2aWdhdGlvbihtX25hdmlnYXRpb25JRCkpCisgICAgICAgIHJldHVybjsKKworICAgIC8v IFJlc3RvcmUgdGhlIG1haW4gZnJhbWUncyBjb21taXR0ZWQgVVJMIGFzIHNvbWUgY2xpZW50cyBt YXkgcmVseSBvbiBpdCB1bnRpbCB0aGUgbmV4dCBsb2FkIGlzIGNvbW1pdHRlZC4KKyAgICBpZiAo YXV0byogbWFpbkZyYW1lID0gbV9wYWdlLm1haW5GcmFtZSgpKQorICAgICAgICBtX21haW5GcmFt ZS0+ZnJhbWVMb2FkU3RhdGUoKS5zZXRVUkwobWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLnVy bCgpKTsKKworICAgIC8vIE5vcm1hbGx5LCBub3RpZmljYXRpb24gb2YgYSBzZXJ2ZXIgcmVkaXJl Y3QgY29tZXMgZnJvbSB0aGUgV2ViQ29udGVudCBwcm9jZXNzLgorICAgIC8vIElmIHdlIGFyZSBw cm9jZXNzIHN3YXBwaW5nIGluIHJlc3BvbnNlIHRvIGEgc2VydmVyIHJlZGlyZWN0IHRoZW4gdGhh dCBub3RpZmljYXRpb24gd2lsbCBub3QgY29tZSBmcm9tIHRoZSBuZXcgV2ViQ29udGVudCBwcm9j ZXNzLgorICAgIC8vIEluIHRoaXMgY2FzZSB3ZSBoYXZlIHRoZSBVSVByb2Nlc3Mgc3ludGhlc2l6 ZSB0aGUgcmVkaXJlY3Qgbm90aWZpY2F0aW9uIGF0IHRoZSBhcHByb3ByaWF0ZSB0aW1lLgorICAg IGlmIChtX2lzU2VydmVyUmVkaXJlY3QpIHsKKyAgICAgICAgbV9tYWluRnJhbWUtPmZyYW1lTG9h ZFN0YXRlKCkuZGlkU3RhcnRQcm92aXNpb25hbExvYWQobV9yZXF1ZXN0LnVybCgpKTsKKworICAg ICAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlk ZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICAgICAgbV9wYWdlLmRpZFJlY2VpdmVTZXJ2ZXJSZWRp cmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKG1fbWFpbkZyYW1lLT5mcmFtZUlEKCksIG1f bmF2aWdhdGlvbklELCBXVEZNb3ZlKG1fcmVxdWVzdCksIHsgfSk7CisgICAgfQorfQorCit2b2lk IFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVp bnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYgdXJsLCBVUkwmJiB1 bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAgIC8vIElmIHRo ZSBwcmV2aW91cyBwcm92aXNpb25hbCBsb2FkIHVzZWQgdGhlIHNhbWUgcHJvY2Vzcywgd2UgbWF5 IHJlY2VpdmUgSVBDIGZvciB0aGlzIHByZXZpb3VzIHByb3Zpc2lvbmFsJ3MgbWFpbiBmcmFtZSB0 aGF0IHdlIG5lZWQgdG8gaWdub3JlLgorICAgIGlmICghbV9tYWluRnJhbWUgfHwgbV9tYWluRnJh bWUtPmZyYW1lSUQoKSAhPSBmcmFtZUlEKQorICAgICAgICByZXR1cm47CisKKyAgICBBU1NFUlQo bV9wcm92aXNpb25hbExvYWRVUkwuaXNOdWxsKCkpOworICAgIG1fcHJvdmlzaW9uYWxMb2FkVVJM ID0gdXJsOworCisgICAgLy8gTWVyZWx5IGZvbGxvd2luZyBhIHNlcnZlciBzaWRlIHJlZGlyZWN0 IHNvIHRoZXJlIGlzIG5vIG5lZWQgdG8gc2VuZCBhIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkIGFn YWluLgorICAgIGlmIChtX2lzU2VydmVyUmVkaXJlY3QpCisgICAgICAgIHJldHVybjsKKworICAg IC8vIENsaWVudHMgZXhwZWN0IHRoZSBQYWdlJ3MgbWFpbiBmcmFtZSdzIGV4cGVjdGVkVVJMIHRv IGJlIHRoZSBwcm92aXNpb25hbCBvbmUgd2hlbiBhIHByb3Zpc2lvbmFsIGxvYWQgaXMgc3RhcnRl ZC4KKyAgICBpZiAoYXV0byogcGFnZU1haW5GcmFtZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAg ICAgICAgcGFnZU1haW5GcmFtZS0+ZGlkU3RhcnRQcm92aXNpb25hbExvYWQodXJsKTsKKworICAg IGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJv Y2VzcyhtX3Byb2Nlc3MpOworICAgIG1fcGFnZS5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lKGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgV1RGTW92ZSh1cmwpLCBXVEZNb3ZlKHVucmVhY2hh YmxlVVJMKSwgdXNlckRhdGEpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRG YWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29y ZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZp Z2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNvcmU6OlJl c291cmNlRXJyb3ImIGVycm9yLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCit7CisgICAgYXV0 byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNz KG1fcHJvY2Vzcyk7CisKKyAgICBtX3Byb3Zpc2lvbmFsTG9hZFVSTCA9IHsgfTsKKworICAgIC8v IE1ha2Ugc3VyZSB0aGUgUGFnZSdzIG1haW4gZnJhbWUncyBleHBlY3RlZFVSTCBnZXRzIGNsZWFy ZWQgc2luY2Ugd2UgdXBkYXRlZCBpdCBpbiBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZC4KKyAgICBp ZiAoYXV0byogcGFnZU1haW5GcmFtZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAgICAgcGFn ZU1haW5GcmFtZS0+ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZCgpOworCisgICAgbV9wYWdlLmRpZEZh aWxQcm92aXNpb25hbExvYWRGb3JGcmFtZShmcmFtZUlELCBmcmFtZVNlY3VyaXR5T3JpZ2luLCBu YXZpZ2F0aW9uSUQsIHByb3Zpc2lvbmFsVVJMLCBlcnJvciwgdXNlckRhdGEpOyAvLyBXaWxsIGRl bGV0ZSB8dGhpc3wuCit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZENvbW1pdExv YWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0 IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVp bnQzMl90IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYgY2Vy dGlmaWNhdGVJbmZvLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNv cmU6Okhhc0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBV c2VyRGF0YSYgdXNlckRhdGEpCit7CisgICAgLy8gSWYgdGhlIHByZXZpb3VzIHByb3Zpc2lvbmFs IGxvYWQgdXNlZCB0aGUgc2FtZSBwcm9jZXNzLCB3ZSBtYXkgcmVjZWl2ZSBJUEMgZm9yIHRoaXMg cHJldmlvdXMgcHJvdmlzaW9uYWwncyBtYWluIGZyYW1lIHRoYXQgd2UgbmVlZCB0byBpZ25vcmUu CisgICAgaWYgKCFtX21haW5GcmFtZSB8fCBtX21haW5GcmFtZS0+ZnJhbWVJRCgpICE9IGZyYW1l SUQpCisgICAgICAgIHJldHVybjsKKworICAgIG1fcHJvdmlzaW9uYWxMb2FkVVJMID0geyB9Owor ICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKworICAgIG1fd2Fz Q29tbWl0dGVkID0gdHJ1ZTsKKyAgICBtX3BhZ2UuY29tbWl0UHJvdmlzaW9uYWxQYWdlKGZyYW1l SUQsIG5hdmlnYXRpb25JRCwgbWltZVR5cGUsIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVy LCBmcmFtZUxvYWRUeXBlLCBjZXJ0aWZpY2F0ZUluZm8sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQs IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgdXNlckRhdGEpOyAvLyBXaWxsIGRlbGV0ZSB8dGhp c3wuCit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKElQ Qzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgSVBDOjpEZWNvZGVyJiBkZWNvZGVyKQoreworICAg IEFTU0VSVChkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpOworCisgICAgaWYgKGRlY29kZXIubWVzc2Fn ZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRTdGFydFByb2dyZXNzOjpuYW1l KCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OkRpZENoYW5nZVByb2dyZXNzOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNz YWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkJhY2tGb3J3YXJkQWRkSXRlbTo6 bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjpMb2dEaWFnbm9zdGljTWVzc2FnZTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29k ZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpMb2dEaWFnbm9zdGlj TWVzc2FnZVdpdGhFbmhhbmNlZFByaXZhY3k6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1l c3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U2V0TmV0d29ya1JlcXVlc3Rz SW5Qcm9ncmVzczo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBN ZXNzYWdlczo6V2ViUGFnZVByb3h5OjpSZWdpc3RlcldlYlByb2Nlc3NBY2Nlc3NpYmlsaXR5VG9r ZW46Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jOjpuYW1l KCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OlN0YXJ0VVJMU2NoZW1lVGFzazo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVz c2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEZWNpZGVQb2xpY3lGb3JSZXNw b25zZTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpEaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3Q6Om5hbWUoKQorICAgICAg ICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlk Q2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIu bWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWROYXZpZ2F0ZVdpdGhO YXZpZ2F0aW9uRGF0YTo6bmFtZSgpKQorICAgIHsKKyAgICAgICAgYXV0byBwYWdlUHJvY2Vzc092 ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7Cisg ICAgICAgIG1fcGFnZS5kaWRSZWNlaXZlTWVzc2FnZShjb25uZWN0aW9uLCBkZWNvZGVyKTsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0g TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ3JlYXRlTWFpbkZyYW1lOjpuYW1lKCkpIHsKKyAg ICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENyZWF0 ZU1haW5GcmFtZT4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVh dGVNYWluRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIu bWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRTdGFydFByb3Zpc2lv bmFsTG9hZEZvckZyYW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU+KGRl Y29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExv YWRGb3JGcmFtZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5t ZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZEZhaWxQcm92aXNpb25h bExvYWRGb3JGcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpEaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU+KGRlY29k ZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3Nh Z2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ29tbWl0TG9hZEZvckZyYW1l OjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OkRpZENvbW1pdExvYWRGb3JGcmFtZT4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFs UGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAg fQorCisgICAgTE9HKFByb2Nlc3NTd2FwcGluZywgIlVuaGFuZGxlZCBtZXNzYWdlICVzOjolcyBm cm9tIHByb3Zpc2lvbmFsIHByb2Nlc3MiLCBkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKS50 b1N0cmluZygpLmRhdGEoKSwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgp KTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdl KElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBzdGQ6 OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVyPiYgZW5jb2RlcikKK3sKKyAgICBpZiAoZGVjb2Rlci5t ZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkJhY2tGb3J3YXJkSXRlbUF0 SW5kZXg6Om5hbWUoKSB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6QmFja0ZvcndhcmRHb1RvSXRlbTo6bmFtZSgpKSB7CisgICAgICAgIGF1dG8gcGFn ZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3By b2Nlc3MpOworICAgICAgICBtX3BhZ2UuZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKGNvbm5lY3Rpb24s IGRlY29kZXIsIGVuY29kZXIpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgTE9HKFBy b2Nlc3NTd2FwcGluZywgIlVuaGFuZGxlZCBzeW5jIG1lc3NhZ2UgJXM6OiVzIGZyb20gcHJvdmlz aW9uYWwgcHJvY2VzcyIsIGRlY29kZXIubWVzc2FnZVJlY2VpdmVyTmFtZSgpLnRvU3RyaW5nKCku ZGF0YSgpLCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkudG9TdHJpbmcoKS5kYXRhKCkpOworfQorCit9 IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1Byb3Zpc2lvbmFsUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNp b25hbFBhZ2VQcm94eS5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi5l ZGMxNDE1NTQ5YgotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1By b3Zpc2lvbmFsUGFnZVByb3h5LmgKQEAgLTAsMCArMSw4OSBAQAorLyoKKyAqIENvcHlyaWdodCAo QykgMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93 aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291 cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0 aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICog Mi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92 ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRo ZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29y IG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICog VEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVU T1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywg SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVT IE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQ T1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBD T05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lE RU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAo SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElU VVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1Ig QlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVP UlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElU WSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lO RyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURW SVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNwcmFn bWEgb25jZQorCisjaW5jbHVkZSAiTWVzc2FnZVJlY2VpdmVyLmgiCisKK25hbWVzcGFjZSBXZWJD b3JlIHsKK2NsYXNzIFJlc291cmNlUmVxdWVzdDsKK30KKworbmFtZXNwYWNlIFdlYktpdCB7CisK K2NsYXNzIERyYXdpbmdBcmVhUHJveHk7CitjbGFzcyBTdXNwZW5kZWRQYWdlUHJveHk7CitjbGFz cyBXZWJGcmFtZVByb3h5OworY2xhc3MgV2ViUGFnZVByb3h5OworY2xhc3MgV2ViUHJvY2Vzc1By b3h5OworCitjbGFzcyBQcm92aXNpb25hbFBhZ2VQcm94eSA6IHB1YmxpYyBJUEM6Ok1lc3NhZ2VS ZWNlaXZlciB7CisgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CitwdWJsaWM6CisgICAgUHJv dmlzaW9uYWxQYWdlUHJveHkoV2ViUGFnZVByb3h5JiwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiwg c3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4sIHVpbnQ2NF90IG5hdmlnYXRpb25J RCwgYm9vbCBpc1NlcnZlclJlZGlyZWN0LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Qm LCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KTsKKyAgICB+UHJvdmlzaW9uYWxQYWdlUHJv eHkoKTsKKworICAgIFdlYlBhZ2VQcm94eSYgcGFnZSgpIHsgcmV0dXJuIG1fcGFnZTsgfQorICAg IFdlYkZyYW1lUHJveHkqIG1haW5GcmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fbWFpbkZyYW1lLmdl dCgpOyB9CisgICAgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKCkgeyByZXR1cm4gbV9wcm9jZXNz LmdldCgpOyB9CisgICAgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJl cXVlc3RlZEJ5Q2xpZW50KCkgY29uc3QgeyByZXR1cm4gbV9wcm9jZXNzU3dhcFJlcXVlc3RlZEJ5 Q2xpZW50OyB9CisgICAgdWludDY0X3QgbmF2aWdhdGlvbklEKCkgY29uc3QgeyByZXR1cm4gbV9u YXZpZ2F0aW9uSUQ7IH0KKworICAgIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiB0 YWtlRHJhd2luZ0FyZWEoKTsKKworICAgIHZvaWQgbG9hZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6 Ok5hdmlnYXRpb24mLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBjb25zdCBTdHJpbmcmIE1J TUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQ STo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdU Rjo6bnVsbG9wdCk7CisgICAgdm9pZCBsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2 aWdhdGlvbiYsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBXZWJDb3JlOjpTaG91bGRPcGVu RXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIE9wdGlvbmFsPFdlYnNp dGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOworICAgIHZvaWQgZ29Ub0JhY2tGb3J3 YXJkSXRlbShBUEk6Ok5hdmlnYXRpb24mLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtJiwgT3B0aW9u YWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJik7CisgICAgdm9pZCBjYW5jZWwoKTsKKworcHJpdmF0 ZToKKyAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgorICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3Nh Z2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgZmluYWw7CisgICAgdm9pZCBkaWRS ZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJiwgc3RkOjp1 bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mKSBmaW5hbDsKKworICAgIHZvaWQgZGlkQ3JlYXRlTWFp bkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpOworICAgIHZvaWQgZGlkU3RhcnRQcm92aXNpb25hbExv YWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYm LCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2b2lkIGRpZENv bW1pdExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQs IGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlk ZXIsIHVpbnQzMl90IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5m byYsIGJvb2wgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5z ZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIGNvbnN0IFVzZXJEYXRhJik7 CisgICAgdm9pZCBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJ RCwgY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2lu LCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNv bnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBjb25zdCBVc2VyRGF0YSYpOworCisgICAgdm9p ZCBpbml0aWFsaXplV2ViUGFnZSgpOworCisgICAgV2ViUGFnZVByb3h5JiBtX3BhZ2U7CisgICAg UmVmPFdlYlByb2Nlc3NQcm94eT4gbV9wcm9jZXNzOworICAgIHN0ZDo6dW5pcXVlX3B0cjxEcmF3 aW5nQXJlYVByb3h5PiBtX2RyYXdpbmdBcmVhOworICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5PiBt X21haW5GcmFtZTsKKyAgICB1aW50NjRfdCBtX25hdmlnYXRpb25JRDsKKyAgICBib29sIG1faXNT ZXJ2ZXJSZWRpcmVjdDsKKyAgICBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QgbV9yZXF1ZXN0Owor ICAgIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgbV9wcm9jZXNzU3dhcFJlcXVlc3RlZEJ5 Q2xpZW50OworICAgIGJvb2wgbV93YXNDb21taXR0ZWQgeyBmYWxzZSB9OworICAgIFVSTCBtX3By b3Zpc2lvbmFsTG9hZFVSTDsKKworI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgUHJvY2Vz c1Rocm90dGxlcjo6QmFja2dyb3VuZEFjdGl2aXR5VG9rZW4gbV9zdXNwZW5zaW9uVG9rZW47Cisj ZW5kaWYKK307CisKK30gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9y UHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90 ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuY3BwCmluZGV4IGEzNjdlMTVmMDA1Li4xNjZlZjQ5 YTkzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVl L1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5 LmNwcApAQCAtNDcsNyArNDcsMTIgQEAgUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eTo6 UmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eShXZWJQYWdlUHJveHkmIHcKICAgICA6IG1f d2ViUGFnZVByb3h5KHdlYlBhZ2VQcm94eSkKICAgICAsIG1fc2Nyb2xsaW5nVHJlZShSZW1vdGVT Y3JvbGxpbmdUcmVlOjpjcmVhdGUoKnRoaXMpKQogICAgICwgbV9yZXF1ZXN0ZWRTY3JvbGxJbmZv KG51bGxwdHIpCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAgICAvLyBPbiBpT1MsIG1haW4g ZnJhbWUgc2Nyb2xscyBhcmUgc2VudCBpbiB0ZXJtcyBvZiB2aXNpYmxlIHJlY3QgdXBkYXRlcy4K KyAgICAsIG1fcHJvcGFnYXRlc01haW5GcmFtZVNjcm9sbHMoZmFsc2UpCisjZWxzZQogICAgICwg bV9wcm9wYWdhdGVzTWFpbkZyYW1lU2Nyb2xscyh0cnVlKQorI2VuZGlmCiB7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3Jv bGxpbmdDb29yZGluYXRvclByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVM YXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5oCmluZGV4IGIzMmQ3OWZl OTI4Li43OTBkNTE1NWQzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVt b3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRp bmF0b3JQcm94eS5oCkBAIC03OSw3ICs3OSw2IEBAIHB1YmxpYzoKICAgICB9OwogICAgIHZvaWQg Y29tbWl0U2Nyb2xsaW5nVHJlZVN0YXRlKGNvbnN0IFJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9y VHJhbnNhY3Rpb24mLCBSZXF1ZXN0ZWRTY3JvbGxJbmZvJik7CiAKLSAgICB2b2lkIHNldFByb3Bh Z2F0ZXNNYWluRnJhbWVTY3JvbGxzKGJvb2wgcHJvcGFnYXRlc01haW5GcmFtZVNjcm9sbHMpIHsg bV9wcm9wYWdhdGVzTWFpbkZyYW1lU2Nyb2xscyA9IHByb3BhZ2F0ZXNNYWluRnJhbWVTY3JvbGxz OyB9CiAgICAgYm9vbCBwcm9wYWdhdGVzTWFpbkZyYW1lU2Nyb2xscygpIGNvbnN0IHsgcmV0dXJu IG1fcHJvcGFnYXRlc01haW5GcmFtZVNjcm9sbHM7IH0KICAgICBib29sIGhhc0ZpeGVkT3JTdGlj a3koKSBjb25zdCB7IHJldHVybiBtX3Njcm9sbGluZ1RyZWUtPmhhc0ZpeGVkT3JTdGlja3koKTsg fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJv eHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcApp bmRleCBmMTk4YTgxNTMzZi4uZmY3NmQ5ZjdmOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcApAQCAtMTAwLDcgKzEwMCw5IEBAIFN1c3BlbmRl ZFBhZ2VQcm94eTo6flN1c3BlbmRlZFBhZ2VQcm94eSgpCiAgICAgLy8gSWYgdGhlIHN1c3BlbmRl ZCBwYWdlIHdhcyBub3QgY29uc3VtZWQgYmVmb3JlIGdldHRpbmcgZGVzdHJveWVkLCB0aGVuIGNs b3NlIHRoZSBjb3JyZXNwb25kaW5nIHBhZ2UKICAgICAvLyBvbiB0aGUgV2ViUHJvY2VzcyBzaWRl LgogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9wYWdl LnBhZ2VJRCgpKTsKLSAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdl czo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7 CisKKyAgICBpZiAobV9zdXNwZW5zaW9uU3RhdGUgPT0gU3VzcGVuc2lvblN0YXRlOjpTdXNwZW5k aW5nKQorICAgICAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CiAK ICAgICAvLyBXZSBjYWxsIG1heWJlU2h1dERvd24oKSBhc3luY2hyb25vdXNseSBzaW5jZSB0aGUg U3VzcGVuZGVkUGFnZSBpcyBjdXJyZW50bHkgYmVpbmcgcmVtb3ZlZCBmcm9tIHRoZSBXZWJQcm9j ZXNzUG9vbAogICAgIC8vIGFuZCB3ZSB3YW50IHRvIGF2b2lkIHJlLWVudGVyaW5nIFdlYlByb2Nl c3NQb29sIG1ldGhvZHMuCkBAIC0xMzQsNyArMTM2LDYgQEAgdm9pZCBTdXNwZW5kZWRQYWdlUHJv eHk6OnVuc3VzcGVuZCgpCiAgICAgQVNTRVJUKG1fc3VzcGVuc2lvblN0YXRlID09IFN1c3BlbnNp b25TdGF0ZTo6U3VzcGVuZGVkKTsKIAogICAgIG1fc3VzcGVuc2lvblN0YXRlID0gU3VzcGVuc2lv blN0YXRlOjpSZXN1bWVkOwotICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJ RCgpKTsKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldElzU3VzcGVu ZGVkKGZhbHNlKSwgbV9wYWdlLnBhZ2VJRCgpKTsKIH0KIApAQCAtMTUxLDYgKzE1Miw4IEBAIHZv aWQgU3VzcGVuZGVkUGFnZVByb3h5OjpkaWRQcm9jZXNzUmVxdWVzdFRvU3VzcGVuZChTdXNwZW5z aW9uU3RhdGUgbmV3U3VzcGVuc2lvCiAgICAgbV9zdXNwZW5zaW9uVG9rZW4gPSBudWxscHRyOwog I2VuZGlmCiAKKyAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisK ICAgICBpZiAobV9yZWFkeVRvVW5zdXNwZW5kSGFuZGxlcikKICAgICAgICAgbV9yZWFkeVRvVW5z dXNwZW5kSGFuZGxlcih0aGlzKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYkZyYW1lUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQ cm94eS5jcHAKaW5kZXggYzc3YTI2Yjc0MjcuLjUzYzcxOTZjMmFhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcApAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUg IldlYkZyYW1lUHJveHkuaCIKIAogI2luY2x1ZGUgIkFQSU5hdmlnYXRpb24uaCIKKyNpbmNsdWRl ICJQcm92aXNpb25hbFBhZ2VQcm94eS5oIgogI2luY2x1ZGUgIldlYkNlcnRpZmljYXRlSW5mby5o IgogI2luY2x1ZGUgIldlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eS5oIgogI2luY2x1ZGUgIldl YlBhZ2VNZXNzYWdlcy5oIgpAQCAtNzQsNyArNzUsNyBAQCBib29sIFdlYkZyYW1lUHJveHk6Omlz TWFpbkZyYW1lKCkgY29uc3QKICAgICBpZiAoIW1fcGFnZSkKICAgICAgICAgcmV0dXJuIGZhbHNl OwogCi0gICAgcmV0dXJuIHRoaXMgPT0gbV9wYWdlLT5tYWluRnJhbWUoKTsKKyAgICByZXR1cm4g dGhpcyA9PSBtX3BhZ2UtPm1haW5GcmFtZSgpIHx8IChtX3BhZ2UtPnByb3Zpc2lvbmFsUGFnZVBy b3h5KCkgJiYgdGhpcyA9PSBtX3BhZ2UtPnByb3Zpc2lvbmFsUGFnZVByb3h5KCktPm1haW5GcmFt ZSgpKTsKIH0KIAogdm9pZCBXZWJGcmFtZVByb3h5Ojpsb2FkVVJMKGNvbnN0IFVSTCYgdXJsKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMzkyNzQzYmQ1Njcu LjQ0NDYxN2VhZGYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK QEAgLTc3LDYgKzc3LDcgQEAKICNpbmNsdWRlICJQbHVnaW5JbmZvcm1hdGlvbi5oIgogI2luY2x1 ZGUgIlBsdWdpblByb2Nlc3NNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiUHJpbnRJbmZvLmgiCisjaW5j bHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbmNsdWRlICJTYWZlQnJvd3NpbmdXYXJu aW5nLmgiCiAjaW5jbHVkZSAiU2hhcmVTaGVldENhbGxiYWNrSUQuaCIKICNpbmNsdWRlICJTaGFy ZWRCdWZmZXJEYXRhUmVmZXJlbmNlLmgiCkBAIC03NjgsMzggKzc2OSwyNSBAQCBib29sIFdlYlBh Z2VQcm94eTo6c3VzcGVuZEN1cnJlbnRQYWdlSWZQb3NzaWJsZShBUEk6Ok5hdmlnYXRpb24mIG5h dmlnYXRpb24sIE9wdAogICAgIHJldHVybiB0cnVlOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6 c3dhcFRvV2ViUHJvY2VzcyhSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIHN0ZDo6dW5p cXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLCBJ c1N3YXBGcm9tU3VzcGVuZGVkIGlzU3dhcEZyb21TdXNwZW5kZWQpCit2b2lkIFdlYlBhZ2VQcm94 eTo6c3dhcFRvV2ViUHJvY2VzcyhSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIHN0ZDo6 dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmIGRyYXdpbmdBcmVhLCBSZWZQdHI8V2ViRnJh bWVQcm94eT4mJiBtYWluRnJhbWUpCiB7CiAgICAgQVNTRVJUKCFtX2lzQ2xvc2VkKTsKICAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJzd2FwVG9XZWJQcm9jZXNzOiB3ZWJQSUQg PSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCks IG1fcGFnZUlEKTsKIAogICAgIG1fcHJvY2VzcyA9IFdURk1vdmUocHJvY2Vzcyk7CisgICAgQVNT RVJUKCFtX2RyYXdpbmdBcmVhKTsKKyAgICBtX2RyYXdpbmdBcmVhID0gV1RGTW92ZShkcmF3aW5n QXJlYSk7CisgICAgQVNTRVJUKCFtX21haW5GcmFtZSk7CisgICAgbV9tYWluRnJhbWUgPSBXVEZN b3ZlKG1haW5GcmFtZSk7CiAgICAgbV9pc1ZhbGlkID0gdHJ1ZTsKIAotICAgIC8vIElmIHdlIGFy ZSByZWF0dGFjaGluZyB0byBhIFN1c3BlbmRlZFBhZ2UsIHRoZW4gdGhlIFdlYlByb2Nlc3MnIFdl YlBhZ2UgYWxyZWFkeSBleGlzdHMgYW5kCi0gICAgLy8gV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVN YWluRnJhbWUoKSB3aWxsIG5vdCBiZSBjYWxsZWQgdG8gaW5pdGlhbGl6ZSBtX21haW5GcmFtZS4g SW4gc3VjaAotICAgIC8vIGNhc2UsIHdlIG5lZWQgdG8gaW5pdGlhbGl6ZSBtX21haW5GcmFtZSB0 byByZWZsZWN0IHRoZSBmYWN0IHRoZSB0aGUgV2ViUHJvY2VzcycgV2ViUGFnZQotICAgIC8vIGFs cmVhZHkgZXhpc3RzIGFuZCBhbHJlYWR5IGhhcyBhIG1haW4gZnJhbWUuCi0gICAgaWYgKGRlc3Rp bmF0aW9uU3VzcGVuZGVkUGFnZSkgewotICAgICAgICBpZiAoIWRlc3RpbmF0aW9uU3VzcGVuZGVk UGFnZS0+ZmFpbGVkVG9TdXNwZW5kKCkpIHsKLSAgICAgICAgICAgIEFTU0VSVCghbV9tYWluRnJh bWUpOwotICAgICAgICAgICAgQVNTRVJUKCZkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPnByb2Nl c3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpOwotICAgICAgICAgICAgZGVzdGluYXRpb25TdXNwZW5k ZWRQYWdlLT51bnN1c3BlbmQoKTsKLSAgICAgICAgICAgIG1fbWFpbkZyYW1lID0gV2ViRnJhbWVQ cm94eTo6Y3JlYXRlKCp0aGlzLCBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPm1haW5GcmFtZUlE KCkpOwotICAgICAgICAgICAgbV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoZGVzdGluYXRpb25TdXNw ZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpLCAqbV9tYWluRnJhbWUpOwotICAgICAgICB9IGVsc2Ug ewotICAgICAgICAgICAgLy8gV2UgZmFpbGVkIHRvIHN1c3BlbmQgdGhlIHBhZ2Ugc28gZGVzdHJv eSBpdCBub3cgYW5kIG1lcmVseSByZXVzZSBpdHMgV2ViQ29udGVudCBwcm9jZXNzLgotICAgICAg ICAgICAgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlID0gbnVsbHB0cjsKLSAgICAgICAgfQotICAg IH0KLQogICAgIG1fcHJvY2Vzcy0+YWRkRXhpc3RpbmdXZWJQYWdlKCp0aGlzLCBtX3BhZ2VJRCwg V2ViUHJvY2Vzc1Byb3h5OjpCZWdpbnNVc2luZ0RhdGFTdG9yZTo6Tm8pOwogICAgIG1fcHJvY2Vz cy0+YWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNl aXZlck5hbWUoKSwgbV9wYWdlSUQsICp0aGlzKTsKIAotICAgIGZpbmlzaEF0dGFjaGluZ1RvV2Vi UHJvY2Vzcyhpc1N3YXBGcm9tU3VzcGVuZGVkKTsKKyAgICBmaW5pc2hBdHRhY2hpbmdUb1dlYlBy b2Nlc3MoKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJv Y2VzcyhJc1N3YXBGcm9tU3VzcGVuZGVkIGlzU3dhcEZyb21TdXNwZW5kZWQpCit2b2lkIFdlYlBh Z2VQcm94eTo6ZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKCkKIHsKICAgICBBU1NFUlQobV9w cm9jZXNzLT5zdGF0ZSgpICE9IENoaWxkUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6VGVybWluYXRlZCk7 CiAKQEAgLTgzNSw3ICs4MjMsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNoaW5n VG9XZWJQcm9jZXNzKElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1cwogICAgIG1fZWRp dGFibGVJbWFnZUNvbnRyb2xsZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEVkaXRhYmxlSW1hZ2VDb250 cm9sbGVyPigqdGhpcyk7CiAjZW5kaWYKIAotICAgIGluaXRpYWxpemVXZWJQYWdlKGlzU3dhcEZy b21TdXNwZW5kZWQpOworICAgIGluaXRpYWxpemVXZWJQYWdlKCk7CiAKICAgICBtX2luc3BlY3Rv ci0+dXBkYXRlRm9yTmV3UGFnZVByb2Nlc3ModGhpcyk7CiAKQEAgLTkwMCwzMSArODg4LDIxIEBA IFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nl c3NXaXRoSXRlbShXZWJCYWNrRm9yd2FyCiAgICAgcmV0dXJuIFdURk1vdmUobmF2aWdhdGlvbik7 CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZShJc1N3YXBGcm9tU3Vz cGVuZGVkIGlzU3dhcEZyb21TdXNwZW5kZWQpCit2b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6 ZVdlYlBhZ2UoKQogewogICAgIEFTU0VSVChpc1ZhbGlkKCkpOwogCi0gICAgbV9kcmF3aW5nQXJl YSA9IHBhZ2VDbGllbnQoKS5jcmVhdGVEcmF3aW5nQXJlYVByb3h5KCk7Ci0gICAgQVNTRVJUKG1f ZHJhd2luZ0FyZWEpOworICAgIGlmICghbV9kcmF3aW5nQXJlYSkgeworICAgICAgICBtX2RyYXdp bmdBcmVhID0gcGFnZUNsaWVudCgpLmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKKyAgICAgICAg QVNTRVJUKG1fZHJhd2luZ0FyZWEpOworICAgIH0KIAogI2lmIEVOQUJMRShBU1lOQ19TQ1JPTExJ TkcpICYmIFBMQVRGT1JNKENPQ09BKQotICAgIGlmIChtX2RyYXdpbmdBcmVhLT50eXBlKCkgPT0g RHJhd2luZ0FyZWFUeXBlUmVtb3RlTGF5ZXJUcmVlKSB7CisgICAgaWYgKG1fZHJhd2luZ0FyZWEt PnR5cGUoKSA9PSBEcmF3aW5nQXJlYVR5cGVSZW1vdGVMYXllclRyZWUpCiAgICAgICAgIG1fc2Ny b2xsaW5nQ29vcmRpbmF0b3JQcm94eSA9IHN0ZDo6bWFrZV91bmlxdWU8UmVtb3RlU2Nyb2xsaW5n Q29vcmRpbmF0b3JQcm94eT4oKnRoaXMpOwotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAg ICAgIC8vIE9uIGlPUywgbWFpbiBmcmFtZSBzY3JvbGxzIGFyZSBzZW50IGluIHRlcm1zIG9mIHZp c2libGUgcmVjdCB1cGRhdGVzLgotICAgICAgICBtX3Njcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkt PnNldFByb3BhZ2F0ZXNNYWluRnJhbWVTY3JvbGxzKGZhbHNlKTsKLSNlbmRpZgotICAgIH0KICNl bmRpZgogCi0gICAgYXV0byBwYXJhbWV0ZXJzID0gY3JlYXRpb25QYXJhbWV0ZXJzKCk7Ci0gICAg cGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkID0gaXNTd2FwRnJvbVN1c3BlbmRlZCA9PSBJ c1N3YXBGcm9tU3VzcGVuZGVkOjpZZXM7Ci0KLSNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCi0g ICAgcGFyYW1ldGVycy5oYXNSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMgPSBwcm9jZXNzKCkucHJv Y2Vzc1Bvb2woKS5tYXlIYXZlUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXJzKG1fd2Vic2l0ZURhdGFT dG9yZSk7Ci0jZW5kaWYKLQotICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNz OjpDcmVhdGVXZWJQYWdlKG1fcGFnZUlELCBwYXJhbWV0ZXJzKSwgMCk7CisgICAgcHJvY2Vzcygp LnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OkNyZWF0ZVdlYlBhZ2UobV9wYWdlSUQsIGNyZWF0 aW9uUGFyYW1ldGVycygpKSwgMCk7CiAKICAgICBtX25lZWRzVG9GaW5pc2hJbml0aWFsaXppbmdX ZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNoID0gdHJ1ZTsKICAgICBmaW5pc2hJbml0aWFsaXppbmdX ZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNoKCk7CkBAIC0xMDc2LDcgKzEwNTQsOCBAQCB2b2lkIFdl YlBhZ2VQcm94eTo6bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mIG5h dmlnYXRpb24sIFJlc291cgogICAgIGF1dG8gdHJhbnNhY3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUu dHJhbnNhY3Rpb24oKTsKIAogICAgIGF1dG8gdXJsID0gcmVxdWVzdC51cmwoKTsKLSAgICBtX3Bh Z2VMb2FkU3RhdGUuc2V0UGVuZGluZ0FQSVJlcXVlc3RVUkwodHJhbnNhY3Rpb24sIHVybCk7Cisg ICAgaWYgKHNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCAhPSBTaG91bGRUcmVhdEFzQ29udGlu dWluZ0xvYWQ6OlllcykKKyAgICAgICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1 ZXN0VVJMKHRyYW5zYWN0aW9uLCB1cmwpOwogCiAgICAgaWYgKCFpc1ZhbGlkKCkpCiAgICAgICAg IHJlYXR0YWNoVG9XZWJQcm9jZXNzKCk7CkBAIC0yNjk3LDcgKzI2NzYsNyBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6cmVjZWl2ZWROYXZpZ2F0aW9uUG9saWN5RGVjaXNpb24oV2ViUG9saWN5QWN0aW9u IHBvbGljeUFjdGlvbgogICAgICAgICB9CiAKICAgICAgICAgaWYgKHByb2Nlc3NGb3JOYXZpZ2F0 aW9uLnB0cigpICE9ICZwcm9jZXNzKCkpIHsKLSAgICAgICAgICAgIHBvbGljeUFjdGlvbiA9IGlz UGFnZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgPyBXZWJQb2xpY3lB Y3Rpb246Oklnbm9yZSA6IFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZDsKKyAgICAgICAgICAgIHBv bGljeUFjdGlvbiA9IFdlYlBvbGljeUFjdGlvbjo6SWdub3JlOwogICAgICAgICAgICAgUkVMRUFT RV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0 aW9uQWN0aW9uLCBzd2FwcGluZyBwcm9jZXNzICVpIHdpdGggcHJvY2VzcyAlaSBmb3IgbmF2aWdh dGlvbiwgcmVhc29uOiAle3B1YmxpY31zIiwgcHJvY2Vzc0lkZW50aWZpZXIoKSwgcHJvY2Vzc0Zv ck5hdmlnYXRpb24tPnByb2Nlc3NJZGVudGlmaWVyKCksIHJlYXNvbi51dGY4KCkuZGF0YSgpKTsK ICAgICAgICAgICAgIExPRyhQcm9jZXNzU3dhcHBpbmcsICIoUHJvY2Vzc1N3YXBwaW5nKSBTd2l0 Y2hpbmcgZnJvbSBwcm9jZXNzICVpIHRvIG5ldyBwcm9jZXNzICglaSkgZm9yIG5hdmlnYXRpb24g JSIgUFJJdTY0ICIgJyVzJyIsIHByb2Nlc3NJZGVudGlmaWVyKCksIHByb2Nlc3NGb3JOYXZpZ2F0 aW9uLT5wcm9jZXNzSWRlbnRpZmllcigpLCBuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSwgbmF2 aWdhdGlvbi0+bG9nZ2luZ1N0cmluZygpKTsKICAgICAgICAgfSBlbHNlCkBAIC0yNzQzLDI0ICsy NzIyLDQwIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZFBvbGljeURlY2lzaW9uKFdlYlBv bGljeUFjdGlvbiBhY3Rpb24sIEFQSTo6TmF2aWdhdGlvCiAgICAgc2VuZGVyLT5zZW5kKGFjdGlv biwgbmF2aWdhdGlvbiA/IG5hdmlnYXRpb24tPm5hdmlnYXRpb25JRCgpIDogMCwgZG93bmxvYWRJ RCwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmNv bnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24s IHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYgc3VzcGVuZGVkUGFnZVByb3h5 LCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlD bGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGlj aWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit2b2lkIFdlYlBhZ2VQcm94eTo6Y29tbWl0UHJv dmlzaW9uYWxQYWdlKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29u c3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwg dWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiBj ZXJ0aWZpY2F0ZUluZm8sIGJvb2wgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9uYWw8V2Vi Q29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIGNvbnN0 IFVzZXJEYXRhJiB1c2VyRGF0YSkKIHsKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRp bmcsICJjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3M6IHdlYlBJRCA9ICVpLCBwYWdlSUQg PSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQpOwot ICAgIExPRyhMb2FkaW5nLCAiQ29udGludWluZyBuYXZpZ2F0aW9uICUiIFBSSXU2NCAiICclcycg aW4gYSBuZXcgd2ViIHByb2Nlc3MiLCBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBuYXZpZ2F0 aW9uLmxvZ2dpbmdTdHJpbmcoKSk7CisgICAgQVNTRVJUKG1fcHJvdmlzaW9uYWxQYWdlKTsKIAot ICAgIFJlZjxXZWJQcm9jZXNzUHJveHk+IHByZXZpb3VzUHJvY2VzcyA9IG1fcHJvY2Vzcy5jb3B5 UmVmKCk7Ci0gICAgT3B0aW9uYWw8dWludDY0X3Q+IG1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nl c3MgPSBtX21haW5GcmFtZSA/IG1ha2VPcHRpb25hbChtX21haW5GcmFtZS0+ZnJhbWVJRCgpKSA6 IFdURjo6bnVsbG9wdDsKLSAgICBhdXRvIG1haW5GcmFtZVVSTCA9IG1fbWFpbkZyYW1lID8gbV9t YWluRnJhbWUtPnVybCgpIDogVVJMKCk7CisgICAgT3B0aW9uYWw8dWludDY0X3Q+IG1haW5GcmFt ZUlESW5QcmV2aW91c1Byb2Nlc3MgPSBtYWluRnJhbWUoKSA/IG1ha2VPcHRpb25hbChtYWluRnJh bWUoKS0+ZnJhbWVJRCgpKSA6IFdURjo6bnVsbG9wdDsKKyAgICBwcm9jZXNzRGlkVGVybWluYXRl KFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbjo6TmF2aWdhdGlvblN3YXApOworICAgIHByb2Nlc3Mo KS5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJl Y2VpdmVyTmFtZSgpLCBwYWdlSUQoKSk7CiAKLSAgICBBU1NFUlQobV9wcm9jZXNzLnB0cigpICE9 IHByb2Nlc3MucHRyKCkpOworICAgIGF1dG8qIG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uU3RhdGUo KS5uYXZpZ2F0aW9uKG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSk7CisgICAgYm9v bCBkaWRTdXNwZW5kUHJldmlvdXNQYWdlID0gbmF2aWdhdGlvbiA/IHN1c3BlbmRDdXJyZW50UGFn ZUlmUG9zc2libGUoKm5hdmlnYXRpb24sIG1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MsIG1f cHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KCkpIDogZmFsc2U7 CisgICAgLy8gVGhlcmUgaXMgbm8gd2F5IHdlJ2xsIGJlIGFibGUgdG8gcmV0dXJuIHRvIHRoZSBw YWdlIGluIHRoZSBwcmV2aW91cyBwYWdlIHNvIGNsb3NlIGl0LgorICAgIGlmICghZGlkU3VzcGVu ZFByZXZpb3VzUGFnZSkKKyAgICAgICAgcHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6 OkNsb3NlKCksIHBhZ2VJRCgpKTsKIAotICAgIHByb2Nlc3NEaWRUZXJtaW5hdGUoUHJvY2Vzc1Rl cm1pbmF0aW9uUmVhc29uOjpOYXZpZ2F0aW9uU3dhcCk7CisgICAgcHJvY2VzcygpLnJlbW92ZVdl YlBhZ2UoKnRoaXMsIHBhZ2VJRCgpLCBXZWJQcm9jZXNzUHJveHk6OkVuZHNVc2luZ0RhdGFTdG9y ZTo6Tm8pOworICAgIHN3YXBUb1dlYlByb2Nlc3MobV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3Mo KSwgbV9wcm92aXNpb25hbFBhZ2UtPnRha2VEcmF3aW5nQXJlYSgpLCBtX3Byb3Zpc2lvbmFsUGFn ZS0+bWFpbkZyYW1lKCkpOwogCi0gICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIo TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2VJRCk7 Ci0gICAgYm9vbCBkaWRTdXNwZW5kUHJldmlvdXNQYWdlID0gc3VzcGVuZEN1cnJlbnRQYWdlSWZQ b3NzaWJsZShuYXZpZ2F0aW9uLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzLCBwcm9jZXNz U3dhcFJlcXVlc3RlZEJ5Q2xpZW50KTsKLSAgICBtX3Byb2Nlc3MtPnJlbW92ZVdlYlBhZ2UoKnRo aXMsIG1fcGFnZUlELCBXZWJQcm9jZXNzUHJveHk6OkVuZHNVc2luZ0RhdGFTdG9yZTo6Tm8pOwor ICAgIGRpZENvbW1pdExvYWRGb3JGcmFtZShmcmFtZUlELCBuYXZpZ2F0aW9uSUQsIG1pbWVUeXBl LCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgZnJhbWVMb2FkVHlwZSwgY2VydGlmaWNh dGVJbmZvLCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQs IHVzZXJEYXRhKTsKKworICAgIG1fcHJvdmlzaW9uYWxQYWdlID0gbnVsbHB0cjsKK30KKwordm9p ZCBXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhBUEk6Ok5hdmln YXRpb24mIG5hdmlnYXRpb24sIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYg c3VzcGVuZGVkUGFnZVByb3h5LCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIG5ld1Byb2Nlc3MsIFBy b2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwg T3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit7CisgICAg UkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiY29udGludWVOYXZpZ2F0aW9uSW5OZXdQ cm9jZXNzOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nl c3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKKyAgICBMT0coTG9hZGluZywgIkNvbnRpbnVpbmcg bmF2aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMnIGluIGEgbmV3IHdlYiBwcm9jZXNzIiwgbmF2aWdh dGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi5sb2dnaW5nU3RyaW5nKCkpOwogCi0gICAg c3dhcFRvV2ViUHJvY2VzcyhXVEZNb3ZlKHByb2Nlc3MpLCBXVEZNb3ZlKHN1c3BlbmRlZFBhZ2VQ cm94eSksIGRpZFN1c3BlbmRQcmV2aW91c1BhZ2UgPyBJc1N3YXBGcm9tU3VzcGVuZGVkOjpZZXMg OiBJc1N3YXBGcm9tU3VzcGVuZGVkOjpObyk7CisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlKSB7 CisgICAgICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkgIT0gbmF2aWdh dGlvbi5uYXZpZ2F0aW9uSUQoKSkKKyAgICAgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5jYW5j ZWwoKTsKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBudWxscHRyOworICAgIH0KKworICAg IG1fcHJvdmlzaW9uYWxQYWdlID0gc3RkOjptYWtlX3VuaXF1ZTxQcm92aXNpb25hbFBhZ2VQcm94 eT4oKnRoaXMsIG5ld1Byb2Nlc3MuY29weVJlZigpLCBXVEZNb3ZlKHN1c3BlbmRlZFBhZ2VQcm94 eSksIG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3RJ c1JlZGlyZWN0KCksIG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKSwgcHJvY2Vzc1N3YXBSZXF1 ZXN0ZWRCeUNsaWVudCk7CiAKICAgICBpZiAoYXV0byogaXRlbSA9IG5hdmlnYXRpb24udGFyZ2V0 SXRlbSgpKSB7CiAgICAgICAgIExPRyhMb2FkaW5nLCAiV2ViUGFnZVByb3h5ICVwIGNvbnRpbnVl TmF2aWdhdGlvbkluTmV3UHJvY2VzcyB0byBiYWNrIGl0ZW0gVVJMICVzIiwgdGhpcywgaXRlbS0+ dXJsKCkudXRmOCgpLmRhdGEoKSk7CkBAIC0yNzY4LDY3ICsyNzYzLDIyIEBAIHZvaWQgV2ViUGFn ZVByb3h5Ojpjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpOYXZpZ2F0aW9uJiBu YXZpZ2F0aW9uLCBzCiAgICAgICAgIGF1dG8gdHJhbnNhY3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUu dHJhbnNhY3Rpb24oKTsKICAgICAgICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1 ZXN0VVJMKHRyYW5zYWN0aW9uLCBpdGVtLT51cmwoKSk7CiAKLSAgICAgICAgYXV0byBpdGVtU3Rh dGVzID0gbV9iYWNrRm9yd2FyZExpc3QtPmZpbHRlcmVkSXRlbVN0YXRlcyhbdGhpcywgdGFyZ2V0 SXRlbSA9IGl0ZW1dKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mIGl0ZW0pIHsKLSAgICAgICAgICAg IGlmIChhdXRvKiBwYWdlID0gaXRlbS5zdXNwZW5kZWRQYWdlKCkpIHsKLSAgICAgICAgICAgICAg ICBpZiAoJnBhZ2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpCi0gICAgICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybiAm aXRlbSAhPSB0YXJnZXRJdGVtOwotICAgICAgICB9KTsKLSAgICAgICAgbV9wcm9jZXNzLT5zZW5k KE1lc3NhZ2VzOjpXZWJQYWdlOjpVcGRhdGVCYWNrRm9yd2FyZExpc3RGb3JSZWF0dGFjaChXVEZN b3ZlKGl0ZW1TdGF0ZXMpKSwgbV9wYWdlSUQpOwotICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0obmF2aWdhdGlvbi5uYXZpZ2F0aW9u SUQoKSwgaXRlbS0+aXRlbUlEKCksICpuYXZpZ2F0aW9uLmJhY2tGb3J3YXJkRnJhbWVMb2FkVHlw ZSgpLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9s aWNpZXMpKSwgbV9wYWdlSUQpOwotICAgICAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGlt ZXIoKS5zdGFydCgpOwotCisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5nb1RvQmFja0Zvcndh cmRJdGVtKG5hdmlnYXRpb24sICppdGVtLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOwogICAg ICAgICByZXR1cm47CiAgICAgfQogCiAgICAgaWYgKG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50 SXRlbSgpICYmIChuYXZpZ2F0aW9uLmxvY2tCYWNrRm9yd2FyZExpc3QoKSA9PSBMb2NrQmFja0Zv cndhcmRMaXN0OjpZZXMgfHwgbmF2aWdhdGlvbi5sb2NrSGlzdG9yeSgpID09IExvY2tIaXN0b3J5 OjpZZXMpKSB7CiAgICAgICAgIC8vIElmIFdlYkNvcmUgaXMgc3VwcG9zZWQgdG8gbG9jayB0aGUg aGlzdG9yeSBmb3IgdGhpcyBsb2FkLCB0aGVuIHRoZSBuZXcgcHJvY2VzcyBuZWVkcyB0byBrbm93 IGFib3V0IHRoZSBjdXJyZW50IGhpc3RvcnkgaXRlbSBzbyBpdCBjYW4gdXBkYXRlCiAgICAgICAg IC8vIGl0IGluc3RlYWQgb2YgY3JlYXRpbmcgYSBuZXcgb25lLgotICAgICAgICBtX3Byb2Nlc3Mt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldEN1cnJlbnRIaXN0b3J5SXRlbUZvclJlYXR0YWNo KG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50SXRlbSgpLT5pdGVtU3RhdGUoKSksIG1fcGFnZUlE KTsKKyAgICAgICAgbmV3UHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0Q3VycmVu dEhpc3RvcnlJdGVtRm9yUmVhdHRhY2gobV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkt Pml0ZW1TdGF0ZSgpKSwgbV9wYWdlSUQpOwogICAgIH0KIAogICAgIC8vIEZJWE1FOiBXb3JrIG91 dCB0aW1pbmcgb2YgcmVzcG9uZGluZyB3aXRoIHRoZSBsYXN0IHBvbGljeSBkZWxlZ2F0ZSwgZXRj CiAgICAgQVNTRVJUKCFuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCkuaXNFbXB0eSgpKTsKICAg ICBpZiAoYXV0byYgc3Vic3RpdHV0ZURhdGEgPSBuYXZpZ2F0aW9uLnN1YnN0aXR1dGVEYXRhKCkp Ci0gICAgICAgIGxvYWREYXRhV2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgeyBzdWJzdGl0dXRl RGF0YS0+Y29udGVudC5kYXRhKCksIHN1YnN0aXR1dGVEYXRhLT5jb250ZW50LnNpemUoKSB9LCBz dWJzdGl0dXRlRGF0YS0+TUlNRVR5cGUsIHN1YnN0aXR1dGVEYXRhLT5lbmNvZGluZywgc3Vic3Rp dHV0ZURhdGEtPmJhc2VVUkwsIHN1YnN0aXR1dGVEYXRhLT51c2VyRGF0YS5nZXQoKSwgU2hvdWxk VHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Cisg ICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5sb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRp b24sIHsgc3Vic3RpdHV0ZURhdGEtPmNvbnRlbnQuZGF0YSgpLCBzdWJzdGl0dXRlRGF0YS0+Y29u dGVudC5zaXplKCkgfSwgc3Vic3RpdHV0ZURhdGEtPk1JTUVUeXBlLCBzdWJzdGl0dXRlRGF0YS0+ ZW5jb2RpbmcsIHN1YnN0aXR1dGVEYXRhLT5iYXNlVVJMLCBzdWJzdGl0dXRlRGF0YS0+dXNlckRh dGEuZ2V0KCksIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiAgICAgZWxzZQotICAgICAgICBs b2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIFJlc291cmNlUmVxdWVzdCB7IG5h dmlnYXRpb24uY3VycmVudFJlcXVlc3QoKSB9LCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxV UkxzUG9saWN5OjpTaG91bGRBbGxvd0V4dGVybmFsU2NoZW1lcywgbnVsbHB0ciwgU2hvdWxkVHJl YXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Ci0KLSAg ICBBU1NFUlQoIW1fbWFpbkZyYW1lKTsKLSAgICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlciA9 IFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKSwgbmF2aWdhdGlvbklEID0gbmF2 aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgcmVxdWVzdCA9ICBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1 ZXN0KCksIG1haW5GcmFtZVVSTCwgaXNTZXJ2ZXJSZWRpcmVjdCA9IG5hdmlnYXRpb24uY3VycmVu dFJlcXVlc3RJc1JlZGlyZWN0KCldKCkgbXV0YWJsZSB7Ci0gICAgICAgIGlmICghd2Vha1RoaXMp Ci0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKLSAg ICAgICAgLy8gVGhpcyBuYXZpZ2F0aW9uIHdhcyBkZXN0cm95ZWQgc28gbm8gbmVlZCB0byBub3Rp Znkgb2YgcmVkaXJlY3QuCi0gICAgICAgIGlmICghbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlv bihuYXZpZ2F0aW9uSUQpKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIC8vIFJlc3Rv cmUgdGhlIG1haW4gZnJhbWUncyBjb21taXR0ZWQgVVJMIGFzIHNvbWUgY2xpZW50cyBtYXkgcmVs eSBvbiBpdCB1bnRpbCB0aGUgbmV4dCBsb2FkIGlzIGNvbW1pdHRlZC4KLSAgICAgICAgbV9tYWlu RnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkuc2V0VVJMKG1haW5GcmFtZVVSTCk7Ci0KLSAgICAgICAg Ly8gTm9ybWFsbHksIG5vdGlmaWNhdGlvbiBvZiBhIHNlcnZlciByZWRpcmVjdCBjb21lcyBmcm9t IHRoZSBXZWJDb250ZW50IHByb2Nlc3MuCi0gICAgICAgIC8vIElmIHdlIGFyZSBwcm9jZXNzIHN3 YXBwaW5nIGluIHJlc3BvbnNlIHRvIGEgc2VydmVyIHJlZGlyZWN0IHRoZW4gdGhhdCBub3RpZmlj YXRpb24gd2lsbCBub3QgY29tZSBmcm9tIHRoZSBuZXcgV2ViQ29udGVudCBwcm9jZXNzLgotICAg ICAgICAvLyBJbiB0aGlzIGNhc2Ugd2UgaGF2ZSB0aGUgVUlQcm9jZXNzIHN5bnRoZXNpemUgdGhl IHJlZGlyZWN0IG5vdGlmaWNhdGlvbiBhdCB0aGUgYXBwcm9wcmlhdGUgdGltZS4KLSAgICAgICAg aWYgKGlzU2VydmVyUmVkaXJlY3QpIHsKLSAgICAgICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxv YWRTdGF0ZSgpLmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKHJlcXVlc3QudXJsKCkpOwotICAgICAg ICAgICAgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUo bV9tYWluRnJhbWUtPmZyYW1lSUQoKSwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKHJlcXVlc3QpLCB7 IH0pOwotICAgICAgICB9Ci0gICAgfTsKLQotICAgIGlmICghbV9wcm9jZXNzLT5wcm9jZXNzUG9v bCgpLmNvbmZpZ3VyYXRpb24oKS5wcm9jZXNzU3dhcHNPbldpbmRvd09wZW5XaXRoT3BlbmVyKCkg fHwgIWlzUGFnZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgfHwgIW1h aW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MpIHsKLSAgICAgICAgLy8gVGhlcmUgaXMgbm8gd2F5 IHdlJ2xsIGJlIGFibGUgdG8gcmV0dXJuIHRvIHRoZSBwYWdlIGluIHRoZSBwcmV2aW91cyBwYWdl IHNvIGNsb3NlIGl0LgotICAgICAgICBpZiAoIWRpZFN1c3BlbmRQcmV2aW91c1BhZ2UpCi0gICAg ICAgICAgICBwcmV2aW91c1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNsb3NlKCks IG1fcGFnZUlEKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIG1fbWFpbkZyYW1lV2lu ZG93Q3JlYXRpb25IYW5kbGVyID0gW3RoaXMsIHByZXZpb3VzUHJvY2VzcyA9IFdURk1vdmUocHJl dmlvdXNQcm9jZXNzKSwgbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcyA9ICptYWluRnJhbWVJ REluUHJldmlvdXNQcm9jZXNzXShjb25zdCBHbG9iYWxXaW5kb3dJZGVudGlmaWVyJiB3aW5kb3dJ ZGVudGlmaWVyKSB7Ci0gICAgICAgIEFTU0VSVChtX21haW5GcmFtZSk7Ci0gICAgICAgIEdsb2Jh bEZyYW1lSWRlbnRpZmllciBuYXZpZ2F0ZWRGcmFtZUlkZW50aWZpZXJJbk5ld1Byb2Nlc3MgeyBw YWdlSUQoKSwgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSB9OwotICAgICAgICBwcmV2aW91c1Byb2Nl c3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkZyYW1lQmVjYW1lUmVtb3RlKG1haW5GcmFtZUlE SW5QcmV2aW91c1Byb2Nlc3MsIG5hdmlnYXRlZEZyYW1lSWRlbnRpZmllckluTmV3UHJvY2Vzcywg d2luZG93SWRlbnRpZmllciksIHBhZ2VJRCgpKTsKLSAgICB9OworICAgICAgICBtX3Byb3Zpc2lv bmFsUGFnZS0+bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCBSZXNvdXJjZVJl cXVlc3QgeyBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCkgfSwgV2ViQ29yZTo6U2hvdWxkT3Bl bkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkQWxsb3dFeHRlcm5hbFNjaGVtZXMsIG51bGxwdHIs IFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiB9CiAKIGJvb2wgV2ViUGFnZVByb3h5Ojppc1Bh Z2VPcGVuZWRCeURPTVNob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpIGNvbnN0CkBAIC0zNjkz LDExICszNjQzLDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZU1haW5GcmFtZSh1aW50 NjRfdCBmcmFtZUlEKQogCiAgICAgLy8gQWRkIHRoZSBmcmFtZSB0byB0aGUgcHJvY2VzcyB3aWRl IG1hcC4KICAgICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChmcmFtZUlELCAqbV9tYWluRnJhbWUp OwotCi0gICAgaWYgKG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyKSB7Ci0gICAgICAgIG1fbWFp bkZyYW1lQ3JlYXRpb25IYW5kbGVyKCk7Ci0gICAgICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5k bGVyID0gbnVsbHB0cjsKLSAgICB9CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVT dWJmcmFtZSh1aW50NjRfdCBmcmFtZUlEKQpAQCAtMzcyMiwxMCArMzY2Nyw2IEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpkaWRDcmVhdGVTdWJmcmFtZSh1aW50NjRfdCBmcmFtZUlEKQogCiB2b2lkIFdl YlBhZ2VQcm94eTo6ZGlkQ3JlYXRlV2luZG93KHVpbnQ2NF90IGZyYW1lSUQsIEdsb2JhbFdpbmRv d0lkZW50aWZpZXImJiB3aW5kb3dJZGVudGlmaWVyKQogewotICAgIGlmIChtX21haW5GcmFtZSAm JiBtX21haW5GcmFtZS0+ZnJhbWVJRCgpID09IGZyYW1lSUQpIHsKLSAgICAgICAgaWYgKGF1dG8g bWFpbkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyID0gV1RGTW92ZShtX21haW5GcmFtZVdpbmRv d0NyZWF0aW9uSGFuZGxlcikpCi0gICAgICAgICAgICBtYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhh bmRsZXIod2luZG93SWRlbnRpZmllcik7Ci0gICAgfQogfQogCiBkb3VibGUgV2ViUGFnZVByb3h5 Ojplc3RpbWF0ZWRQcm9ncmVzcygpIGNvbnN0CkBAIC0zNzc4LDYgKzM3MTksMTAgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmRpZERlc3Ryb3lOYXZpZ2F0aW9uKHVpbnQ2NF90IG5hdmlnYXRpb25JRCkK IHsKICAgICBQYWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCisg ICAgLy8gT24gcHJvY2Vzcy1zd2FwLCB0aGUgcHJldmlvdXMgcHJvY2VzcyB0cmllcyB0byBkZXN0 cm95IHRoZSBuYXZpZ2F0aW9uIGJ1dCB0aGUgcHJvdmlzaW9uYWwgcHJvY2VzcyBpcyBhY3R1YWxs eSB0YWtpbmcgb3ZlciB0aGUgbmF2aWdhdGlvbi4KKyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2Ug JiYgbV9wcm92aXNpb25hbFBhZ2UtPm5hdmlnYXRpb25JRCgpID09IG5hdmlnYXRpb25JRCkKKyAg ICAgICAgcmV0dXJuOworCiAgICAgLy8gRklYTUU6IE1lc3NhZ2UgY2hlY2sgdGhlIG5hdmlnYXRp b25JRC4KICAgICBtX25hdmlnYXRpb25TdGF0ZS0+ZGlkRGVzdHJveU5hdmlnYXRpb24obmF2aWdh dGlvbklEKTsKIH0KQEAgLTM3OTUsMTQgKzM3NDAsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlk U3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBu YQogICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSAmJiBuYXZpZ2F0aW9uSUQpCiAgICAgICAg IG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCk7 CiAKLSAgICAvLyBJZiB0aGlzIHNlZW1pbmdseSBuZXcgbG9hZCBpcyBhY3R1YWxseSBjb250aW51 aW5nIGEgc2VydmVyIHJlZGlyZWN0IGZvciBhIHByZXZpb3VzIG5hdmlnYXRpb24gaW4gYSBuZXcg cHJvY2VzcywKLSAgICAvLyB0aGVuIHdlIGlnbm9yZSB0aGlzIG5vdGlmaWNhdGlvbi4KLSAgICBp ZiAobmF2aWdhdGlvbiAmJiBuYXZpZ2F0aW9uLT5jdXJyZW50UmVxdWVzdElzUmVkaXJlY3QoKSkg ewotICAgICAgICBhdXRvIG5hdmlnYXRpb25Qcm9jZXNzSWRlbnRpZmllciA9IG5hdmlnYXRpb24t PmN1cnJlbnRSZXF1ZXN0UHJvY2Vzc0lkZW50aWZpZXIoKTsKLSAgICAgICAgaWYgKG5hdmlnYXRp b25Qcm9jZXNzSWRlbnRpZmllciAmJiAqbmF2aWdhdGlvblByb2Nlc3NJZGVudGlmaWVyICE9IG1f cHJvY2Vzcy0+Y29yZVByb2Nlc3NJZGVudGlmaWVyKCkpCi0gICAgICAgICAgICByZXR1cm47Ci0g ICAgfQotCiAgICAgTE9HKExvYWRpbmcsICJXZWJQYWdlUHJveHkgJSIgUFJJdTY0ICIgaW4gcHJv Y2VzcyBwaWQgJWkgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSB0byBmcmFtZUlEICUi IFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgJSIgUFJJdTY0ICIsIHVybCAlcyIsIG1fcGFnZUlELCBt X3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgdXJs LnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9h ZGluZywgImRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6IHdlYlBJRCA9ICVpLCBwYWdl SUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNz SWRlbnRpZmllcigpLCBtX3BhZ2VJRCwgZnJhbWVJRCk7CiAKQEAgLTM5MTAsNiArMzg0NywxMSBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2 NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaQogCiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90 ZWN0b3IocGFnZUNsaWVudCgpKTsKIAorICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZSAmJiBtX3By b3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkgPT0gbmF2aWdhdGlvbklEICYmICZtX3Byb3Zp c2lvbmFsUGFnZS0+cHJvY2VzcygpICE9IG1fcHJvY2Vzcy5wdHIoKSkgeworICAgICAgICAvLyBU aGUgbG9hZCBkaWQgbm90IGZhaWwsIGl0IG1lcmVseSBoYXBwZW5pbmcgaW4gYSBuZXcgcHJvdmlz aW9uYWwgcHJvY2Vzcy4KKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIFdlYkZyYW1lUHJv eHkqIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKICAgICBNRVNTQUdFX0NI RUNLKGZyYW1lKTsKIApAQCAtMzk0OCw2ICszODkwLDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpk aWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2Vj dXJpCiAgICAgfQogCiAgICAgbV9mYWlsaW5nUHJvdmlzaW9uYWxMb2FkVVJMID0geyB9OworCisg ICAgLy8gSWYgdGhlIHByb3Zpc2lvbmFsIHBhZ2UncyBsb2FkIGZhaWxzIHRoZW4gd2UgZGVzdHJv eSB0aGUgcHJvdmlzaW9uYWwgcGFnZS4KKyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UgJiYgbV9w cm92aXNpb25hbFBhZ2UtPm1haW5GcmFtZSgpID09IGZyYW1lKQorICAgICAgICBtX3Byb3Zpc2lv bmFsUGFnZSA9IG51bGxwdHI7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpjbGVhckxvYWREZXBl bmRlbnRDYWxsYmFja3MoKQpAQCAtNDMzOSw4ICs0Mjg1LDggQEAgdm9pZCBXZWJQYWdlUHJveHk6 OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYyh1aW50NjRfdCBmcmFtZUlELCBX ZWJDb3IKICAgICBhdXRvKiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7CiAg ICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CiAKLSAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u QWN0aW9uKCpmcmFtZSwgV1RGTW92ZShmcmFtZVNlY3VyaXR5T3JpZ2luKSwgbmF2aWdhdGlvbklE LCBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb25EYXRhKSwgV1RGTW92ZShmcmFtZUluZm9EYXRhKSwg b3JpZ2luYXRpbmdQYWdlSUQsIG9yaWdpbmFsUmVxdWVzdCwgV1RGTW92ZShyZXF1ZXN0KSwgV1RG TW92ZShyZXF1ZXN0Qm9keSksIFdURk1vdmUocmVkaXJlY3RSZXNwb25zZSksIHVzZXJEYXRhLCBQ b2xpY3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJl ZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySURdIChhdXRvLi4uIGFyZ3MpIHsKLSAgICAgICAg bV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRSZWNlaXZlUG9saWN5RGVjaXNp b24oZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJncy4uLiksIG1fcGFnZUlEKTsKKyAgICBkZWNpZGVQ b2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKCpmcmFtZSwgV1RGTW92ZShmcmFtZVNlY3VyaXR5T3Jp Z2luKSwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb25EYXRhKSwgV1RGTW92 ZShmcmFtZUluZm9EYXRhKSwgb3JpZ2luYXRpbmdQYWdlSUQsIG9yaWdpbmFsUmVxdWVzdCwgV1RG TW92ZShyZXF1ZXN0KSwgV1RGTW92ZShyZXF1ZXN0Qm9keSksIFdURk1vdmUocmVkaXJlY3RSZXNw b25zZSksIHVzZXJEYXRhLCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90 ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIHByb2Nlc3Mg PSBtX3Byb2Nlc3MuY29weVJlZigpXSAoYXV0by4uLiBhcmdzKSB7CisgICAgICAgIHByb2Nlc3Mt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihmcmFtZUlE LCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQpOwogICAgIH0pKTsKIH0KIApAQCAtNDU3 NCwxMiArNDUyMCwxMiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yUmVzcG9u c2UodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2VjdXJpdHlPcmlnaQogICAgIE1FU1NBR0VfQ0hF Q0tfVVJMKHJlc3BvbnNlLnVybCgpKTsKIAogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IG5h dmlnYXRpb24gPSBuYXZpZ2F0aW9uSUQgPyBtX25hdmlnYXRpb25TdGF0ZS0+bmF2aWdhdGlvbihu YXZpZ2F0aW9uSUQpIDogbnVsbHB0cjsKLSAgICBhdXRvIGxpc3RlbmVyID0gbWFrZVJlZihmcmFt ZS0+c2V0VXBQb2xpY3lMaXN0ZW5lclByb3h5KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJl ZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIG5hdmlnYXRpb24gPSBXVEZNb3ZlKG5hdmln YXRpb24pXSAoV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbiwgQVBJOjpXZWJzaXRlUG9saWNp ZXMqLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlD bGllbnQsIFJlZlB0cjxTYWZlQnJvd3NpbmdXYXJuaW5nPiYmIHNhZmVCcm93c2luZ1dhcm5pbmcp IG11dGFibGUgeworICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtlUmVmKGZyYW1lLT5zZXRVcFBvbGlj eUxpc3RlbmVyUHJveHkoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZnJh bWVJRCwgbGlzdGVuZXJJRCwgbmF2aWdhdGlvbiA9IFdURk1vdmUobmF2aWdhdGlvbiksIHByb2Nl c3MgPSBtX3Byb2Nlc3MuY29weVJlZigpXSAoV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbiwg QVBJOjpXZWJzaXRlUG9saWNpZXMqLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFJlZlB0cjxTYWZlQnJvd3NpbmdXYXJuaW5nPiYmIHNh ZmVCcm93c2luZ1dhcm5pbmcpIG11dGFibGUgewogICAgICAgICAvLyBGSVhNRTogQXNzZXJ0IHRo ZSBBUEk6OldlYnNpdGVQb2xpY2llcyogaXMgbnVsbHB0ciBoZXJlIG9uY2UgY2xpZW50cyBvZiBX S0ZyYW1lUG9saWN5TGlzdGVuZXJVc2VXaXRoUG9saWNpZXMgZ28gYXdheS4KICAgICAgICAgUkVM RUFTRV9BU1NFUlQocHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCA9PSBQcm9jZXNzU3dhcFJl cXVlc3RlZEJ5Q2xpZW50OjpObyk7CiAgICAgICAgIEFTU0VSVF9VTlVTRUQoc2FmZUJyb3dzaW5n V2FybmluZywgIXNhZmVCcm93c2luZ1dhcm5pbmcpOwotICAgICAgICByZWNlaXZlZFBvbGljeURl Y2lzaW9uKHBvbGljeUFjdGlvbiwgbmF2aWdhdGlvbi5nZXQoKSwgV1RGOjpudWxsb3B0LCBQb2xp Y3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShw cm90ZWN0ZWRUaGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRF0gKGF1dG8uLi4gYXJncykgewotICAg ICAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRSZWNlaXZlUG9s aWN5RGVjaXNpb24oZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJncy4uLiksIG1fcGFnZUlEKTsKKyAg ICAgICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24sIG5hdmlnYXRpb24uZ2V0 KCksIFdURjo6bnVsbG9wdCwgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShbdGhpcywgcHJv dGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQs IHByb2Nlc3MgPSBXVEZNb3ZlKHByb2Nlc3MpXSAoYXV0by4uLiBhcmdzKSB7CisgICAgICAgICAg ICBwcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRSZWNlaXZlUG9saWN5RGVjaXNp b24oZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJncy4uLiksIG1fcGFnZUlEKTsKICAgICAgICAgfSkp OwogICAgIH0sIFNob3VsZEV4cGVjdFNhZmVCcm93c2luZ1Jlc3VsdDo6Tm8pKTsKIApAQCAtNjQ4 Niw4ICs2NDMyLDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnByb2Nlc3NXaWxsQmVjb21lRm9yZWdy b3VuZCgpCiB2b2lkIFdlYlBhZ2VQcm94eTo6cmVzZXRTdGF0ZShSZXNldFN0YXRlUmVhc29uIHJl c2V0U3RhdGVSZWFzb24pCiB7CiAgICAgbV9tYWluRnJhbWUgPSBudWxscHRyOwotICAgIG1fbWFp bkZyYW1lQ3JlYXRpb25IYW5kbGVyID0gbnVsbHB0cjsKLSAgICBtX21haW5GcmFtZVdpbmRvd0Ny ZWF0aW9uSGFuZGxlciA9IG51bGxwdHI7CiAKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBtX3Nj cm9sbGluZ1BlcmZvcm1hbmNlRGF0YSA9IG51bGxwdHI7CkBAIC02Nzc4LDYgKzY3MjIsMTAgQEAg V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyBXZWJQYWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVy cygpCiAgICAgcGFyYW1ldGVycy5hcHBsaWNhdGlvbk1hbmlmZXN0ID0gbV9jb25maWd1cmF0aW9u LT5hcHBsaWNhdGlvbk1hbmlmZXN0KCkgPyBPcHRpb25hbDxXZWJDb3JlOjpBcHBsaWNhdGlvbk1h bmlmZXN0PihtX2NvbmZpZ3VyYXRpb24tPmFwcGxpY2F0aW9uTWFuaWZlc3QoKS0+YXBwbGljYXRp b25NYW5pZmVzdCgpKSA6IFdURjo6bnVsbG9wdDsKICNlbmRpZgogCisjaWYgRU5BQkxFKFNFUlZJ Q0VfV09SS0VSKQorICAgIHBhcmFtZXRlcnMuaGFzUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXJzID0g cHJvY2VzcygpLnByb2Nlc3NQb29sKCkubWF5SGF2ZVJlZ2lzdGVyZWRTZXJ2aWNlV29ya2Vycyht X3dlYnNpdGVEYXRhU3RvcmUpOworI2VuZGlmCisKICAgICBwYXJhbWV0ZXJzLm5lZWRzRm9udEF0 dHJpYnV0ZXMgPSBtX25lZWRzRm9udEF0dHJpYnV0ZXM7CiAKICAgICBtX3Byb2Nlc3MtPmFkZFdl YlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5KG1fdXNlckNvbnRlbnRDb250cm9sbGVyLCBwYXJh bWV0ZXJzKTsKQEAgLTg1MzksNiArODQ4NywyMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2ltdWxh dGVEZXZpY2VPcmllbnRhdGlvbkNoYW5nZShkb3VibGUgYWxwaGEsIGRvdWJsZSBiZXRhLCBkbwog ICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2ltdWxhdGVEZXZpY2VPcmll bnRhdGlvbkNoYW5nZShhbHBoYSwgYmV0YSwgZ2FtbWEpLCBtX3BhZ2VJRCk7CiB9CiAKK1dlYlBh Z2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6UGFnZVByb2Nlc3NPdmVycmlkZShXZWJQYWdl UHJveHkmIHBhZ2UsIFdlYlByb2Nlc3NQcm94eSYgbmV3UHJvY2VzcykKKyAgICA6IG1fcGFnZSgm cGFnZSkKKyAgICAsIG1fcHJldmlvdXNQcm9jZXNzKHBhZ2UucHJvY2VzcygpKQoreworICAgIHBh Z2UubV9wcm9jZXNzID0gbmV3UHJvY2VzczsKK30KKworV2ViUGFnZVByb3h5OjpQYWdlUHJvY2Vz c092ZXJyaWRlOjpQYWdlUHJvY2Vzc092ZXJyaWRlKFBhZ2VQcm9jZXNzT3ZlcnJpZGUmJikgPSBk ZWZhdWx0OworCitXZWJQYWdlUHJveHk6OlBhZ2VQcm9jZXNzT3ZlcnJpZGU6On5QYWdlUHJvY2Vz c092ZXJyaWRlKCkKK3sKKyAgICBpZiAobV9wYWdlKQorICAgICAgICBtX3BhZ2UtPm1fcHJvY2Vz cyA9IFdURk1vdmUobV9wcmV2aW91c1Byb2Nlc3MpOworfQorCiAjaWYgRU5BQkxFKERBVEFfREVU RUNUSU9OKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGV0ZWN0RGF0YUluQWxsRnJhbWVzKFdlYkNv cmU6OkRhdGFEZXRlY3RvclR5cGVzIHR5cGVzLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0 IERhdGFEZXRlY3Rpb25SZXN1bHQmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggY2Q4MDFiODA4YzQuLmM2NjZmZGI2ZmIwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMjI1LDYgKzIyNSw3IEBA IGNsYXNzIE5hdGl2ZVdlYktleWJvYXJkRXZlbnQ7CiBjbGFzcyBOYXRpdmVXZWJNb3VzZUV2ZW50 OwogY2xhc3MgTmF0aXZlV2ViV2hlZWxFdmVudDsKIGNsYXNzIFBhZ2VDbGllbnQ7CitjbGFzcyBQ cm92aXNpb25hbFBhZ2VQcm94eTsKIGNsYXNzIFJlbW90ZUxheWVyVHJlZUhvc3Q7CiBjbGFzcyBS ZW1vdGVMYXllclRyZWVTY3JvbGxpbmdQZXJmb3JtYW5jZURhdGE7CiBjbGFzcyBSZW1vdGVMYXll clRyZWVUcmFuc2FjdGlvbjsKQEAgLTQ1OCw4ICs0NTksNyBAQCBwdWJsaWM6CiAgICAgQVBJOjpJ Y29uTG9hZGluZ0NsaWVudCYgaWNvbkxvYWRpbmdDbGllbnQoKSB7IHJldHVybiAqbV9pY29uTG9h ZGluZ0NsaWVudDsgfQogICAgIHZvaWQgc2V0SWNvbkxvYWRpbmdDbGllbnQoc3RkOjp1bmlxdWVf cHRyPEFQSTo6SWNvbkxvYWRpbmdDbGllbnQ+JiYpOwogCi0gICAgZW51bSBjbGFzcyBJc1N3YXBG cm9tU3VzcGVuZGVkIHsgTm8sIFllcyB9OwotICAgIHZvaWQgaW5pdGlhbGl6ZVdlYlBhZ2UoSXNT d2FwRnJvbVN1c3BlbmRlZCA9IElzU3dhcEZyb21TdXNwZW5kZWQ6Ok5vKTsKKyAgICB2b2lkIGlu aXRpYWxpemVXZWJQYWdlKCk7CiAKICAgICBXZWFrUHRyPFNlY0tleVByb3h5U3RvcmU+IHNlY0tl eVByb3h5U3RvcmUoY29uc3QgV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2UmKTsKICAg ICAgICAgCkBAIC0xMDI1LDYgKzEwMjUsMTkgQEAgcHVibGljOgogICAgIFdlYlByb2Nlc3NQcm94 eSYgcHJvY2VzcygpIHsgcmV0dXJuIG1fcHJvY2VzczsgfQogICAgIFByb2Nlc3NJRCBwcm9jZXNz SWRlbnRpZmllcigpIGNvbnN0OwogCisgICAgY2xhc3MgUGFnZVByb2Nlc3NPdmVycmlkZSB7Cisg ICAgcHVibGljOgorICAgICAgICBQYWdlUHJvY2Vzc092ZXJyaWRlKFdlYlBhZ2VQcm94eSYsIFdl YlByb2Nlc3NQcm94eSYgbmV3UHJvY2Vzcyk7CisgICAgICAgIFBhZ2VQcm9jZXNzT3ZlcnJpZGUo UGFnZVByb2Nlc3NPdmVycmlkZSYmKTsKKyAgICAgICAgflBhZ2VQcm9jZXNzT3ZlcnJpZGUoKTsK KworICAgIHByaXZhdGU6CisgICAgICAgIFJlZlB0cjxXZWJQYWdlUHJveHk+IG1fcGFnZTsKKyAg ICAgICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gbV9wcmV2aW91c1Byb2Nlc3M7CisgICAgfTsKKwor ICAgIFBhZ2VQcm9jZXNzT3ZlcnJpZGUgdGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MoV2ViUHJv Y2Vzc1Byb3h5JiBuZXdQcm9jZXNzKSB7IHJldHVybiBQYWdlUHJvY2Vzc092ZXJyaWRlKCp0aGlz LCBuZXdQcm9jZXNzKTsgfQorCiAgICAgV2ViUHJlZmVyZW5jZXMmIHByZWZlcmVuY2VzKCkgeyBy ZXR1cm4gbV9wcmVmZXJlbmNlczsgfQogICAgIHZvaWQgc2V0UHJlZmVyZW5jZXMoV2ViUHJlZmVy ZW5jZXMmKTsKIApAQCAtMTQxNCw2ICsxNDI3LDIxIEBAIHB1YmxpYzoKICAgICBFZGl0YWJsZUlt YWdlQ29udHJvbGxlciYgZWRpdGFibGVJbWFnZUNvbnRyb2xsZXIoKSB7IHJldHVybiAqbV9lZGl0 YWJsZUltYWdlQ29udHJvbGxlcjsgfQogI2VuZGlmCiAKKyAgICBQcm92aXNpb25hbFBhZ2VQcm94 eSogcHJvdmlzaW9uYWxQYWdlUHJveHkoKSBjb25zdCB7IHJldHVybiBtX3Byb3Zpc2lvbmFsUGFn ZS5nZXQoKTsgfQorICAgIHZvaWQgY29tbWl0UHJvdmlzaW9uYWxQYWdlKHVpbnQ2NF90IGZyYW1l SUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBm cmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29u c3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiwgYm9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50 LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJl Q29udGVudCwgY29uc3QgVXNlckRhdGEmKTsKKworICAgIHZvaWQgZGlkU3RhcnRQcm92aXNpb25h bExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVS TCYmLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2b2lkIGRp ZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJD b3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5h dmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6 UmVzb3VyY2VFcnJvciYsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRSZWNlaXZlU2Vy dmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1 aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBjb25zdCBV c2VyRGF0YSYpOworCisgICAgdm9pZCBsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdh dGlvbiYsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUs IGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpPYmpl Y3QqIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIE9wdGlv bmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOworICAgIHZvaWQgbG9h ZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBXZWJDb3JlOjpSZXNvdXJj ZVJlcXVlc3QmJiwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgQVBJOjpP YmplY3QqIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIE9w dGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOworCisgICAgLy8g SVBDOjpNZXNzYWdlUmVjZWl2ZXIKKyAgICAvLyBJbXBsZW1lbnRlZCBpbiBnZW5lcmF0ZWQgV2Vi UGFnZVByb3h5TWVzc2FnZVJlY2VpdmVyLmNwcAorICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2Uo SVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgb3ZlcnJpZGU7CisgICAgdm9pZCBkaWRS ZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJiwgc3RkOjp1 bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mKSBvdmVycmlkZTsKKwogcHJpdmF0ZToKICAgICBXZWJQ YWdlUHJveHkoUGFnZUNsaWVudCYsIFdlYlByb2Nlc3NQcm94eSYsIHVpbnQ2NF90IHBhZ2VJRCwg UmVmPEFQSTo6UGFnZUNvbmZpZ3VyYXRpb24+JiYpOwogICAgIHZvaWQgcGxhdGZvcm1Jbml0aWFs aXplKCk7CkBAIC0xNDM4LDEyICsxNDY2LDYgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgc2V0VXNl ckFnZW50KFN0cmluZyYmKTsKIAotICAgIC8vIElQQzo6TWVzc2FnZVJlY2VpdmVyCi0gICAgLy8g SW1wbGVtZW50ZWQgaW4gZ2VuZXJhdGVkIFdlYlBhZ2VQcm94eU1lc3NhZ2VSZWNlaXZlci5jcHAK LSAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2Rl ciYpIG92ZXJyaWRlOwotICAgIHZvaWQgZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVj dGlvbiYsIElQQzo6RGVjb2RlciYsIHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+Jikgb3Zl cnJpZGU7Ci0KLQogICAgIC8vIElQQzo6TWVzc2FnZVNlbmRlcgogICAgIGJvb2wgc2VuZE1lc3Nh Z2Uoc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4sIE9wdGlvblNldDxJUEM6OlNlbmRPcHRp b24+KSBvdmVycmlkZTsKICAgICBJUEM6OkNvbm5lY3Rpb24qIG1lc3NhZ2VTZW5kZXJDb25uZWN0 aW9uKCkgb3ZlcnJpZGU7CkBAIC0xNDY1LDEyICsxNDg3LDkgQEAgcHJpdmF0ZToKICAgICB2b2lk IGRpZENyZWF0ZVN1YmZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpOwogICAgIHZvaWQgZGlkQ3JlYXRl V2luZG93KHVpbnQ2NF90IGZyYW1lSUQsIFdlYkNvcmU6Okdsb2JhbFdpbmRvd0lkZW50aWZpZXIm Jik7CiAKLSAgICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3Qg ZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiwgVVJMJiYgdW5yZWFjaGFibGVV UkwsIGNvbnN0IFVzZXJEYXRhJik7Ci0gICAgdm9pZCBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RG b3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZp Z2F0aW9uSUQsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBjb25zdCBVc2VyRGF0YSYpOwog ICAgIHZvaWQgd2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdEZvckZyYW1lKHVpbnQ2NF90IGZyYW1l SUQsIGNvbnN0IFN0cmluZyYgdXJsLCBkb3VibGUgZGVsYXksIFdlYkNvcmU6OkxvY2tCYWNrRm9y d2FyZExpc3QpOwogICAgIHZvaWQgZGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3RGb3JGcmFtZSh1aW50 NjRfdCBmcmFtZUlEKTsKICAgICB2b2lkIGRpZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWUo dWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJik7Ci0gICAgdm9p ZCBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3Qg V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRf dCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNv cmU6OlJlc291cmNlRXJyb3ImLCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkQ29tbWl0 TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29u c3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwg dWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiwg Ym9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3Vy ZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmKTsKICAg ICB2b2lkIGRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVp bnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2b2lkIGRpZEZpbmlz aExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNv bnN0IFVzZXJEYXRhJik7CkBAIC0xNTc0LDE4ICsxNTkzLDE1IEBAIHByaXZhdGU6CiAgICAgdm9p ZCBzZXRDYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMoYm9vbCBjYW5TaG9ydENp cmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMpIHsgbV9jYW5TaG9ydENpcmN1aXRIb3Jpem9udGFs V2hlZWxFdmVudHMgPSBjYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHM7IH0KIAog ICAgIHZvaWQgcmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsKLSAgICB2b2lkIHN3YXBUb1dlYlByb2Nl c3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiwgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQ cm94eT4mJiwgSXNTd2FwRnJvbVN1c3BlbmRlZCk7CisgICAgdm9pZCBzd2FwVG9XZWJQcm9jZXNz KFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5 PiYmLCBSZWZQdHI8V2ViRnJhbWVQcm94eT4mJiBtYWluRnJhbWUpOwogICAgIHZvaWQgZGlkRmFp bFRvU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAoKTsKICAgICB2b2lkIGRpZFN1c3BlbmRBZnRlclBy b2Nlc3NTd2FwKCk7CiAKLSAgICB2b2lkIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhJc1N3 YXBGcm9tU3VzcGVuZGVkID0gSXNTd2FwRnJvbVN1c3BlbmRlZDo6Tm8pOworICAgIHZvaWQgZmlu aXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKCk7CiAKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9u PiByZWF0dGFjaFRvV2ViUHJvY2Vzc0ZvclJlbG9hZCgpOwogICAgIFJlZlB0cjxBUEk6Ok5hdmln YXRpb24+IHJlYXR0YWNoVG9XZWJQcm9jZXNzV2l0aEl0ZW0oV2ViQmFja0ZvcndhcmRMaXN0SXRl bSYpOwogCi0gICAgdm9pZCBsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYs IGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0 IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVz ZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIE9wdGlvbmFsPFdl YnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOwotICAgIHZvaWQgbG9hZFJlcXVl c3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QmJiwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgQVBJOjpPYmplY3Qq IHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIE9wdGlvbmFs PFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOwotCiAgICAgdm9pZCByZXF1 ZXN0Tm90aWZpY2F0aW9uUGVybWlzc2lvbih1aW50NjRfdCBub3RpZmljYXRpb25JRCwgY29uc3Qg U3RyaW5nJiBvcmlnaW5TdHJpbmcpOwogICAgIHZvaWQgc2hvd05vdGlmaWNhdGlvbihjb25zdCBT dHJpbmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIGJvZHksIGNvbnN0IFN0cmluZyYgaWNvblVSTCwg Y29uc3QgU3RyaW5nJiB0YWcsIGNvbnN0IFN0cmluZyYgbGFuZywgV2ViQ29yZTo6Tm90aWZpY2F0 aW9uRGlyZWN0aW9uLCBjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZywgdWludDY0X3Qgbm90aWZp Y2F0aW9uSUQpOwogICAgIHZvaWQgY2FuY2VsTm90aWZpY2F0aW9uKHVpbnQ2NF90IG5vdGlmaWNh dGlvbklEKTsKQEAgLTE5NTEsOCArMTk2Nyw2IEBAIHByaXZhdGU6CiAgICAgUmVmPFdlYnNpdGVE YXRhU3RvcmU+IG1fd2Vic2l0ZURhdGFTdG9yZTsKIAogICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5 PiBtX21haW5GcmFtZTsKLSAgICBGdW5jdGlvbjx2b2lkKCk+IG1fbWFpbkZyYW1lQ3JlYXRpb25I YW5kbGVyOwotICAgIEZ1bmN0aW9uPHZvaWQoY29uc3QgV2ViQ29yZTo6R2xvYmFsV2luZG93SWRl bnRpZmllciYpPiBtX21haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlcjsKIAogICAgIFJlZlB0 cjxXZWJGcmFtZVByb3h5PiBtX2ZvY3VzZWRGcmFtZTsKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94 eT4gbV9mcmFtZVNldExhcmdlc3RGcmFtZTsKQEAgLTIzMjIsNiArMjMzNiw4IEBAIHByaXZhdGU6 CiAgICAgYm9vbCBtX25lZWRzRm9udEF0dHJpYnV0ZXMgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9t YXlIYXZlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5zaW9uIHsgZmFsc2UgfTsKIAorICAg IHN0ZDo6dW5pcXVlX3B0cjxQcm92aXNpb25hbFBhZ2VQcm94eT4gbV9wcm92aXNpb25hbFBhZ2U7 CisKICNpZiBIQVZFKFBFTkNJTEtJVCkKICAgICBzdGQ6OnVuaXF1ZV9wdHI8RWRpdGFibGVJbWFn ZUNvbnRyb2xsZXI+IG1fZWRpdGFibGVJbWFnZUNvbnRyb2xsZXI7CiAjZW5kaWYKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCmluZGV4IGRiMWZkNThiOTNkLi5m N2RmYWU4NjI2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku Y3BwCkBAIC0zNCw2ICszNCw3IEBACiAjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIlBs dWdpbkluZm9TdG9yZS5oIgogI2luY2x1ZGUgIlBsdWdpblByb2Nlc3NNYW5hZ2VyLmgiCisjaW5j bHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbmNsdWRlICJUZXh0Q2hlY2tlci5oIgog I2luY2x1ZGUgIlRleHRDaGVja2VyU3RhdGUuaCIKICNpbmNsdWRlICJVSU1lc3NhZ2VQb3J0Q2hh bm5lbFByb3ZpZGVyLmgiCkBAIC00MzYsNyArNDM3LDcgQEAgUmVmPFdlYlBhZ2VQcm94eT4gV2Vi UHJvY2Vzc1Byb3h5OjpjcmVhdGVXZWJQYWdlKFBhZ2VDbGllbnQmIHBhZ2VDbGllbnQsIFJlZjxB UEkKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjphZGRFeGlzdGluZ1dlYlBhZ2UoV2ViUGFnZVByb3h5 JiB3ZWJQYWdlLCB1aW50NjRfdCBwYWdlSUQsIEJlZ2luc1VzaW5nRGF0YVN0b3JlIGJlZ2luc1Vz aW5nRGF0YVN0b3JlKQogewogICAgIEFTU0VSVCghbV9wYWdlTWFwLmNvbnRhaW5zKHBhZ2VJRCkp OwotICAgIEFTU0VSVCghZ2xvYmFsUGFnZU1hcCgpLmNvbnRhaW5zKHBhZ2VJRCkpOworICAgIEFT U0VSVCghZ2xvYmFsUGFnZU1hcCgpLmNvbnRhaW5zKHBhZ2VJRCkgfHwgZ2xvYmFsUGFnZU1hcCgp LmdldChwYWdlSUQpID09ICZ3ZWJQYWdlKTsKIAogICAgIGlmIChiZWdpbnNVc2luZ0RhdGFTdG9y ZSA9PSBCZWdpbnNVc2luZ0RhdGFTdG9yZTo6WWVzKQogICAgICAgICBtX3Byb2Nlc3NQb29sLT5w YWdlQmVnaW5Vc2luZ1dlYnNpdGVEYXRhU3RvcmUod2ViUGFnZSk7CkBAIC01ODQsNiArNTg1LDE1 IEBAIGJvb2wgV2ViUHJvY2Vzc1Byb3h5OjpmdWxsS2V5Ym9hcmRBY2Nlc3NFbmFibGVkKCkKIH0K ICNlbmRpZgogCitib29sIFdlYlByb2Nlc3NQcm94eTo6aGFzUHJvdmlzaW9uYWxQYWdlV2l0aElE KHVpbnQ2NF90IHBhZ2VJRCkgY29uc3QKK3sKKyAgICBmb3IgKGF1dG8qIHByb3Zpc2lvbmFsUGFn ZSA6IG1fcHJvdmlzaW9uYWxQYWdlcykgeworICAgICAgICBpZiAocHJvdmlzaW9uYWxQYWdlLT5w YWdlKCkucGFnZUlEKCkgPT0gcGFnZUlEKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAg fQorICAgIHJldHVybiBmYWxzZTsKK30KKwogdm9pZCBXZWJQcm9jZXNzUHJveHk6OnVwZGF0ZUJh Y2tGb3J3YXJkSXRlbShjb25zdCBCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUmIGl0ZW1TdGF0ZSkK IHsKICAgICBpZiAoYXV0byogaXRlbSA9IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW06Oml0ZW1Gb3JJ RChpdGVtU3RhdGUuaWRlbnRpZmllcikpIHsKQEAgLTU5MSw3ICs2MDEsNyBAQCB2b2lkIFdlYlBy b2Nlc3NQcm94eTo6dXBkYXRlQmFja0ZvcndhcmRJdGVtKGNvbnN0IEJhY2tGb3J3YXJkTGlzdEl0 ZW1TdGF0ZSYgaXRlbQogICAgICAgICAvLyB0aGUgYmFjay9mb3J3YXJkIGl0ZW1zIHBhZ2UuCiAg ICAgICAgIC8vIGUuZy4gVGhlIG9sZCB3ZWIgcHJvY2VzcyBpcyBuYXZpZ2F0aW5nIHRvIGFib3V0 OmJsYW5rIGZvciBzdXNwZW5zaW9uLgogICAgICAgICAvLyBXZSBpZ25vcmUgdGhlc2UgdXBkYXRl cy4KLSAgICAgICAgaWYgKG1fcGFnZU1hcC5jb250YWlucyhpdGVtLT5wYWdlSUQoKSkpCisgICAg ICAgIGlmIChtX3BhZ2VNYXAuY29udGFpbnMoaXRlbS0+cGFnZUlEKCkpIHx8IGhhc1Byb3Zpc2lv bmFsUGFnZVdpdGhJRChpdGVtLT5wYWdlSUQoKSkpCiAgICAgICAgICAgICBpdGVtLT5zZXRQYWdl U3RhdGUoaXRlbVN0YXRlLnBhZ2VTdGF0ZSk7CiAgICAgfQogfQpAQCAtODczLDcgKzg4Myw3IEBA IHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjptYXliZVNodXREb3duKCkKIAogYm9vbCBXZWJQcm9jZXNz UHJveHk6OmNhblRlcm1pbmF0ZUNoaWxkUHJvY2VzcygpCiB7Ci0gICAgaWYgKCFtX3BhZ2VNYXAu aXNFbXB0eSgpIHx8IG1fcHJvY2Vzc1Bvb2wtPmhhc1N1c3BlbmRlZFBhZ2VGb3IoKnRoaXMpKQor ICAgIGlmICghbV9wYWdlTWFwLmlzRW1wdHkoKSB8fCBtX3Byb2Nlc3NQb29sLT5oYXNTdXNwZW5k ZWRQYWdlRm9yKCp0aGlzKSB8fCAhbV9wcm92aXNpb25hbFBhZ2VzLmlzRW1wdHkoKSkKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKCFtX3Byb2Nlc3NQb29sLT5zaG91bGRUZXJtaW5h dGUodGhpcykpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNz UHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCmluZGV4 IDc1ZjY1YTdmN2ViLi41MDQyNjMwZGUzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Byb3h5LmgKQEAgLTcwLDYgKzcwLDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBjbGFz cyBOZXR3b3JrUHJvY2Vzc1Byb3h5OwogY2xhc3MgT2JqQ09iamVjdEdyYXBoOwogY2xhc3MgUGFn ZUNsaWVudDsKK2NsYXNzIFByb3Zpc2lvbmFsUGFnZVByb3h5OwogY2xhc3MgVXNlck1lZGlhQ2Fw dHVyZU1hbmFnZXJQcm94eTsKIGNsYXNzIFZpc2l0ZWRMaW5rU3RvcmU7CiBjbGFzcyBXZWJCYWNr Rm9yd2FyZExpc3RJdGVtOwpAQCAtMTI0LDYgKzEyNSw5IEBAIHB1YmxpYzoKICAgICBlbnVtIGNs YXNzIEVuZHNVc2luZ0RhdGFTdG9yZSA6IGJvb2wgeyBObywgWWVzIH07CiAgICAgdm9pZCByZW1v dmVXZWJQYWdlKFdlYlBhZ2VQcm94eSYsIHVpbnQ2NF90IHBhZ2VJRCwgRW5kc1VzaW5nRGF0YVN0 b3JlKTsKIAorICAgIHZvaWQgYWRkUHJvdmlzaW9uYWxQYWdlUHJveHkoUHJvdmlzaW9uYWxQYWdl UHJveHkmIHByb3Zpc2lvbmFsUGFnZSkgeyBBU1NFUlQoIW1fcHJvdmlzaW9uYWxQYWdlcy5jb250 YWlucygmcHJvdmlzaW9uYWxQYWdlKSk7IG1fcHJvdmlzaW9uYWxQYWdlcy5hZGQoJnByb3Zpc2lv bmFsUGFnZSk7IH0KKyAgICB2b2lkIHJlbW92ZVByb3Zpc2lvbmFsUGFnZVByb3h5KFByb3Zpc2lv bmFsUGFnZVByb3h5JiBwcm92aXNpb25hbFBhZ2UpIHsgQVNTRVJUKG1fcHJvdmlzaW9uYWxQYWdl cy5jb250YWlucygmcHJvdmlzaW9uYWxQYWdlKSk7IG1fcHJvdmlzaW9uYWxQYWdlcy5yZW1vdmUo JnByb3Zpc2lvbmFsUGFnZSk7IH0KKwogICAgIHR5cGVuYW1lIFdlYlBhZ2VQcm94eU1hcDo6VmFs dWVzQ29uc3RJdGVyYXRvclJhbmdlIHBhZ2VzKCkgY29uc3QgeyByZXR1cm4gbV9wYWdlTWFwLnZh bHVlcygpOyB9CiAgICAgdW5zaWduZWQgcGFnZUNvdW50KCkgY29uc3QgeyByZXR1cm4gbV9wYWdl TWFwLnNpemUoKTsgfQogICAgIHVuc2lnbmVkIHZpc2libGVQYWdlQ291bnQoKSBjb25zdCB7IHJl dHVybiBtX3Zpc2libGVQYWdlQ291bnRlci52YWx1ZSgpOyB9CkBAIC0zMzAsNiArMzM0LDggQEAg cHJpdmF0ZToKIAogICAgIHZvaWQgbG9nRGlhZ25vc3RpY01lc3NhZ2VGb3JSZXNvdXJjZUxpbWl0 VGVybWluYXRpb24oY29uc3QgU3RyaW5nJiBsaW1pdEtleSk7CiAKKyAgICBib29sIGhhc1Byb3Zp c2lvbmFsUGFnZVdpdGhJRCh1aW50NjRfdCBwYWdlSUQpIGNvbnN0OworCiAgICAgZW51bSBjbGFz cyBJc1dlYWsgeyBObywgWWVzIH07CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gY2xhc3MgV2Vh a09yU3Ryb25nUHRyIHsKICAgICBwdWJsaWM6CkBAIC0zNzMsNiArMzc5LDcgQEAgcHJpdmF0ZToK IAogICAgIFdlYlBhZ2VQcm94eU1hcCBtX3BhZ2VNYXA7CiAgICAgV2ViRnJhbWVQcm94eU1hcCBt X2ZyYW1lTWFwOworICAgIEhhc2hTZXQ8UHJvdmlzaW9uYWxQYWdlUHJveHkqPiBtX3Byb3Zpc2lv bmFsUGFnZXM7CiAgICAgVXNlckluaXRpYXRlZEFjdGlvbk1hcCBtX3VzZXJJbml0aWF0ZWRBY3Rp b25NYXA7CiAKICAgICBIYXNoU2V0PFZpc2l0ZWRMaW5rU3RvcmUqPiBtX3Zpc2l0ZWRMaW5rU3Rv cmVzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oK aW5kZXggNTA3ZWRiNzNlNzQuLjcwNzliMjY5ODg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJLaXQvV2Vi S2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTMwOTUsNiArMzA5NSw4IEBACiAJCTQ2 NkJDMDM4MUZBMjY2QzkwMDJGQTlDMSAvKiBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5j cHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBXZWJTV0NvbnRleHRNYW5h Z2VyQ29ubmVjdGlvbi5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ2NkJDMDM5 MUZBMjY2QzkwMDJGQTlDMSAvKiBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5oICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlv bi5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NjZCQzAzQTFGQTI2NkM5MDAyRkE5 QzEgLyogV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24ubWVzc2FnZXMuaW4gKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSB0ZXh0OyBwYXRoID0gV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24ubWVzc2FnZXMuaW47 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTQ2ODM1NjlBMjFFODFDQzcwMDZFMjdBMyAv KiBQcm92aXNpb25hbFBhZ2VQcm94eS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGgg PSBQcm92aXNpb25hbFBhZ2VQcm94eS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk0 NjgzNTY5QjIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gUHJvdmlzaW9uYWxQYWdlUHJveHkuY3Bw OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NkEyQjYwNjFFNTY3NUEyMDBDM0RFREEg LyogQmFja2dyb3VuZFByb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVyLmNwcCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEJhY2tncm91bmRQcm9jZXNzUmVzcG9uc2l2ZW5lc3NU aW1lci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ2QTJCNjA3MUU1Njc1QTIw MEMzREVEQSAvKiBCYWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVuZXNzVGltZXIuaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQmFja2dyb3VuZFByb2Nlc3NSZXNwb25zaXZlbmVz c1RpbWVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ2REYwNjM5MUYzOTA1RTUw MDE5ODBCQiAvKiBOZXR3b3JrQ09SU1ByZWZsaWdodENoZWNrZXIuY3BwICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gTmV0d29ya0NPUlNQcmVmbGlnaHRDaGVja2VyLmNwcDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTczNTAsNiArNzM1Miw4IEBACiAJCQkJODZF NjdBMjIxOTBGNDExODAwMDA0QUI3IC8qIFByb2Nlc3NUaHJvdHRsZXIuY3BwICovLAogCQkJCTg2 RTY3QTIxMTkwRjQxMTgwMDAwNEFCNyAvKiBQcm9jZXNzVGhyb3R0bGVyLmggKi8sCiAJCQkJODMw NDhBRTUxQUNBNDVEQzAwODJDODMyIC8qIFByb2Nlc3NUaHJvdHRsZXJDbGllbnQuaCAqLywKKwkJ CQk0NjgzNTY5QjIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwICov LAorCQkJCTQ2ODM1NjlBMjFFODFDQzcwMDZFMjdBMyAvKiBQcm92aXNpb25hbFBhZ2VQcm94eS5o ICovLAogCQkJCUE1NUJBODFCMUJBMjVCMUUwMDdDRDMzRCAvKiBSZW1vdGVXZWJJbnNwZWN0b3JQ cm94eS5jcHAgKi8sCiAJCQkJQTU1QkE4MTkxQkEyNUIxRTAwN0NEMzNEIC8qIFJlbW90ZVdlYklu c3BlY3RvclByb3h5LmggKi8sCiAJCQkJQTU1QkE4MUExQkEyNUIxRTAwN0NEMzNEIC8qIFJlbW90 ZVdlYkluc3BlY3RvclByb3h5Lm1lc3NhZ2VzLmluICovLApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwCmluZGV4IDAwNzQ5YjQ3N2EyLi5mZmVkMDBjODIw NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcApA QCAtMjYzLDggKzI2Myw2IEBAIHN0YXRpYyBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gdG9Qb2xpY3lB Y3Rpb24oV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbikKICAgICAgICAgcmV0dXJuIFdlYkNv cmU6OlBvbGljeUFjdGlvbjo6SWdub3JlOwogICAgIGNhc2UgV2ViUG9saWN5QWN0aW9uOjpEb3du bG9hZDoKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6RG93bmxvYWQ7Ci0g ICAgY2FzZSBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQ6Ci0gICAgICAgIGJyZWFrOwogICAgIH0K ICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICByZXR1cm4gV2ViQ29yZTo6UG9saWN5QWN0 aW9uOjpJZ25vcmU7CkBAIC0yNzIsMTEgKzI3MCw4IEBAIHN0YXRpYyBXZWJDb3JlOjpQb2xpY3lB Y3Rpb24gdG9Qb2xpY3lBY3Rpb24oV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbikKIAogdm9p ZCBXZWJGcmFtZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKHVpbnQ2NF90IGxpc3RlbmVySUQs IFdlYlBvbGljeUFjdGlvbiBhY3Rpb24sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgRG93bmxvYWRJ RCBkb3dubG9hZElELCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xp Y2llcykKIHsKLSAgICBpZiAoIW1fY29yZUZyYW1lIHx8ICFtX3BvbGljeUxpc3RlbmVySUQgfHwg bGlzdGVuZXJJRCAhPSBtX3BvbGljeUxpc3RlbmVySUQgfHwgIW1fcG9saWN5RnVuY3Rpb24pIHsK LSAgICAgICAgaWYgKGFjdGlvbiA9PSBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQpCi0gICAgICAg ICAgICBwYWdlKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkRmFpbFRvU3VzcGVu ZEFmdGVyUHJvY2Vzc1N3YXAoKSk7CisgICAgaWYgKCFtX2NvcmVGcmFtZSB8fCAhbV9wb2xpY3lM aXN0ZW5lcklEIHx8IGxpc3RlbmVySUQgIT0gbV9wb2xpY3lMaXN0ZW5lcklEIHx8ICFtX3BvbGlj eUZ1bmN0aW9uKQogICAgICAgICByZXR1cm47Ci0gICAgfQogCiAgICAgRnJhbWVQb2xpY3lGdW5j dGlvbiBmdW5jdGlvbiA9IFdURk1vdmUobV9wb2xpY3lGdW5jdGlvbik7CiAgICAgYm9vbCBmb3JO YXZpZ2F0aW9uQWN0aW9uID0gbV9wb2xpY3lGdW5jdGlvbkZvck5hdmlnYXRpb25BY3Rpb24gPT0g Rm9yTmF2aWdhdGlvbkFjdGlvbjo6WWVzOwpAQCAtMjkyLDE2ICsyODcsNyBAQCB2b2lkIFdlYkZy YW1lOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24odWludDY0X3QgbGlzdGVuZXJJRCwgV2ViUG9s aWN5QWN0aW9uIGFjdAogICAgICAgICAgICAgZG9jdW1lbnRMb2FkZXItPnNldE5hdmlnYXRpb25J RChuYXZpZ2F0aW9uSUQpOwogICAgIH0KIAotICAgIGJvb2wgc2hvdWxkU3VzcGVuZCA9IGZhbHNl OwotICAgIGlmIChhY3Rpb24gPT0gV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kKSB7Ci0gICAgICAg IHNob3VsZFN1c3BlbmQgPSB0cnVlOwotICAgICAgICBhY3Rpb24gPSBXZWJQb2xpY3lBY3Rpb246 Oklnbm9yZTsKLSAgICB9Ci0KICAgICBmdW5jdGlvbih0b1BvbGljeUFjdGlvbihhY3Rpb24pKTsK LQotICAgIGlmIChzaG91bGRTdXNwZW5kKQotICAgICAgICBwYWdlKCktPnN1c3BlbmRGb3JQcm9j ZXNzU3dhcCgpOwogfQogCiB2b2lkIFdlYkZyYW1lOjpzdGFydERvd25sb2FkKGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWROYW1l KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCAy NWQ2ZGZiNzFkMC4uZTQ5MTgyNDdhNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC00MDEsNyArNDAxLDcgQEAgV2ViUGFnZTo6V2ViUGFnZSh1 aW50NjRfdCBwYWdlSUQsIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQog ICAgICwgbV9vdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSB7IHBhcmFtZXRlcnMub3ZlcnJp ZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgfQogICAgICwgbV9jcHVMaW1pdChwYXJhbWV0ZXJzLmNw dUxpbWl0KQogI2lmIFBMQVRGT1JNKE1BQykKLSAgICAsIG1fc2hvdWxkQXR0YWNoRHJhd2luZ0Fy ZWFPblBhZ2VUcmFuc2l0aW9uKHBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCkKKyAgICAs IG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uKHBhcmFtZXRlcnMuaXNQ cm9jZXNzU3dhcCkKICNlbmRpZgogewogICAgIEFTU0VSVChtX3BhZ2VJRCk7CkBAIC00NzEsNyAr NDcxLDcgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIFdlYlBhZ2VDcmVhdGlv blBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQogICAgIG1fZHJhd2luZ0FyZWEtPnNldFBhaW50aW5n RW5hYmxlZChmYWxzZSk7CiAgICAgbV9kcmF3aW5nQXJlYS0+c2V0U2hvdWxkU2NhbGVWaWV3VG9G aXREb2N1bWVudChwYXJhbWV0ZXJzLnNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQpOwogCi0g ICAgaWYgKHBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCkKKyAgICBpZiAocGFyYW1ldGVy cy5pc1Byb2Nlc3NTd2FwKQogICAgICAgICBmcmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJlZXpl UmVhc29uOjpTd2FwRnJvbVN1c3BlbmRlZCk7CiAKICNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5H KQpAQCAtNjk2LDcgKzY5Niw3IEBAIHZvaWQgV2ViUGFnZTo6cmVpbml0aWFsaXplV2ViUGFnZShX ZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICAgICAgbV9kcmF3aW5n QXJlYS0+dXBkYXRlUHJlZmVyZW5jZXMocGFyYW1ldGVycy5zdG9yZSk7CiAgICAgICAgIG1fZHJh d2luZ0FyZWEtPnNldFBhaW50aW5nRW5hYmxlZCh0cnVlKTsKICNpZiBQTEFURk9STShNQUMpCi0g ICAgICAgIG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uID0gcGFyYW1l dGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkOworICAgICAgICBtX3Nob3VsZEF0dGFjaERyYXdpbmdB cmVhT25QYWdlVHJhbnNpdGlvbiA9IHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcDsKICNlbmRpZgog ICAgICAgICB1bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlBhZ2VTdXNw ZW5kZWQpOwogICAgIH0KQEAgLTMwNTMsMTIgKzMwNTMsNiBAQCB2b2lkIFdlYlBhZ2U6OmRpZFJl Y2VpdmVQb2xpY3lEZWNpc2lvbih1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBsaXN0ZW5lcklE LCBXZQogICAgIFdlYkZyYW1lKiBmcmFtZSA9IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLndlYkZy YW1lKGZyYW1lSUQpOwogICAgIGlmICghZnJhbWUpCiAgICAgICAgIHJldHVybjsKLSAgICBpZiAo cG9saWN5QWN0aW9uID09IFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZCkgewotICAgICAgICBBU1NF UlQoZnJhbWUgPT0gbV9tYWluRnJhbWUpOwotICAgICAgICBzZXRJc1N1c3BlbmRlZCh0cnVlKTsK LQotICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5zZW5kUHJld2FybUluZm9ybWF0aW9u KG1haW5XZWJGcmFtZSgpLT51cmwoKSk7Ci0gICAgfQogICAgIGZyYW1lLT5kaWRSZWNlaXZlUG9s aWN5RGVjaXNpb24obGlzdGVuZXJJRCwgcG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uSUQsIGRvd25s b2FkSUQsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiB9CiAKQEAgLTYzMTIsNiArNjMwNiwx MCBAQCB2b2lkIFdlYlBhZ2U6OnNldElzU3VzcGVuZGVkKGJvb2wgc3VzcGVuZGVkKQogICAgIGlm IChtX2lzU3VzcGVuZGVkKSB7CiAgICAgICAgIC8vIFVuZnJvemVuIG9uIGRyYXdpbmcgYXJlYSBy ZXNldC4KICAgICAgICAgZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6UGFn ZVN1c3BlbmRlZCk7CisKKyAgICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuc2VuZFByZXdh cm1JbmZvcm1hdGlvbihtYWluV2ViRnJhbWUoKS0+dXJsKCkpOworCisgICAgICAgIHN1c3BlbmRG b3JQcm9jZXNzU3dhcCgpOwogICAgIH0gZWxzZQogICAgICAgICBtX3Nob3VsZFJlc2V0RHJhd2lu Z0FyZWFBZnRlclN1c3BlbmQgPSB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhLm1tCmluZGV4IDkxYWQ3MWFkZTFiLi44M2I2NTk5MjcwYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9U aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQpAQCAtOTcsNyArOTcsNyBAQCBUaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYTo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEoV2Vi UGFnZSYgd2ViUGFnZSwgYwogICAgIHVwZGF0ZUxheWVySG9zdGluZ0NvbnRleHQoKTsKICAgICBz ZXRDb2xvclNwYWNlKHBhcmFtZXRlcnMuY29sb3JTcGFjZSk7CiAKLSAgICBpZiAoIXBhcmFtZXRl cnMuaXNTd2FwRnJvbVN1c3BlbmRlZCkKKyAgICBpZiAoIXBhcmFtZXRlcnMuaXNQcm9jZXNzU3dh cCkKICAgICAgICAgYXR0YWNoKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0gYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1t CmluZGV4IGYzNWQ4YmFhMzUzLi41M2VlN2Q1OGFkYyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQorKysg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZp Z2F0aW9uLm1tCkBAIC0xNDA1LDcgKzE0MDUsNyBAQCBURVNUKFByb2Nlc3NTd2FwLCBTZXJ2ZXJS ZWRpcmVjdCkKIAogICAgIEVYUEVDVF9GQUxTRShzZXJ2ZXJSZWRpcmVjdGVkKTsKICAgICBFWFBF Q1RfRVEoMywgbnVtYmVyT2ZEZWNpZGVQb2xpY3lDYWxscyk7Ci0gICAgRVhQRUNUX0VRKDJ1LCBz ZWVuUElEcy5zaXplKCkpOworICAgIEVYUEVDVF9FUSgzdSwgc2VlblBJRHMuc2l6ZSgpKTsKIH0K IAogVEVTVChQcm9jZXNzU3dhcCwgU2VydmVyUmVkaXJlY3QyKQpAQCAtMjIzMiwxMiArMjIzMiwy NyBAQCBURVNUKFByb2Nlc3NTd2FwLCBQYWdlU2hvd0hpZGUpCiAKICAgICBFWFBFQ1RfRVEoN3Us IFtyZWNlaXZlZE1lc3NhZ2VzIGNvdW50XSk7CiAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjov L3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IE5PVCBwZXJzaXN0ZWQiLCByZWNl aXZlZE1lc3NhZ2VzLmdldCgpWzBdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3 LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNz YWdlcy5nZXQoKVsxXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5j b20vbWFpbi5odG1sIC0gcGFnZXNob3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMu Z2V0KClbMl0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21h aW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10p OwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwg LSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKLSAgICBF WFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhp ZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7Ci0gICAgRVhQRUNUX1dL X1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lz dGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7CisgICAgaWYgKFtyZWNlaXZlZE1lc3Nh Z2VzLmdldCgpWzFdIGhhc1ByZWZpeDpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwi XSkgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFp bi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7 CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRt bCAtIHBhZ2VzaG93IE5PVCBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsK KyAgICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxl LmNvbS9tYWluLmh0bWwgLSBwYWdlc2hvdyBOT1QgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdl cy5nZXQoKVsxXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0 Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdl dCgpWzJdKTsKKyAgICB9CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdIGhhc1By ZWZpeDpAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVD VF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBl cnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10pOworICAgICAgICBFWFBFQ1RfV0tf U1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lz dGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs0XSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAg RVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2Vz aG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10pOworICAgICAgICBFWFBF Q1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlaGlkZSBw ZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKKyAgICB9CisgICAgaWYgKFty ZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdIGhhc1ByZWZpeDpAInBzb246Ly93d3cud2Via2l0Lm9y Zy9tYWluLmh0bWwiXSkgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lndl YmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdl cy5nZXQoKVs1XSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUu Y29tL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0 KClbNl0pOworICAgIH0gZWxzZSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93 d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVz c2FnZXMuZ2V0KClbNV0pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lndl YmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdl cy5nZXQoKVs2XSk7CisgICAgfQogfQogCiAvLyBEaXNhYmxpbmcgdGhlIHBhZ2UgY2FjaGUgZXhw bGljaXRseSBpcyAoZm9yIHNvbWUgcmVhc29uKSBub3QgYXZhaWxhYmxlIG9uIGlPUy4K 358953 2019-01-11 14:57:28 -0800 2019-01-11 16:18:39 -0800 Prototype 193361_pson_provisional_process_wip.patch text/plain 74254 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggOGU5NTllZGFm ZmQuLjlkOTBiZThiNDhlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVz dEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0 aW9ucwpAQCAtNzMzLDggKzczMyw4IEBAIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGlj cy9yZW1vdmUtYmxvY2tpbmctaW4tcmVkaXJlY3QuaHRtbCBbIFNraXAgXQogaHR0cC90ZXN0cy9y ZXNvdXJjZUxvYWRTdGF0aXN0aWNzL25vbi1wcmV2YWxlbnQtcmVzb3VyY2VzLWNhbi1hY2Nlc3Mt Y29va2llcy1pbi1hLXRoaXJkLXBhcnR5LWNvbnRleHQuaHRtbCBbIFNraXAgXQogaHR0cC90ZXN0 cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL2NhcC1jYWNoZS1tYXgtYWdlLWZvci1wcmV2YWxlbnQt cmVzb3VyY2UuaHRtbCBbIFNraXAgXQogCi0jIFByb2Nlc3Mgc3dhcHBpbmcgaXMgb25seSBpbXBs ZW1lbnRlZCBvbiBXZWJLaXQyLgotaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3Byb2Nlc3Mtc3dhcC13 aW5kb3ctb3Blbi5odG1sIFsgUGFzcyBdCisjIFRoaXMgZmVhdHVyZSBpcyBjdXJyZW50bHkgZGlz YWJsZWQgYnkgZGVmYXVsdCBhbmQgdW5maW5pc2hlZCA8cmRhcjovL3Byb2JsZW0vMzg5MjUwNzc+ LgoraHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3Byb2Nlc3Mtc3dhcC13aW5kb3ctb3Blbi5odG1sIFsg U2tpcCBdCiAKICMgQ3Jvc3MtT3JpZ2luLVJlc291cmNlLVBvbGljeSByZXNwb25zZSBoZWFkZXIg aXMgb25seSBpbXBsZW1lbnRlZCBpbiBXZWJLaXQyLgogaHR0cC93cHQvY3Jvc3Mtb3JpZ2luLXJl c291cmNlLXBvbGljeS8gWyBQYXNzIF0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw CmluZGV4IDRjMjZhNjk4MWI0Li5lYmY5NTBiYTZjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuY3BwCkBAIC0yMDMyLDExICsyMDMyLDExIEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNv bW1pdFByb3Zpc2lvbmFsTG9hZCgpCiAKICAgICAgICAgT3B0aW9uYWw8SGFzSW5zZWN1cmVDb250 ZW50PiBoYXNJbnNlY3VyZUNvbnRlbnQgPSBjYWNoZWRQYWdlLT5jYWNoZWRNYWluRnJhbWUoKS0+ aGFzSW5zZWN1cmVDb250ZW50KCk7CiAKKyAgICAgICAgZGlzcGF0Y2hEaWRDb21taXRMb2FkKGhh c0luc2VjdXJlQ29udGVudCk7CisKICAgICAgICAgLy8gRklYTUU6IFRoaXMgQVBJIHNob3VsZCBi ZSB0dXJuZWQgYXJvdW5kIHNvIHRoYXQgd2UgZ3JvdW5kIENhY2hlZFBhZ2UgaW50byB0aGUgUGFn ZS4KICAgICAgICAgY2FjaGVkUGFnZS0+cmVzdG9yZSgqbV9mcmFtZS5wYWdlKCkpOwogCi0gICAg ICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOwotCiAjaWYgUExB VEZPUk0oSU9TX0ZBTUlMWSkKICAgICAgICAgbV9mcmFtZS5wYWdlKCktPmNocm9tZSgpLnNldERp c3BhdGNoVmlld3BvcnREYXRhRGlkQ2hhbmdlU3VwcHJlc3NlZChmYWxzZSk7CiAgICAgICAgIG1f ZnJhbWUucGFnZSgpLT5jaHJvbWUoKS5kaXNwYXRjaFZpZXdwb3J0UHJvcGVydGllc0RpZENoYW5n ZShtX2ZyYW1lLnBhZ2UoKS0+dmlld3BvcnRBcmd1bWVudHMoKSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcCBiL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCmluZGV4IGNhMmRmNDBl ZTFkLi42ZDA3YzAzYWQ4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKQEAgLTczLDcgKzczLDcgQEAgdm9pZCBXZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzOjplbmNvZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAg IGVuY29kZXIuZW5jb2RlRW51bShsYXllckhvc3RpbmdNb2RlKTsKICAgICBlbmNvZGVyIDw8IG1p bWVUeXBlc1dpdGhDdXN0b21Db250ZW50UHJvdmlkZXJzOwogICAgIGVuY29kZXIgPDwgY29udHJv bGxlZEJ5QXV0b21hdGlvbjsKLSAgICBlbmNvZGVyIDw8IGlzU3dhcEZyb21TdXNwZW5kZWQ7Cisg ICAgZW5jb2RlciA8PCBpc1Byb2Nlc3NTd2FwOwogCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIGVu Y29kZXIgPDwgY29sb3JTcGFjZTsKQEAgLTIyNyw3ICsyMjcsNyBAQCBPcHRpb25hbDxXZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzPiBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoSVBD OjpEZWNvZAogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogICAgIGlmICghZGVjb2Rlci5k ZWNvZGUocGFyYW1ldGVycy5jb250cm9sbGVkQnlBdXRvbWF0aW9uKSkKICAgICAgICAgcmV0dXJu IFdURjo6bnVsbG9wdDsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuaXNTd2Fw RnJvbVN1c3BlbmRlZCkpCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmlzUHJv Y2Vzc1N3YXApKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAjaWYgUExBVEZPUk0o TUFDKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVycy5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVy cy5oCmluZGV4IGFlNDMyNWNiZDVmLi5iMzgyY2VlZGQ0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaApAQCAtMTI5LDcgKzEyOSw3IEBA IHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICAgICBWZWN0b3I8U3RyaW5nPiBt aW1lVHlwZXNXaXRoQ3VzdG9tQ29udGVudFByb3ZpZGVyczsKIAogICAgIGJvb2wgY29udHJvbGxl ZEJ5QXV0b21hdGlvbjsKLSAgICBib29sIGlzU3dhcEZyb21TdXNwZW5kZWQgeyBmYWxzZSB9Owor ICAgIGJvb2wgaXNQcm9jZXNzU3dhcCB7IGZhbHNlIH07CiAKICNpZiBQTEFURk9STShNQUMpCiAg ICAgQ29sb3JTcGFjZURhdGEgY29sb3JTcGFjZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv U2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5 QWN0aW9uLmgKaW5kZXggMTQyYTUxOGRmMDkuLjM5NzE3OTVjNDZhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQb2xpY3lBY3Rpb24uaApAQCAtMjksMTEgKzI5LDExIEBACiAKIG5hbWVzcGFjZSBX ZWJLaXQgewogCisvLyBGSVhNRTogUmVtb3ZlIHRoaXMgdHlwZSBhbmQgdXNlIFdlYkNvcmU6OlBv bGljeUFjdGlvbiBpbnN0ZWFkLgogZW51bSBjbGFzcyBXZWJQb2xpY3lBY3Rpb24gOiB1aW50OF90 IHsKICAgICBVc2UsCiAgICAgRG93bmxvYWQsCi0gICAgSWdub3JlLAotICAgIFN1c3BlbmQKKyAg ICBJZ25vcmUKIH07CiAKIH0KQEAgLTQ1LDggKzQ1LDcgQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgRW51 bVRyYWl0czxXZWJLaXQ6OldlYlBvbGljeUFjdGlvbj4gewogICAgICAgICBXZWJLaXQ6OldlYlBv bGljeUFjdGlvbiwKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OlVzZSwKICAgICAg ICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OkRvd25sb2FkLAotICAgICAgICBXZWJLaXQ6Oldl YlBvbGljeUFjdGlvbjo6SWdub3JlLAotICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6 U3VzcGVuZAorICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6SWdub3JlCiAgICAgPjsK IH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQgYi9Tb3VyY2UvV2Vi S2l0L1NvdXJjZXMudHh0CmluZGV4IGEwYjZmNzI4NDYwLi44YWVjYjg2NDcyNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9Tb3VyY2VzLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMu dHh0CkBAIC0yMzAsNiArMjMwLDcgQEAgVUlQcm9jZXNzL0luc3BlY3RvclRhcmdldFByb3h5LmNw cAogVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuY3BwCiBVSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlv bi5jcHAKIFVJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNwcAorVUlQcm9jZXNzL1Byb3Zpc2lv bmFsUGFnZVByb3h5LmNwcAogVUlQcm9jZXNzL1JlbW90ZVdlYkluc3BlY3RvclByb3h5LmNwcAog VUlQcm9jZXNzL1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwCiBVSVByb2Nlc3MvU2VydmljZVdvcmtl clByb2Nlc3NQcm94eS5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tCmluZGV4IGNmMTkxOWM5M2E3Li5jNzlmY2IyMTBiNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC00NCw2ICs0NCw3 IEBACiAjaW1wb3J0ICJOYXZpZ2F0aW9uU3RhdGUuaCIKICNpbXBvcnQgIk9iakNPYmplY3RHcmFw aC5oIgogI2ltcG9ydCAiUGFnZUNsaWVudC5oIgorI2ltcG9ydCAiUHJvdmlzaW9uYWxQYWdlUHJv eHkuaCIKICNpbXBvcnQgIlJlbW90ZUxheWVyVHJlZVNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YS5o IgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24uaCIKICNpbXBvcnQgIlJlbW90 ZU9iamVjdFJlZ2lzdHJ5LmgiCkBAIC00NjY0LDYgKzQ2NjUsMTEgQEAgLSAodm9pZClfa2lsbFdl YkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRTdGF0ZQogewogICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nl c3NQcm94eT4gcHJvdGVjdGVkUHJvY2Vzc1Byb3h5KF9wYWdlLT5wcm9jZXNzKCkpOwogICAgIHBy b3RlY3RlZFByb2Nlc3NQcm94eS0+cmVxdWVzdFRlcm1pbmF0aW9uKFdlYktpdDo6UHJvY2Vzc1Rl cm1pbmF0aW9uUmVhc29uOjpSZXF1ZXN0ZWRCeUNsaWVudCk7CisKKyAgICBpZiAoYXV0byogcHJv dmlzaW9uYWxQYWdlUHJveHkgPSBfcGFnZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKSkgeworICAg ICAgICBSZWY8V2ViS2l0OjpXZWJQcm9jZXNzUHJveHk+IHByb3RlY3RlZFByb2Nlc3NQcm94eShw cm92aXNpb25hbFBhZ2VQcm94eS0+cHJvY2VzcygpKTsKKyAgICAgICAgcHJvdGVjdGVkUHJvY2Vz c1Byb3h5LT5yZXF1ZXN0VGVybWluYXRpb24oV2ViS2l0OjpQcm9jZXNzVGVybWluYXRpb25SZWFz b246OlJlcXVlc3RlZEJ5Q2xpZW50KTsKKyAgICB9CiB9CiAKICNpZiBQTEFURk9STShNQUMpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmggYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKaW5kZXggMGI4NThjNDZlZTQuLjZmM2RmODQ1 MmIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCkBAIC00OCw2ICs0OCw3IEBA CiAKIE9CSkNfQ0xBU1MgQ0FMYXllcjsKIE9CSkNfQ0xBU1MgTlNGaWxlV3JhcHBlcjsKK09CSkNf Q0xBU1MgTlNNZW51OwogT0JKQ19DTEFTUyBOU1NldDsKIE9CSkNfQ0xBU1MgV0tEcmF3aW5nVmll dzsKIE9CSkNfQ0xBU1MgX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAuLmExY2FmMTllYmM2Ci0tLSAvZGV2L251bGwKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCkBAIC0wLDAgKzEs MjgyIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAq IDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUg Y29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZv cm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQor ICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGgg dGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQ UExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJF U1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywK KyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNT IEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5U IFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBB TlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgor ICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywg UFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0Yg VVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dF VkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAq IENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5D RSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0Yg VEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1ZGUgIlByb3Zp c2lvbmFsUGFnZVByb3h5LmgiCisKKyNpbmNsdWRlICJBUElOYXZpZ2F0aW9uLmgiCisjaW5jbHVk ZSAiRHJhd2luZ0FyZWFQcm94eS5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKKyNpbmNsdWRlICJQ YWdlQ2xpZW50LmgiCisjaW5jbHVkZSAiV2ViQmFja0ZvcndhcmRMaXN0LmgiCisjaW5jbHVkZSAi V2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oIgorI2luY2x1ZGUgIldlYkVycm9ycy5oIgorI2luY2x1 ZGUgIldlYk5hdmlnYXRpb25TdGF0ZS5oIgorI2luY2x1ZGUgIldlYlBhZ2VNZXNzYWdlcy5oIgor I2luY2x1ZGUgIldlYlBhZ2VQcm94eS5oIgorI2luY2x1ZGUgIldlYlBhZ2VQcm94eU1lc3NhZ2Vz LmgiCisjaW5jbHVkZSAiV2ViUHJvY2Vzc01lc3NhZ2VzLmgiCisjaW5jbHVkZSAiV2ViUHJvY2Vz c1Byb3h5LmgiCisjaW5jbHVkZSA8V2ViQ29yZS9TaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQu aD4KKworbmFtZXNwYWNlIFdlYktpdCB7CisKK1Byb3Zpc2lvbmFsUGFnZVByb3h5OjpQcm92aXNp b25hbFBhZ2VQcm94eShXZWJQYWdlUHJveHkmIHBhZ2UsIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYg cHJvY2Vzcywgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4gc3VzcGVuZGVkUGFn ZSwgdWludDY0X3QgbmF2aWdhdGlvbklELCBib29sIGlzU2VydmVyUmVkaXJlY3QsIGNvbnN0IFdl YkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNs aWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KQorICAgIDogbV9wYWdlKHBhZ2UpCisg ICAgLCBtX3Byb2Nlc3MoV1RGTW92ZShwcm9jZXNzKSkKKyAgICAsIG1fbmF2aWdhdGlvbklEKG5h dmlnYXRpb25JRCkKKyAgICAsIG1faXNTZXJ2ZXJSZWRpcmVjdChpc1NlcnZlclJlZGlyZWN0KQor ICAgICwgbV9yZXF1ZXN0KHJlcXVlc3QpCisgICAgLCBtX3Byb2Nlc3NTd2FwUmVxdWVzdGVkQnlD bGllbnQocHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCkKKyNpZiBQTEFURk9STShJT1NfRkFN SUxZKQorICAgICwgbV9zdXNwZW5zaW9uVG9rZW4obV9wcm9jZXNzLT50aHJvdHRsZXIoKS5iYWNr Z3JvdW5kQWN0aXZpdHlUb2tlbigpKQorI2VuZGlmCit7CisgICAgbV9wcm9jZXNzLT5hZGRNZXNz YWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgp LCBtX3BhZ2UucGFnZUlEKCksICp0aGlzKTsKKyAgICBtX3Byb2Nlc3MtPmFkZFByb3Zpc2lvbmFs UGFnZVByb3h5KCp0aGlzKTsKKworICAgIC8vIElmIHdlIGFyZSByZWF0dGFjaGluZyB0byBhIFN1 c3BlbmRlZFBhZ2UsIHRoZW4gdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UgYWxyZWFkeSBleGlzdHMg YW5kCisgICAgLy8gV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUoKSB3aWxsIG5vdCBi ZSBjYWxsZWQgdG8gaW5pdGlhbGl6ZSBtX21haW5GcmFtZS4gSW4gc3VjaAorICAgIC8vIGNhc2Us IHdlIG5lZWQgdG8gaW5pdGlhbGl6ZSBtX21haW5GcmFtZSB0byByZWZsZWN0IHRoZSBmYWN0IHRo ZSB0aGUgV2ViUHJvY2VzcycgV2ViUGFnZQorICAgIC8vIGFscmVhZHkgZXhpc3RzIGFuZCBhbHJl YWR5IGhhcyBhIG1haW4gZnJhbWUuCisgICAgaWYgKHN1c3BlbmRlZFBhZ2UpIHsKKyAgICAgICAg aWYgKCFzdXNwZW5kZWRQYWdlLT5mYWlsZWRUb1N1c3BlbmQoKSkgeworICAgICAgICBBU1NFUlQo JnN1c3BlbmRlZFBhZ2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpOworICAgICAgICBz dXNwZW5kZWRQYWdlLT51bnN1c3BlbmQoKTsKKyAgICAgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFt ZVByb3h5OjpjcmVhdGUobV9wYWdlLCBzdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpKTsKKyAg ICAgICAgbV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoc3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQo KSwgKm1fbWFpbkZyYW1lKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBzdXNwZW5kZWRQ YWdlID0gbnVsbHB0cjsKKyAgICB9CisKKyAgICBpbml0aWFsaXplV2ViUGFnZSgpOworfQorCitQ cm92aXNpb25hbFBhZ2VQcm94eTo6flByb3Zpc2lvbmFsUGFnZVByb3h5KCkKK3sKKyAgICBtX3By b2Nlc3MtPnJlbW92ZVByb3Zpc2lvbmFsUGFnZVByb3h5KCp0aGlzKTsKKworICAgIGlmIChtX3dh c0NvbW1pdHRlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNz YWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgp LCBtX3BhZ2UucGFnZUlEKCkpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6Q2xvc2UoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKworICAgIGlmIChtX2RyYXdpbmdBcmVhKSB7 CisgICAgICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92 ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgICAgICBtX2RyYXdpbmdBcmVhID0gbnVsbHB0 cjsKKyAgICB9CisKKyAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3Byb2Nlc3MgPSBtX3By b2Nlc3MuY29weVJlZigpXSB7CisgICAgICAgIHByb2Nlc3MtPm1heWJlU2h1dERvd24oKTsKKyAg ICB9KTsKK30KKworc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IFByb3Zpc2lvbmFs UGFnZVByb3h5Ojp0YWtlRHJhd2luZ0FyZWEoKQoreworICAgIHJldHVybiBXVEZNb3ZlKG1fZHJh d2luZ0FyZWEpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpjYW5jZWwoKQorewor ICAgIC8vIElmIHRoZSBwcm92aXNpb25hbCBsb2FkIHN0YXJ0ZWQsIHRoZW4gaW5kaWNhdGUgdGhh dCBpdCBmYWlsZWQgZHVlIHRvIGNhbmNlbGxhdGlvbiBieSBjYWxsaW5nIGRpZEZhaWxQcm92aXNp b25hbExvYWRGb3JGcmFtZSgpLgorICAgIGlmIChtX3Byb3Zpc2lvbmFsTG9hZFVSTC5pc0VtcHR5 KCkpCisgICAgICAgIHJldHVybjsKKworICAgIEFTU0VSVChtX21haW5GcmFtZSk7CisgICAgYXV0 byBlcnJvciA9IFdlYktpdDo6Y2FuY2VsbGVkRXJyb3IobV9yZXF1ZXN0KTsKKyAgICBlcnJvci5z ZXRUeXBlKFdlYkNvcmU6OlJlc291cmNlRXJyb3I6OlR5cGU6OkNhbmNlbGxhdGlvbik7CisgICAg ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKG1fbWFpbkZyYW1lLT5mcmFtZUlEKCksIHsg fSwgbV9uYXZpZ2F0aW9uSUQsIG1fcHJvdmlzaW9uYWxMb2FkVVJMLCBlcnJvciwgVXNlckRhdGEg eyB9KTsgLy8gV2lsbCBkZWxldGUgfHRoaXN8LgorfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVBy b3h5Ojppbml0aWFsaXplV2ViUGFnZSgpCit7CisgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRl ID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgbV9k cmF3aW5nQXJlYSA9IG1fcGFnZS5wYWdlQ2xpZW50KCkuY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgp OworCisgICAgYXV0byBwYXJhbWV0ZXJzID0gbV9wYWdlLmNyZWF0aW9uUGFyYW1ldGVycygpOwor ICAgIHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCA9IHRydWU7CisgICAgbV9wcm9jZXNzLT5zZW5k KE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpDcmVhdGVXZWJQYWdlKG1fcGFnZS5wYWdlSUQoKSwgcGFy YW1ldGVycyksIDApOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2FkRGF0YVdp dGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgY29uc3QgSVBDOjpEYXRh UmVmZXJlbmNlJiBkYXRhLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVu Y29kaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0 aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit7CisgICAgYXV0 byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNz KG1fcHJvY2Vzcyk7CisgICAgbV9wYWdlLmxvYWREYXRhV2l0aE5hdmlnYXRpb24obmF2aWdhdGlv biwgZGF0YSwgTUlNRVR5cGUsIGVuY29kaW5nLCBiYXNlVVJMLCB1c2VyRGF0YSwgV2ViQ29yZTo6 U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVz KSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmxvYWRSZXF1ZXN0V2l0aE5hdmln YXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QmJiByZXF1ZXN0LCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5IHNob3Vs ZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0aW9uYWw8 V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit7CisgICAgYXV0byBwYWdl UHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJv Y2Vzcyk7CisgICAgbV9wYWdlLmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwg V1RGTW92ZShyZXF1ZXN0KSwgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgdXNlckRhdGEs IFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNp dGVQb2xpY2llcykpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpnb1RvQmFja0Zv cndhcmRJdGVtKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgV2ViQmFja0ZvcndhcmRMaXN0 SXRlbSYgaXRlbSwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNp ZXMpCit7CisgICAgYXV0byBpdGVtU3RhdGVzID0gbV9wYWdlLmJhY2tGb3J3YXJkTGlzdCgpLmZp bHRlcmVkSXRlbVN0YXRlcyhbdGhpcywgdGFyZ2V0SXRlbSA9ICZpdGVtXShhdXRvJiBpdGVtKSB7 CisgICAgICAgIGlmIChhdXRvKiBwYWdlID0gaXRlbS5zdXNwZW5kZWRQYWdlKCkpIHsKKyAgICAg ICAgICAgIGlmICgmcGFnZS0+cHJvY2VzcygpID09IG1fcHJvY2Vzcy5wdHIoKSkKKyAgICAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuICZpdGVtICE9 IHRhcmdldEl0ZW07CisgICAgfSk7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQ YWdlOjpVcGRhdGVCYWNrRm9yd2FyZExpc3RGb3JSZWF0dGFjaChXVEZNb3ZlKGl0ZW1TdGF0ZXMp KSwgbV9wYWdlLnBhZ2VJRCgpKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0obmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgaXRlbS5p dGVtSUQoKSwgKm5hdmlnYXRpb24uYmFja0ZvcndhcmRGcmFtZUxvYWRUeXBlKCksIFdlYkNvcmU6 OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2ll cykpLCBtX3BhZ2UucGFnZUlEKCkpOworICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1l cigpLnN0YXJ0KCk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZENyZWF0ZU1h aW5GcmFtZSh1aW50NjRfdCBmcmFtZUlEKQoreworICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOwor CisgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5OjpjcmVhdGUobV9wYWdlLCBmcmFtZUlE KTsKKworICAgIC8vIEFkZCB0aGUgZnJhbWUgdG8gdGhlIHByb2Nlc3Mgd2lkZSBtYXAuCisgICAg bV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoZnJhbWVJRCwgKm1fbWFpbkZyYW1lKTsKKworICAgIC8v IFRoaXMgbmF2aWdhdGlvbiB3YXMgZGVzdHJveWVkIHNvIG5vIG5lZWQgdG8gbm90aWZ5IG9mIHJl ZGlyZWN0LgorICAgIGlmICghbV9wYWdlLm5hdmlnYXRpb25TdGF0ZSgpLmhhc05hdmlnYXRpb24o bV9uYXZpZ2F0aW9uSUQpKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBSZXN0b3JlIHRoZSBt YWluIGZyYW1lJ3MgY29tbWl0dGVkIFVSTCBhcyBzb21lIGNsaWVudHMgbWF5IHJlbHkgb24gaXQg dW50aWwgdGhlIG5leHQgbG9hZCBpcyBjb21taXR0ZWQuCisgICAgaWYgKGF1dG8qIG1haW5GcmFt ZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAgICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0 YXRlKCkuc2V0VVJMKG1haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS51cmwoKSk7CisKKyAgICAv LyBOb3JtYWxseSwgbm90aWZpY2F0aW9uIG9mIGEgc2VydmVyIHJlZGlyZWN0IGNvbWVzIGZyb20g dGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KKyAgICAvLyBJZiB3ZSBhcmUgcHJvY2VzcyBzd2FwcGlu ZyBpbiByZXNwb25zZSB0byBhIHNlcnZlciByZWRpcmVjdCB0aGVuIHRoYXQgbm90aWZpY2F0aW9u IHdpbGwgbm90IGNvbWUgZnJvbSB0aGUgbmV3IFdlYkNvbnRlbnQgcHJvY2Vzcy4KKyAgICAvLyBJ biB0aGlzIGNhc2Ugd2UgaGF2ZSB0aGUgVUlQcm9jZXNzIHN5bnRoZXNpemUgdGhlIHJlZGlyZWN0 IG5vdGlmaWNhdGlvbiBhdCB0aGUgYXBwcm9wcmlhdGUgdGltZS4KKyAgICBpZiAobV9pc1NlcnZl clJlZGlyZWN0KSB7CisgICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLmRpZFN0 YXJ0UHJvdmlzaW9uYWxMb2FkKG1fcmVxdWVzdC51cmwoKSk7CisKKyAgICAgICAgYXV0byBwYWdl UHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJv Y2Vzcyk7CisgICAgICAgIG1fcGFnZS5kaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNp b25hbExvYWRGb3JGcmFtZShtX21haW5GcmFtZS0+ZnJhbWVJRCgpLCBtX25hdmlnYXRpb25JRCwg V1RGTW92ZShtX3JlcXVlc3QpLCB7IH0pOworICAgIH0KK30KKwordm9pZCBQcm92aXNpb25hbFBh Z2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlE LCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmIHVybCwgVVJMJiYgdW5yZWFjaGFibGVVUkws IGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICAvLyBJZiB0aGUgcHJldmlvdXMgcHJv dmlzaW9uYWwgbG9hZCB1c2VkIHRoZSBzYW1lIHByb2Nlc3MsIHdlIG1heSByZWNlaXZlIElQQyBm b3IgdGhpcyBwcmV2aW91cyBwcm92aXNpb25hbCdzIG1haW4gZnJhbWUgdGhhdCB3ZSBuZWVkIHRv IGlnbm9yZS4KKyAgICBpZiAoIW1fbWFpbkZyYW1lIHx8IG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkg IT0gZnJhbWVJRCkKKyAgICAgICAgcmV0dXJuOworCisgICAgQVNTRVJUKG1fcHJvdmlzaW9uYWxM b2FkVVJMLmlzTnVsbCgpKTsKKyAgICBtX3Byb3Zpc2lvbmFsTG9hZFVSTCA9IHVybDsKKworICAg IC8vIE1lcmVseSBmb2xsb3dpbmcgYSBzZXJ2ZXIgc2lkZSByZWRpcmVjdCBzbyB0aGVyZSBpcyBu byBuZWVkIHRvIHNlbmQgYSBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZCBhZ2Fpbi4KKyAgICBpZiAo bV9pc1NlcnZlclJlZGlyZWN0KQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBDbGllbnRzIGV4 cGVjdCB0aGUgUGFnZSdzIG1haW4gZnJhbWUncyBleHBlY3RlZFVSTCB0byBiZSB0aGUgcHJvdmlz aW9uYWwgb25lIHdoZW4gYSBwcm92aXNpb25hbCBsb2FkIGlzIHN0YXJ0ZWQuCisgICAgaWYgKGF1 dG8qIHBhZ2VNYWluRnJhbWUgPSBtX3BhZ2UubWFpbkZyYW1lKCkpCisgICAgICAgIHBhZ2VNYWlu RnJhbWUtPmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKHVybCk7CisKKyAgICBhdXRvIHBhZ2VQcm9j ZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNz KTsKKyAgICBtX3BhZ2UuZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZShmcmFtZUlELCBu YXZpZ2F0aW9uSUQsIFdURk1vdmUodXJsKSwgV1RGTW92ZSh1bnJlYWNoYWJsZVVSTCksIHVzZXJE YXRhKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFs TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3Jp Z2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25z dCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJMLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiBl cnJvciwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAgIGF1dG8gcGFnZVByb2Nlc3NP dmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOwor CisgICAgbV9wcm92aXNpb25hbExvYWRVUkwgPSB7IH07CisKKyAgICAvLyBNYWtlIHN1cmUgdGhl IFBhZ2UncyBtYWluIGZyYW1lJ3MgZXhwZWN0ZWRVUkwgZ2V0cyBjbGVhcmVkIHNpbmNlIHdlIHVw ZGF0ZWQgaXQgaW4gZGlkU3RhcnRQcm92aXNpb25hbExvYWQuCisgICAgaWYgKGF1dG8qIHBhZ2VN YWluRnJhbWUgPSBtX3BhZ2UubWFpbkZyYW1lKCkpCisgICAgICAgIHBhZ2VNYWluRnJhbWUtPmRp ZEZhaWxQcm92aXNpb25hbExvYWQoKTsKKworICAgIG1fcGFnZS5kaWRGYWlsUHJvdmlzaW9uYWxM b2FkRm9yRnJhbWUoZnJhbWVJRCwgZnJhbWVTZWN1cml0eU9yaWdpbiwgbmF2aWdhdGlvbklELCBw cm92aXNpb25hbFVSTCwgZXJyb3IsIHVzZXJEYXRhKTsgLy8gV2lsbCBkZWxldGUgfHRoaXN8Lgor fQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUodWlu dDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVU eXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxv YWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5mbywg Ym9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3Vy ZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmIHVzZXJE YXRhKQoreworICAgIC8vIElmIHRoZSBwcmV2aW91cyBwcm92aXNpb25hbCBsb2FkIHVzZWQgdGhl IHNhbWUgcHJvY2Vzcywgd2UgbWF5IHJlY2VpdmUgSVBDIGZvciB0aGlzIHByZXZpb3VzIHByb3Zp c2lvbmFsJ3MgbWFpbiBmcmFtZSB0aGF0IHdlIG5lZWQgdG8gaWdub3JlLgorICAgIGlmICghbV9t YWluRnJhbWUgfHwgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSAhPSBmcmFtZUlEKQorICAgICAgICBy ZXR1cm47CisKKyAgICBtX3Byb3Zpc2lvbmFsTG9hZFVSTCA9IHsgfTsKKyAgICBtX3Byb2Nlc3Mt PnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVj ZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisKKyAgICBtX3dhc0NvbW1pdHRlZCA9IHRy dWU7CisgICAgbV9wYWdlLmNvbW1pdFByb3Zpc2lvbmFsUGFnZShmcmFtZUlELCBuYXZpZ2F0aW9u SUQsIG1pbWVUeXBlLCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgZnJhbWVMb2FkVHlw ZSwgY2VydGlmaWNhdGVJbmZvLCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBmb3JjZWRIYXNJbnNl Y3VyZUNvbnRlbnQsIHVzZXJEYXRhKTsgLy8gV2lsbCBkZWxldGUgfHRoaXN8LgorfQorCit2b2lk IFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24m IGNvbm5lY3Rpb24sIElQQzo6RGVjb2RlciYgZGVjb2RlcikKK3sKKyAgICBBU1NFUlQoZGVjb2Rl ci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2Fn ZVJlY2VpdmVyTmFtZSgpKTsKKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVz c2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU3RhcnRQcm9ncmVzczo6bmFtZSgpCisgICAgICAgIHx8 IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDaGFu Z2VQcm9ncmVzczo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBN ZXNzYWdlczo6V2ViUGFnZVByb3h5OjpCYWNrRm9yd2FyZEFkZEl0ZW06Om5hbWUoKQorICAgICAg ICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6TG9n RGlhZ25vc3RpY01lc3NhZ2U6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1l KCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6TG9nRGlhZ25vc3RpY01lc3NhZ2VXaXRoRW5o YW5jZWRQcml2YWN5OjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09 IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNldE5ldHdvcmtSZXF1ZXN0c0luUHJvZ3Jlc3M6Om5h bWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6UmVnaXN0ZXJXZWJQcm9jZXNzQWNjZXNzaWJpbGl0eVRva2VuOjpuYW1lKCkKKyAg ICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 OkRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYzo6bmFtZSgpCisgICAgICAgIHx8 IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTdGFydFVS TFNjaGVtZVRhc2s6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0g TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGVjaWRlUG9saWN5Rm9yUmVzcG9uc2U6Om5hbWUoKQor ICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6RGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0OjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5t ZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENoYW5nZVByb3Zpc2lv bmFsVVJMRm9yRnJhbWU6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkg PT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGE6 Om5hbWUoKSkKKyAgICB7CisgICAgICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFn ZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgICAgICBtX3BhZ2Uu ZGlkUmVjZWl2ZU1lc3NhZ2UoY29ubmVjdGlvbiwgZGVjb2Rlcik7CisgICAgICAgIHJldHVybjsK KyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQ YWdlUHJveHk6OkRpZENyZWF0ZU1haW5GcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFu ZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDcmVhdGVNYWluRnJhbWU+KGRl Y29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKTsK KyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkg PT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFt ZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjpEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lPihkZWNvZGVyLCB0aGlzLCAm UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOwor ICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9 PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6 Om5hbWUoKSkgeworICAgICAgICBJUEM6OmhhbmRsZU1lc3NhZ2U8TWVzc2FnZXM6OldlYlBhZ2VQ cm94eTo6RGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lPihkZWNvZGVyLCB0aGlzLCAmUHJv dmlzaW9uYWxQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSk7CisgICAg ICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENvbW1pdExvYWRGb3JGcmFtZTo6bmFtZSgpKSB7Cisg ICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDb21t aXRMb2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlk Q29tbWl0TG9hZEZvckZyYW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIExPRyhQ cm9jZXNzU3dhcHBpbmcsICJVbmhhbmRsZWQgbWVzc2FnZSAlczo6JXMgZnJvbSBwcm92aXNpb25h bCBwcm9jZXNzIiwgZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkudG9TdHJpbmcoKS5kYXRh KCksIGRlY29kZXIubWVzc2FnZU5hbWUoKS50b1N0cmluZygpLmRhdGEoKSk7Cit9CisKK3ZvaWQg UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVTeW5jTWVzc2FnZShJUEM6OkNvbm5lY3Rp b24mIGNvbm5lY3Rpb24sIElQQzo6RGVjb2RlciYgZGVjb2Rlciwgc3RkOjp1bmlxdWVfcHRyPElQ Qzo6RW5jb2Rlcj4mIGVuY29kZXIpCit7CisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9 PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpCYWNrRm9yd2FyZEl0ZW1BdEluZGV4OjpuYW1lKCkg fHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkJhY2tG b3J3YXJkR29Ub0l0ZW06Om5hbWUoKSkgeworICAgICAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJp ZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICAg ICAgbV9wYWdlLmRpZFJlY2VpdmVTeW5jTWVzc2FnZShjb25uZWN0aW9uLCBkZWNvZGVyLCBlbmNv ZGVyKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIExPRyhQcm9jZXNzU3dhcHBpbmcs ICJVbmhhbmRsZWQgc3luYyBtZXNzYWdlICVzOjolcyBmcm9tIHByb3Zpc2lvbmFsIHByb2Nlc3Mi LCBkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKS50b1N0cmluZygpLmRhdGEoKSwgZGVjb2Rl ci5tZXNzYWdlTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgpKTsKK30KKworfSAvLyBuYW1lc3BhY2Ug V2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBh Z2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHku aApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uZWRjMTQxNTU0OWIKLS0t IC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQ cm94eS5oCkBAIC0wLDAgKzEsODkgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTkgQXBwbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0 aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z CisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3Qg cmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0 aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Cisg KiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRp c2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlh bHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUg SVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycK KyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVU IE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFC SUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xB SU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisg KiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFM LCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVU IE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElU WSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElO Q0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjcHJhZ21hIG9uY2UKKworI2lu Y2x1ZGUgIk1lc3NhZ2VSZWNlaXZlci5oIgorCituYW1lc3BhY2UgV2ViQ29yZSB7CitjbGFzcyBS ZXNvdXJjZVJlcXVlc3Q7Cit9CisKK25hbWVzcGFjZSBXZWJLaXQgeworCitjbGFzcyBEcmF3aW5n QXJlYVByb3h5OworY2xhc3MgU3VzcGVuZGVkUGFnZVByb3h5OworY2xhc3MgV2ViRnJhbWVQcm94 eTsKK2NsYXNzIFdlYlBhZ2VQcm94eTsKK2NsYXNzIFdlYlByb2Nlc3NQcm94eTsKKworY2xhc3Mg UHJvdmlzaW9uYWxQYWdlUHJveHkgOiBwdWJsaWMgSVBDOjpNZXNzYWdlUmVjZWl2ZXIgeworICAg IFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOworcHVibGljOgorICAgIFByb3Zpc2lvbmFsUGFnZVBy b3h5KFdlYlBhZ2VQcm94eSYsIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIHN0ZDo6dW5pcXVlX3B0 cjxTdXNwZW5kZWRQYWdlUHJveHk+LCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGJvb2wgaXNTZXJ2 ZXJSZWRpcmVjdCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgUHJvY2Vzc1N3YXBS ZXF1ZXN0ZWRCeUNsaWVudCk7CisgICAgflByb3Zpc2lvbmFsUGFnZVByb3h5KCk7CisKKyAgICBX ZWJQYWdlUHJveHkmIHBhZ2UoKSB7IHJldHVybiBtX3BhZ2U7IH0KKyAgICBXZWJGcmFtZVByb3h5 KiBtYWluRnJhbWUoKSBjb25zdCB7IHJldHVybiBtX21haW5GcmFtZS5nZXQoKTsgfQorICAgIFdl YlByb2Nlc3NQcm94eSYgcHJvY2VzcygpIHsgcmV0dXJuIG1fcHJvY2Vzcy5nZXQoKTsgfQorICAg IFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVu dCgpIGNvbnN0IHsgcmV0dXJuIG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDsgfQorICAg IHVpbnQ2NF90IG5hdmlnYXRpb25JRCgpIGNvbnN0IHsgcmV0dXJuIG1fbmF2aWdhdGlvbklEOyB9 CisKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gdGFrZURyYXdpbmdBcmVh KCk7CisKKyAgICB2b2lkIGxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwg Y29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3Qg U3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNl ckRhdGEsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOwor ICAgIHZvaWQgbG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1Bv bGljeSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRh PiYmID0gV1RGOjpudWxsb3B0KTsKKyAgICB2b2lkIGdvVG9CYWNrRm9yd2FyZEl0ZW0oQVBJOjpO YXZpZ2F0aW9uJiwgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYsIE9wdGlvbmFsPFdlYnNpdGVQb2xp Y2llc0RhdGE+JiYpOworICAgIHZvaWQgY2FuY2VsKCk7CisKK3ByaXZhdGU6CisgICAgLy8gSVBD OjpNZXNzYWdlUmVjZWl2ZXIKKyAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVj dGlvbiYsIElQQzo6RGVjb2RlciYpIGZpbmFsOworICAgIHZvaWQgZGlkUmVjZWl2ZVN5bmNNZXNz YWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYsIHN0ZDo6dW5pcXVlX3B0cjxJUEM6 OkVuY29kZXI+JikgZmluYWw7CisKKyAgICB2b2lkIGRpZENyZWF0ZU1haW5GcmFtZSh1aW50NjRf dCBmcmFtZUlEKTsKKyAgICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWlu dDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiwgVVJMJiYgdW5yZWFj aGFibGVVUkwsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRDb21taXRMb2FkRm9yRnJh bWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcm IG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBm cmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mLCBib29sIGNvbnRh aW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4g Zm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlk RmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNv cmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2 aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJMLCBjb25zdCBXZWJDb3JlOjpS ZXNvdXJjZUVycm9yJiwgY29uc3QgVXNlckRhdGEmKTsKKworICAgIHZvaWQgaW5pdGlhbGl6ZVdl YlBhZ2UoKTsKKworICAgIFdlYlBhZ2VQcm94eSYgbV9wYWdlOworICAgIFJlZjxXZWJQcm9jZXNz UHJveHk+IG1fcHJvY2VzczsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4g bV9kcmF3aW5nQXJlYTsKKyAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9tYWluRnJhbWU7Cisg ICAgdWludDY0X3QgbV9uYXZpZ2F0aW9uSUQ7CisgICAgYm9vbCBtX2lzU2VydmVyUmVkaXJlY3Q7 CisgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IG1fcmVxdWVzdDsKKyAgICBQcm9jZXNzU3dh cFJlcXVlc3RlZEJ5Q2xpZW50IG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDsKKyAgICBi b29sIG1fd2FzQ29tbWl0dGVkIHsgZmFsc2UgfTsKKyAgICBVUkwgbV9wcm92aXNpb25hbExvYWRV Ukw7CisKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIFByb2Nlc3NUaHJvdHRsZXI6OkJh Y2tncm91bmRBY3Rpdml0eVRva2VuIG1fc3VzcGVuc2lvblRva2VuOworI2VuZGlmCit9OworCit9 IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5k ZWRQYWdlUHJveHkuY3BwCmluZGV4IGYxOThhODE1MzNmLi5mZjc2ZDlmN2Y5NyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwCkBAIC0xMDAsNyAr MTAwLDkgQEAgU3VzcGVuZGVkUGFnZVByb3h5Ojp+U3VzcGVuZGVkUGFnZVByb3h5KCkKICAgICAv LyBJZiB0aGUgc3VzcGVuZGVkIHBhZ2Ugd2FzIG5vdCBjb25zdW1lZCBiZWZvcmUgZ2V0dGluZyBk ZXN0cm95ZWQsIHRoZW4gY2xvc2UgdGhlIGNvcnJlc3BvbmRpbmcgcGFnZQogICAgIC8vIG9uIHRo ZSBXZWJQcm9jZXNzIHNpZGUuCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdl OjpDbG9zZSgpLCBtX3BhZ2UucGFnZUlEKCkpOwotICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2Fn ZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwg bV9wYWdlLnBhZ2VJRCgpKTsKKworICAgIGlmIChtX3N1c3BlbnNpb25TdGF0ZSA9PSBTdXNwZW5z aW9uU3RhdGU6OlN1c3BlbmRpbmcpCisgICAgICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJl Y2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9w YWdlLnBhZ2VJRCgpKTsKIAogICAgIC8vIFdlIGNhbGwgbWF5YmVTaHV0RG93bigpIGFzeW5jaHJv bm91c2x5IHNpbmNlIHRoZSBTdXNwZW5kZWRQYWdlIGlzIGN1cnJlbnRseSBiZWluZyByZW1vdmVk IGZyb20gdGhlIFdlYlByb2Nlc3NQb29sCiAgICAgLy8gYW5kIHdlIHdhbnQgdG8gYXZvaWQgcmUt ZW50ZXJpbmcgV2ViUHJvY2Vzc1Bvb2wgbWV0aG9kcy4KQEAgLTEzNCw3ICsxMzYsNiBAQCB2b2lk IFN1c3BlbmRlZFBhZ2VQcm94eTo6dW5zdXNwZW5kKCkKICAgICBBU1NFUlQobV9zdXNwZW5zaW9u U3RhdGUgPT0gU3VzcGVuc2lvblN0YXRlOjpTdXNwZW5kZWQpOwogCiAgICAgbV9zdXNwZW5zaW9u U3RhdGUgPSBTdXNwZW5zaW9uU3RhdGU6OlJlc3VtZWQ7Ci0gICAgbV9wcm9jZXNzLT5yZW1vdmVN ZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFt ZSgpLCBtX3BhZ2UucGFnZUlEKCkpOwogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2Vi UGFnZTo6U2V0SXNTdXNwZW5kZWQoZmFsc2UpLCBtX3BhZ2UucGFnZUlEKCkpOwogfQogCkBAIC0x NTEsNiArMTUyLDggQEAgdm9pZCBTdXNwZW5kZWRQYWdlUHJveHk6OmRpZFByb2Nlc3NSZXF1ZXN0 VG9TdXNwZW5kKFN1c3BlbnNpb25TdGF0ZSBuZXdTdXNwZW5zaW8KICAgICBtX3N1c3BlbnNpb25U b2tlbiA9IG51bGxwdHI7CiAjZW5kaWYKIAorICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJl Y2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9w YWdlLnBhZ2VJRCgpKTsKKwogICAgIGlmIChtX3JlYWR5VG9VbnN1c3BlbmRIYW5kbGVyKQogICAg ICAgICBtX3JlYWR5VG9VbnN1c3BlbmRIYW5kbGVyKHRoaXMpOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcAppbmRleCBjNzdhMjZiNzQyNy4uNTNjNzE5NmMyYWEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCkBAIC0yNyw2ICsy Nyw3IEBACiAjaW5jbHVkZSAiV2ViRnJhbWVQcm94eS5oIgogCiAjaW5jbHVkZSAiQVBJTmF2aWdh dGlvbi5oIgorI2luY2x1ZGUgIlByb3Zpc2lvbmFsUGFnZVByb3h5LmgiCiAjaW5jbHVkZSAiV2Vi Q2VydGlmaWNhdGVJbmZvLmgiCiAjaW5jbHVkZSAiV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5 LmgiCiAjaW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2VzLmgiCkBAIC03NCw3ICs3NSw3IEBAIGJvb2wg V2ViRnJhbWVQcm94eTo6aXNNYWluRnJhbWUoKSBjb25zdAogICAgIGlmICghbV9wYWdlKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICByZXR1cm4gdGhpcyA9PSBtX3BhZ2UtPm1haW5GcmFt ZSgpOworICAgIHJldHVybiB0aGlzID09IG1fcGFnZS0+bWFpbkZyYW1lKCkgfHwgKG1fcGFnZS0+ cHJvdmlzaW9uYWxQYWdlUHJveHkoKSAmJiB0aGlzID09IG1fcGFnZS0+cHJvdmlzaW9uYWxQYWdl UHJveHkoKS0+bWFpbkZyYW1lKCkpOwogfQogCiB2b2lkIFdlYkZyYW1lUHJveHk6OmxvYWRVUkwo Y29uc3QgVVJMJiB1cmwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApp bmRleCAzOTI3NDNiZDU2Ny4uYWQxNTQ3NzE3N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcApAQCAtNzcsNiArNzcsNyBAQAogI2luY2x1ZGUgIlBsdWdpbkluZm9y bWF0aW9uLmgiCiAjaW5jbHVkZSAiUGx1Z2luUHJvY2Vzc01hbmFnZXIuaCIKICNpbmNsdWRlICJQ cmludEluZm8uaCIKKyNpbmNsdWRlICJQcm92aXNpb25hbFBhZ2VQcm94eS5oIgogI2luY2x1ZGUg IlNhZmVCcm93c2luZ1dhcm5pbmcuaCIKICNpbmNsdWRlICJTaGFyZVNoZWV0Q2FsbGJhY2tJRC5o IgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlckRhdGFSZWZlcmVuY2UuaCIKQEAgLTc2OCwzOCArNzY5 LDI1IEBAIGJvb2wgV2ViUGFnZVByb3h5OjpzdXNwZW5kQ3VycmVudFBhZ2VJZlBvc3NpYmxlKEFQ STo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgT3B0CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZv aWQgV2ViUGFnZVByb3h5Ojpzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYg cHJvY2Vzcywgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiBkZXN0aW5hdGlv blN1c3BlbmRlZFBhZ2UsIElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1c3BlbmRlZCkK K3ZvaWQgV2ViUGFnZVByb3h5Ojpzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+ JiYgcHJvY2Vzcywgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+JiYgZHJhd2luZ0Fy ZWEsIFJlZlB0cjxXZWJGcmFtZVByb3h5PiYmIG1haW5GcmFtZSkKIHsKICAgICBBU1NFUlQoIW1f aXNDbG9zZWQpOwogICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgInN3YXBUb1dl YlByb2Nlc3M6IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJv Y2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQpOwogCiAgICAgbV9wcm9jZXNzID0gV1RGTW92ZShw cm9jZXNzKTsKKyAgICBBU1NFUlQoIW1fZHJhd2luZ0FyZWEpOworICAgIG1fZHJhd2luZ0FyZWEg PSBXVEZNb3ZlKGRyYXdpbmdBcmVhKTsKKyAgICBBU1NFUlQoIW1fbWFpbkZyYW1lKTsKKyAgICBt X21haW5GcmFtZSA9IFdURk1vdmUobWFpbkZyYW1lKTsKICAgICBtX2lzVmFsaWQgPSB0cnVlOwog Ci0gICAgLy8gSWYgd2UgYXJlIHJlYXR0YWNoaW5nIHRvIGEgU3VzcGVuZGVkUGFnZSwgdGhlbiB0 aGUgV2ViUHJvY2VzcycgV2ViUGFnZSBhbHJlYWR5IGV4aXN0cyBhbmQKLSAgICAvLyBXZWJQYWdl UHJveHk6OmRpZENyZWF0ZU1haW5GcmFtZSgpIHdpbGwgbm90IGJlIGNhbGxlZCB0byBpbml0aWFs aXplIG1fbWFpbkZyYW1lLiBJbiBzdWNoCi0gICAgLy8gY2FzZSwgd2UgbmVlZCB0byBpbml0aWFs aXplIG1fbWFpbkZyYW1lIHRvIHJlZmxlY3QgdGhlIGZhY3QgdGhlIHRoZSBXZWJQcm9jZXNzJyBX ZWJQYWdlCi0gICAgLy8gYWxyZWFkeSBleGlzdHMgYW5kIGFscmVhZHkgaGFzIGEgbWFpbiBmcmFt ZS4KLSAgICBpZiAoZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlKSB7Ci0gICAgICAgIGlmICghZGVz dGluYXRpb25TdXNwZW5kZWRQYWdlLT5mYWlsZWRUb1N1c3BlbmQoKSkgewotICAgICAgICAgICAg QVNTRVJUKCFtX21haW5GcmFtZSk7Ci0gICAgICAgICAgICBBU1NFUlQoJmRlc3RpbmF0aW9uU3Vz cGVuZGVkUGFnZS0+cHJvY2VzcygpID09IG1fcHJvY2Vzcy5wdHIoKSk7Ci0gICAgICAgICAgICBk ZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPnVuc3VzcGVuZCgpOwotICAgICAgICAgICAgbV9tYWlu RnJhbWUgPSBXZWJGcmFtZVByb3h5OjpjcmVhdGUoKnRoaXMsIGRlc3RpbmF0aW9uU3VzcGVuZGVk UGFnZS0+bWFpbkZyYW1lSUQoKSk7Ci0gICAgICAgICAgICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRl ZChkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPm1haW5GcmFtZUlEKCksICptX21haW5GcmFtZSk7 Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAvLyBXZSBmYWlsZWQgdG8gc3VzcGVuZCB0 aGUgcGFnZSBzbyBkZXN0cm95IGl0IG5vdyBhbmQgbWVyZWx5IHJldXNlIGl0cyBXZWJDb250ZW50 IHByb2Nlc3MuCi0gICAgICAgICAgICBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UgPSBudWxscHRy OwotICAgICAgICB9Ci0gICAgfQotCiAgICAgbV9wcm9jZXNzLT5hZGRFeGlzdGluZ1dlYlBhZ2Uo KnRoaXMsIG1fcGFnZUlELCBXZWJQcm9jZXNzUHJveHk6OkJlZ2luc1VzaW5nRGF0YVN0b3JlOjpO byk7CiAgICAgbV9wcm9jZXNzLT5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQ cm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2VJRCwgKnRoaXMpOwogCi0gICAgZmlu aXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKGlzU3dhcEZyb21TdXNwZW5kZWQpOworICAgIGZpbmlz aEF0dGFjaGluZ1RvV2ViUHJvY2VzcygpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNo QXR0YWNoaW5nVG9XZWJQcm9jZXNzKElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1c3Bl bmRlZCkKK3ZvaWQgV2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoKQog ewogICAgIEFTU0VSVChtX3Byb2Nlc3MtPnN0YXRlKCkgIT0gQ2hpbGRQcm9jZXNzUHJveHk6OlN0 YXRlOjpUZXJtaW5hdGVkKTsKIApAQCAtODM1LDcgKzgyMyw3IEBAIHZvaWQgV2ViUGFnZVByb3h5 OjpmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBG cm9tU3VzCiAgICAgbV9lZGl0YWJsZUltYWdlQ29udHJvbGxlciA9IHN0ZDo6bWFrZV91bmlxdWU8 RWRpdGFibGVJbWFnZUNvbnRyb2xsZXI+KCp0aGlzKTsKICNlbmRpZgogCi0gICAgaW5pdGlhbGl6 ZVdlYlBhZ2UoaXNTd2FwRnJvbVN1c3BlbmRlZCk7CisgICAgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsK IAogICAgIG1faW5zcGVjdG9yLT51cGRhdGVGb3JOZXdQYWdlUHJvY2Vzcyh0aGlzKTsKIApAQCAt OTAwLDEyICs4ODgsMTQgQEAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gV2ViUGFnZVByb3h5Ojpy ZWF0dGFjaFRvV2ViUHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tGb3J3YXIKICAgICByZXR1cm4gV1RG TW92ZShuYXZpZ2F0aW9uKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQ YWdlKElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1c3BlbmRlZCkKK3ZvaWQgV2ViUGFn ZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSgpCiB7CiAgICAgQVNTRVJUKGlzVmFsaWQoKSk7CiAK LSAgICBtX2RyYXdpbmdBcmVhID0gcGFnZUNsaWVudCgpLmNyZWF0ZURyYXdpbmdBcmVhUHJveHko KTsKLSAgICBBU1NFUlQobV9kcmF3aW5nQXJlYSk7CisgICAgaWYgKCFtX2RyYXdpbmdBcmVhKSB7 CisgICAgICAgIG1fZHJhd2luZ0FyZWEgPSBwYWdlQ2xpZW50KCkuY3JlYXRlRHJhd2luZ0FyZWFQ cm94eSgpOworICAgICAgICBBU1NFUlQobV9kcmF3aW5nQXJlYSk7CisgICAgfQogCiAjaWYgRU5B QkxFKEFTWU5DX1NDUk9MTElORykgJiYgUExBVEZPUk0oQ09DT0EpCiAgICAgaWYgKG1fZHJhd2lu Z0FyZWEtPnR5cGUoKSA9PSBEcmF3aW5nQXJlYVR5cGVSZW1vdGVMYXllclRyZWUpIHsKQEAgLTkx NywxNCArOTA3LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKElzU3dh cEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1c3BlbmRlZCkKICAgICB9CiAjZW5kaWYKIAotICAg IGF1dG8gcGFyYW1ldGVycyA9IGNyZWF0aW9uUGFyYW1ldGVycygpOwotICAgIHBhcmFtZXRlcnMu aXNTd2FwRnJvbVN1c3BlbmRlZCA9IGlzU3dhcEZyb21TdXNwZW5kZWQgPT0gSXNTd2FwRnJvbVN1 c3BlbmRlZDo6WWVzOwotCi0jaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQotICAgIHBhcmFtZXRl cnMuaGFzUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXJzID0gcHJvY2VzcygpLnByb2Nlc3NQb29sKCku bWF5SGF2ZVJlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyhtX3dlYnNpdGVEYXRhU3RvcmUpOwotI2Vu ZGlmCi0KLSAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6Q3JlYXRlV2Vi UGFnZShtX3BhZ2VJRCwgcGFyYW1ldGVycyksIDApOworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3Nh Z2VzOjpXZWJQcm9jZXNzOjpDcmVhdGVXZWJQYWdlKG1fcGFnZUlELCBjcmVhdGlvblBhcmFtZXRl cnMoKSksIDApOwogCiAgICAgbV9uZWVkc1RvRmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVy UHJvY2Vzc0xhdW5jaCA9IHRydWU7CiAgICAgZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVy UHJvY2Vzc0xhdW5jaCgpOwpAQCAtMTA3Niw3ICsxMDU5LDggQEAgdm9pZCBXZWJQYWdlUHJveHk6 OmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBS ZXNvdXIKICAgICBhdXRvIHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9u KCk7CiAKICAgICBhdXRvIHVybCA9IHJlcXVlc3QudXJsKCk7Ci0gICAgbV9wYWdlTG9hZFN0YXRl LnNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCB1cmwpOworICAgIGlmIChzaG91 bGRUcmVhdEFzQ29udGludWluZ0xvYWQgIT0gU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZ ZXMpCisgICAgICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFu c2FjdGlvbiwgdXJsKTsKIAogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICByZWF0dGFjaFRv V2ViUHJvY2VzcygpOwpAQCAtMjY5Nyw3ICsyNjgxLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJl Y2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rp b24KICAgICAgICAgfQogCiAgICAgICAgIGlmIChwcm9jZXNzRm9yTmF2aWdhdGlvbi5wdHIoKSAh PSAmcHJvY2VzcygpKSB7Ci0gICAgICAgICAgICBwb2xpY3lBY3Rpb24gPSBpc1BhZ2VPcGVuZWRC eURPTVNob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpID8gV2ViUG9saWN5QWN0aW9uOjpJZ25v cmUgOiBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQ7CisgICAgICAgICAgICBwb2xpY3lBY3Rpb24g PSBXZWJQb2xpY3lBY3Rpb246Oklnbm9yZTsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FM TE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiwg c3dhcHBpbmcgcHJvY2VzcyAlaSB3aXRoIHByb2Nlc3MgJWkgZm9yIG5hdmlnYXRpb24sIHJlYXNv bjogJXtwdWJsaWN9cyIsIHByb2Nlc3NJZGVudGlmaWVyKCksIHByb2Nlc3NGb3JOYXZpZ2F0aW9u LT5wcm9jZXNzSWRlbnRpZmllcigpLCByZWFzb24udXRmOCgpLmRhdGEoKSk7CiAgICAgICAgICAg ICBMT0coUHJvY2Vzc1N3YXBwaW5nLCAiKFByb2Nlc3NTd2FwcGluZykgU3dpdGNoaW5nIGZyb20g cHJvY2VzcyAlaSB0byBuZXcgcHJvY2VzcyAoJWkpIGZvciBuYXZpZ2F0aW9uICUiIFBSSXU2NCAi ICclcyciLCBwcm9jZXNzSWRlbnRpZmllcigpLCBwcm9jZXNzRm9yTmF2aWdhdGlvbi0+cHJvY2Vz c0lkZW50aWZpZXIoKSwgbmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24tPmxv Z2dpbmdTdHJpbmcoKSk7CiAgICAgICAgIH0gZWxzZQpAQCAtMjc0MywyNCArMjcyNyw0MCBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6cmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihXZWJQb2xpY3lBY3Rpb24g YWN0aW9uLCBBUEk6Ok5hdmlnYXRpbwogICAgIHNlbmRlci0+c2VuZChhY3Rpb24sIG5hdmlnYXRp b24gPyBuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSA6IDAsIGRvd25sb2FkSUQsIFdURk1vdmUo d2Vic2l0ZVBvbGljaWVzKSk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojpjb250aW51ZU5hdmln YXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBzdGQ6OnVuaXF1 ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmIHN1c3BlbmRlZFBhZ2VQcm94eSwgUmVmPFdlYlBy b2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYg d2Vic2l0ZVBvbGljaWVzKQordm9pZCBXZWJQYWdlUHJveHk6OmNvbW1pdFByb3Zpc2lvbmFsUGFn ZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYg bWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90IGZy YW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYgY2VydGlmaWNhdGVJ bmZvLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0lu c2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYg dXNlckRhdGEpCiB7Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiY29udGlu dWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0 LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKLSAgICBMT0coTG9h ZGluZywgIkNvbnRpbnVpbmcgbmF2aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMnIGluIGEgbmV3IHdl YiBwcm9jZXNzIiwgbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi5sb2dnaW5n U3RyaW5nKCkpOworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFnZSk7CiAKLSAgICBSZWY8V2Vi UHJvY2Vzc1Byb3h5PiBwcmV2aW91c1Byb2Nlc3MgPSBtX3Byb2Nlc3MuY29weVJlZigpOwotICAg IE9wdGlvbmFsPHVpbnQ2NF90PiBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzID0gbV9tYWlu RnJhbWUgPyBtYWtlT3B0aW9uYWwobV9tYWluRnJhbWUtPmZyYW1lSUQoKSkgOiBXVEY6Om51bGxv cHQ7Ci0gICAgYXV0byBtYWluRnJhbWVVUkwgPSBtX21haW5GcmFtZSA/IG1fbWFpbkZyYW1lLT51 cmwoKSA6IFVSTCgpOworICAgIE9wdGlvbmFsPHVpbnQ2NF90PiBtYWluRnJhbWVJREluUHJldmlv dXNQcm9jZXNzID0gbWFpbkZyYW1lKCkgPyBtYWtlT3B0aW9uYWwobWFpbkZyYW1lKCktPmZyYW1l SUQoKSkgOiBXVEY6Om51bGxvcHQ7CisgICAgcHJvY2Vzc0RpZFRlcm1pbmF0ZShQcm9jZXNzVGVy bWluYXRpb25SZWFzb246Ok5hdmlnYXRpb25Td2FwKTsKKyAgICBwcm9jZXNzKCkucmVtb3ZlTWVz c2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUo KSwgcGFnZUlEKCkpOwogCi0gICAgQVNTRVJUKG1fcHJvY2Vzcy5wdHIoKSAhPSBwcm9jZXNzLnB0 cigpKTsKKyAgICBhdXRvKiBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlv bihtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkpOworICAgIGJvb2wgZGlkU3VzcGVu ZFByZXZpb3VzUGFnZSA9IG5hdmlnYXRpb24gPyBzdXNwZW5kQ3VycmVudFBhZ2VJZlBvc3NpYmxl KCpuYXZpZ2F0aW9uLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzLCBtX3Byb3Zpc2lvbmFs UGFnZS0+cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCgpKSA6IGZhbHNlOworICAgIC8vIFRo ZXJlIGlzIG5vIHdheSB3ZSdsbCBiZSBhYmxlIHRvIHJldHVybiB0byB0aGUgcGFnZSBpbiB0aGUg cHJldmlvdXMgcGFnZSBzbyBjbG9zZSBpdC4KKyAgICBpZiAoIWRpZFN1c3BlbmRQcmV2aW91c1Bh Z2UpCisgICAgICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpDbG9zZSgpLCBw YWdlSUQoKSk7CiAKLSAgICBwcm9jZXNzRGlkVGVybWluYXRlKFByb2Nlc3NUZXJtaW5hdGlvblJl YXNvbjo6TmF2aWdhdGlvblN3YXApOworICAgIHByb2Nlc3MoKS5yZW1vdmVXZWJQYWdlKCp0aGlz LCBwYWdlSUQoKSwgV2ViUHJvY2Vzc1Byb3h5OjpFbmRzVXNpbmdEYXRhU3RvcmU6Ok5vKTsKKyAg ICBzd2FwVG9XZWJQcm9jZXNzKG1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCksIG1fcHJvdmlz aW9uYWxQYWdlLT50YWtlRHJhd2luZ0FyZWEoKSwgbV9wcm92aXNpb25hbFBhZ2UtPm1haW5GcmFt ZSgpKTsKIAotICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlSUQpOwotICAgIGJvb2wg ZGlkU3VzcGVuZFByZXZpb3VzUGFnZSA9IHN1c3BlbmRDdXJyZW50UGFnZUlmUG9zc2libGUobmF2 aWdhdGlvbiwgbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcywgcHJvY2Vzc1N3YXBSZXF1ZXN0 ZWRCeUNsaWVudCk7Ci0gICAgbV9wcm9jZXNzLT5yZW1vdmVXZWJQYWdlKCp0aGlzLCBtX3BhZ2VJ RCwgV2ViUHJvY2Vzc1Byb3h5OjpFbmRzVXNpbmdEYXRhU3RvcmU6Ok5vKTsKKyAgICBkaWRDb21t aXRMb2FkRm9yRnJhbWUoZnJhbWVJRCwgbmF2aWdhdGlvbklELCBtaW1lVHlwZSwgZnJhbWVIYXND dXN0b21Db250ZW50UHJvdmlkZXIsIGZyYW1lTG9hZFR5cGUsIGNlcnRpZmljYXRlSW5mbywgY29u dGFpbnNQbHVnaW5Eb2N1bWVudCwgZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCB1c2VyRGF0YSk7 CisKKyAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7Cit9CisKK3ZvaWQgV2ViUGFnZVBy b3h5Ojpjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpOYXZpZ2F0aW9uJiBuYXZp Z2F0aW9uLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmIHN1c3BlbmRlZFBh Z2VQcm94eSwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBuZXdQcm9jZXNzLCBQcm9jZXNzU3dhcFJl cXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIE9wdGlvbmFsPFdl YnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQoreworICAgIFJFTEVBU0VfTE9H X0lGX0FMTE9XRUQoTG9hZGluZywgImNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2Vzczogd2Vi UElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmll cigpLCBtX3BhZ2VJRCk7CisgICAgTE9HKExvYWRpbmcsICJDb250aW51aW5nIG5hdmlnYXRpb24g JSIgUFJJdTY0ICIgJyVzJyBpbiBhIG5ldyB3ZWIgcHJvY2VzcyIsIG5hdmlnYXRpb24ubmF2aWdh dGlvbklEKCksIG5hdmlnYXRpb24ubG9nZ2luZ1N0cmluZygpKTsKKworICAgIGlmIChtX3Byb3Zp c2lvbmFsUGFnZSkgeworICAgICAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UtPm5hdmlnYXRpb25J RCgpICE9IG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCkpCisgICAgICAgICAgICBtX3Byb3Zpc2lv bmFsUGFnZS0+Y2FuY2VsKCk7CisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlID0gbnVsbHB0cjsK KyAgICB9CiAKLSAgICBzd2FwVG9XZWJQcm9jZXNzKFdURk1vdmUocHJvY2VzcyksIFdURk1vdmUo c3VzcGVuZGVkUGFnZVByb3h5KSwgZGlkU3VzcGVuZFByZXZpb3VzUGFnZSA/IElzU3dhcEZyb21T dXNwZW5kZWQ6OlllcyA6IElzU3dhcEZyb21TdXNwZW5kZWQ6Ok5vKTsKKyAgICBtX3Byb3Zpc2lv bmFsUGFnZSA9IHN0ZDo6bWFrZV91bmlxdWU8UHJvdmlzaW9uYWxQYWdlUHJveHk+KCp0aGlzLCBu ZXdQcm9jZXNzLmNvcHlSZWYoKSwgV1RGTW92ZShzdXNwZW5kZWRQYWdlUHJveHkpLCBuYXZpZ2F0 aW9uLm5hdmlnYXRpb25JRCgpLCBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0SXNSZWRpcmVjdCgp LCBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCksIHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGll bnQpOwogCiAgICAgaWYgKGF1dG8qIGl0ZW0gPSBuYXZpZ2F0aW9uLnRhcmdldEl0ZW0oKSkgewog ICAgICAgICBMT0coTG9hZGluZywgIldlYlBhZ2VQcm94eSAlcCBjb250aW51ZU5hdmlnYXRpb25J bk5ld1Byb2Nlc3MgdG8gYmFjayBpdGVtIFVSTCAlcyIsIHRoaXMsIGl0ZW0tPnVybCgpLnV0Zjgo KS5kYXRhKCkpOwpAQCAtMjc2OCw2NyArMjc2OCwyMiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Y29u dGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwg cwogICAgICAgICBhdXRvIHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9u KCk7CiAgICAgICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFu c2FjdGlvbiwgaXRlbS0+dXJsKCkpOwogCi0gICAgICAgIGF1dG8gaXRlbVN0YXRlcyA9IG1fYmFj a0ZvcndhcmRMaXN0LT5maWx0ZXJlZEl0ZW1TdGF0ZXMoW3RoaXMsIHRhcmdldEl0ZW0gPSBpdGVt XShXZWJCYWNrRm9yd2FyZExpc3RJdGVtJiBpdGVtKSB7Ci0gICAgICAgICAgICBpZiAoYXV0byog cGFnZSA9IGl0ZW0uc3VzcGVuZGVkUGFnZSgpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKCZwYWdl LT5wcm9jZXNzKCkgPT0gbV9wcm9jZXNzLnB0cigpKQotICAgICAgICAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICByZXR1cm4gJml0ZW0gIT0gdGFy Z2V0SXRlbTsKLSAgICAgICAgfSk7Ci0gICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6VXBkYXRlQmFja0ZvcndhcmRMaXN0Rm9yUmVhdHRhY2goV1RGTW92ZShpdGVtU3Rh dGVzKSksIG1fcGFnZUlEKTsKLSAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQ YWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtKG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIGl0ZW0t Pml0ZW1JRCgpLCAqbmF2aWdhdGlvbi5iYWNrRm9yd2FyZEZyYW1lTG9hZFR5cGUoKSwgU2hvdWxk VHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSksIG1f cGFnZUlEKTsKLSAgICAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQo KTsKLQorICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZS0+Z29Ub0JhY2tGb3J3YXJkSXRlbShuYXZp Z2F0aW9uLCAqaXRlbSwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KIAogICAgIGlmIChtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKSAmJiAo bmF2aWdhdGlvbi5sb2NrQmFja0ZvcndhcmRMaXN0KCkgPT0gTG9ja0JhY2tGb3J3YXJkTGlzdDo6 WWVzIHx8IG5hdmlnYXRpb24ubG9ja0hpc3RvcnkoKSA9PSBMb2NrSGlzdG9yeTo6WWVzKSkgewog ICAgICAgICAvLyBJZiBXZWJDb3JlIGlzIHN1cHBvc2VkIHRvIGxvY2sgdGhlIGhpc3RvcnkgZm9y IHRoaXMgbG9hZCwgdGhlbiB0aGUgbmV3IHByb2Nlc3MgbmVlZHMgdG8ga25vdyBhYm91dCB0aGUg Y3VycmVudCBoaXN0b3J5IGl0ZW0gc28gaXQgY2FuIHVwZGF0ZQogICAgICAgICAvLyBpdCBpbnN0 ZWFkIG9mIGNyZWF0aW5nIGEgbmV3IG9uZS4KLSAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlOjpTZXRDdXJyZW50SGlzdG9yeUl0ZW1Gb3JSZWF0dGFjaChtX2JhY2tGb3J3 YXJkTGlzdC0+Y3VycmVudEl0ZW0oKS0+aXRlbVN0YXRlKCkpLCBtX3BhZ2VJRCk7CisgICAgICAg IG5ld1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldEN1cnJlbnRIaXN0b3J5SXRl bUZvclJlYXR0YWNoKG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50SXRlbSgpLT5pdGVtU3RhdGUo KSksIG1fcGFnZUlEKTsKICAgICB9CiAKICAgICAvLyBGSVhNRTogV29yayBvdXQgdGltaW5nIG9m IHJlc3BvbmRpbmcgd2l0aCB0aGUgbGFzdCBwb2xpY3kgZGVsZWdhdGUsIGV0YwogICAgIEFTU0VS VCghbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpLmlzRW1wdHkoKSk7CiAgICAgaWYgKGF1dG8m IHN1YnN0aXR1dGVEYXRhID0gbmF2aWdhdGlvbi5zdWJzdGl0dXRlRGF0YSgpKQotICAgICAgICBs b2FkRGF0YVdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIHsgc3Vic3RpdHV0ZURhdGEtPmNvbnRl bnQuZGF0YSgpLCBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5zaXplKCkgfSwgc3Vic3RpdHV0ZURh dGEtPk1JTUVUeXBlLCBzdWJzdGl0dXRlRGF0YS0+ZW5jb2RpbmcsIHN1YnN0aXR1dGVEYXRhLT5i YXNlVVJMLCBzdWJzdGl0dXRlRGF0YS0+dXNlckRhdGEuZ2V0KCksIFNob3VsZFRyZWF0QXNDb250 aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOworICAgICAgICBtX3By b3Zpc2lvbmFsUGFnZS0+bG9hZERhdGFXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCB7IHN1YnN0 aXR1dGVEYXRhLT5jb250ZW50LmRhdGEoKSwgc3Vic3RpdHV0ZURhdGEtPmNvbnRlbnQuc2l6ZSgp IH0sIHN1YnN0aXR1dGVEYXRhLT5NSU1FVHlwZSwgc3Vic3RpdHV0ZURhdGEtPmVuY29kaW5nLCBz dWJzdGl0dXRlRGF0YS0+YmFzZVVSTCwgc3Vic3RpdHV0ZURhdGEtPnVzZXJEYXRhLmdldCgpLCBX VEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOwogICAgIGVsc2UKLSAgICAgICAgbG9hZFJlcXVlc3RX aXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCBSZXNvdXJjZVJlcXVlc3QgeyBuYXZpZ2F0aW9uLmN1 cnJlbnRSZXF1ZXN0KCkgfSwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6 U2hvdWxkQWxsb3dFeHRlcm5hbFNjaGVtZXMsIG51bGxwdHIsIFNob3VsZFRyZWF0QXNDb250aW51 aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOwotCi0gICAgQVNTRVJUKCFt X21haW5GcmFtZSk7Ci0gICAgbV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIgPSBbdGhpcywgd2Vh a1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyksIG5hdmlnYXRpb25JRCA9IG5hdmlnYXRpb24ubmF2 aWdhdGlvbklEKCksIHJlcXVlc3QgPSAgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpLCBtYWlu RnJhbWVVUkwsIGlzU2VydmVyUmVkaXJlY3QgPSBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0SXNS ZWRpcmVjdCgpXSgpIG11dGFibGUgewotICAgICAgICBpZiAoIXdlYWtUaGlzKQotICAgICAgICAg ICAgcmV0dXJuOwotCi0gICAgICAgIEFTU0VSVChtX21haW5GcmFtZSk7Ci0gICAgICAgIC8vIFRo aXMgbmF2aWdhdGlvbiB3YXMgZGVzdHJveWVkIHNvIG5vIG5lZWQgdG8gbm90aWZ5IG9mIHJlZGly ZWN0LgotICAgICAgICBpZiAoIW5hdmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRpb24obmF2aWdhdGlv bklEKSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICAvLyBSZXN0b3JlIHRoZSBtYWlu IGZyYW1lJ3MgY29tbWl0dGVkIFVSTCBhcyBzb21lIGNsaWVudHMgbWF5IHJlbHkgb24gaXQgdW50 aWwgdGhlIG5leHQgbG9hZCBpcyBjb21taXR0ZWQuCi0gICAgICAgIG1fbWFpbkZyYW1lLT5mcmFt ZUxvYWRTdGF0ZSgpLnNldFVSTChtYWluRnJhbWVVUkwpOwotCi0gICAgICAgIC8vIE5vcm1hbGx5 LCBub3RpZmljYXRpb24gb2YgYSBzZXJ2ZXIgcmVkaXJlY3QgY29tZXMgZnJvbSB0aGUgV2ViQ29u dGVudCBwcm9jZXNzLgotICAgICAgICAvLyBJZiB3ZSBhcmUgcHJvY2VzcyBzd2FwcGluZyBpbiBy ZXNwb25zZSB0byBhIHNlcnZlciByZWRpcmVjdCB0aGVuIHRoYXQgbm90aWZpY2F0aW9uIHdpbGwg bm90IGNvbWUgZnJvbSB0aGUgbmV3IFdlYkNvbnRlbnQgcHJvY2Vzcy4KLSAgICAgICAgLy8gSW4g dGhpcyBjYXNlIHdlIGhhdmUgdGhlIFVJUHJvY2VzcyBzeW50aGVzaXplIHRoZSByZWRpcmVjdCBu b3RpZmljYXRpb24gYXQgdGhlIGFwcHJvcHJpYXRlIHRpbWUuCi0gICAgICAgIGlmIChpc1NlcnZl clJlZGlyZWN0KSB7Ci0gICAgICAgICAgICBtX21haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5k aWRTdGFydFByb3Zpc2lvbmFsTG9hZChyZXF1ZXN0LnVybCgpKTsKLSAgICAgICAgICAgIGRpZFJl Y2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKG1fbWFpbkZyYW1l LT5mcmFtZUlEKCksIG5hdmlnYXRpb25JRCwgV1RGTW92ZShyZXF1ZXN0KSwgeyB9KTsKLSAgICAg ICAgfQotICAgIH07Ci0KLSAgICBpZiAoIW1fcHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKS5jb25maWd1 cmF0aW9uKCkucHJvY2Vzc1N3YXBzT25XaW5kb3dPcGVuV2l0aE9wZW5lcigpIHx8ICFpc1BhZ2VP cGVuZWRCeURPTVNob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpIHx8ICFtYWluRnJhbWVJRElu UHJldmlvdXNQcm9jZXNzKSB7Ci0gICAgICAgIC8vIFRoZXJlIGlzIG5vIHdheSB3ZSdsbCBiZSBh YmxlIHRvIHJldHVybiB0byB0aGUgcGFnZSBpbiB0aGUgcHJldmlvdXMgcGFnZSBzbyBjbG9zZSBp dC4KLSAgICAgICAgaWYgKCFkaWRTdXNwZW5kUHJldmlvdXNQYWdlKQotICAgICAgICAgICAgcHJl dmlvdXNQcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpDbG9zZSgpLCBtX3BhZ2VJRCk7 Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBtX21haW5GcmFtZVdpbmRvd0NyZWF0aW9u SGFuZGxlciA9IFt0aGlzLCBwcmV2aW91c1Byb2Nlc3MgPSBXVEZNb3ZlKHByZXZpb3VzUHJvY2Vz cyksIG1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MgPSAqbWFpbkZyYW1lSURJblByZXZpb3Vz UHJvY2Vzc10oY29uc3QgR2xvYmFsV2luZG93SWRlbnRpZmllciYgd2luZG93SWRlbnRpZmllcikg ewotICAgICAgICBBU1NFUlQobV9tYWluRnJhbWUpOwotICAgICAgICBHbG9iYWxGcmFtZUlkZW50 aWZpZXIgbmF2aWdhdGVkRnJhbWVJZGVudGlmaWVySW5OZXdQcm9jZXNzIHsgcGFnZUlEKCksIG1f bWFpbkZyYW1lLT5mcmFtZUlEKCkgfTsKLSAgICAgICAgcHJldmlvdXNQcm9jZXNzLT5zZW5kKE1l c3NhZ2VzOjpXZWJQYWdlOjpGcmFtZUJlY2FtZVJlbW90ZShtYWluRnJhbWVJREluUHJldmlvdXNQ cm9jZXNzLCBuYXZpZ2F0ZWRGcmFtZUlkZW50aWZpZXJJbk5ld1Byb2Nlc3MsIHdpbmRvd0lkZW50 aWZpZXIpLCBwYWdlSUQoKSk7Ci0gICAgfTsKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UtPmxv YWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgUmVzb3VyY2VSZXF1ZXN0IHsgbmF2 aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpIH0sIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVS THNQb2xpY3k6OlNob3VsZEFsbG93RXh0ZXJuYWxTY2hlbWVzLCBudWxscHRyLCBXVEZNb3ZlKHdl YnNpdGVQb2xpY2llcykpOwogfQogCiBib29sIFdlYlBhZ2VQcm94eTo6aXNQYWdlT3BlbmVkQnlE T01TaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSBjb25zdApAQCAtMzY5MywxMSArMzY0OCw2 IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUodWludDY0X3QgZnJhbWVJ RCkKIAogICAgIC8vIEFkZCB0aGUgZnJhbWUgdG8gdGhlIHByb2Nlc3Mgd2lkZSBtYXAuCiAgICAg bV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoZnJhbWVJRCwgKm1fbWFpbkZyYW1lKTsKLQotICAgIGlm IChtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlcikgewotICAgICAgICBtX21haW5GcmFtZUNyZWF0 aW9uSGFuZGxlcigpOwotICAgICAgICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlciA9IG51bGxw dHI7Ci0gICAgfQogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlU3ViZnJhbWUodWlu dDY0X3QgZnJhbWVJRCkKQEAgLTM3MjIsMTAgKzM2NzIsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 ZGlkQ3JlYXRlU3ViZnJhbWUodWludDY0X3QgZnJhbWVJRCkKIAogdm9pZCBXZWJQYWdlUHJveHk6 OmRpZENyZWF0ZVdpbmRvdyh1aW50NjRfdCBmcmFtZUlELCBHbG9iYWxXaW5kb3dJZGVudGlmaWVy JiYgd2luZG93SWRlbnRpZmllcikKIHsKLSAgICBpZiAobV9tYWluRnJhbWUgJiYgbV9tYWluRnJh bWUtPmZyYW1lSUQoKSA9PSBmcmFtZUlEKSB7Ci0gICAgICAgIGlmIChhdXRvIG1haW5GcmFtZVdp bmRvd0NyZWF0aW9uSGFuZGxlciA9IFdURk1vdmUobV9tYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhh bmRsZXIpKQotICAgICAgICAgICAgbWFpbkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyKHdpbmRv d0lkZW50aWZpZXIpOwotICAgIH0KIH0KIAogZG91YmxlIFdlYlBhZ2VQcm94eTo6ZXN0aW1hdGVk UHJvZ3Jlc3MoKSBjb25zdApAQCAtMzc3OCw2ICszNzI0LDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5 OjpkaWREZXN0cm95TmF2aWdhdGlvbih1aW50NjRfdCBuYXZpZ2F0aW9uSUQpCiB7CiAgICAgUGFn ZUNsaWVudFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAorICAgIC8vIE9uIHBy b2Nlc3Mtc3dhcCwgdGhlIHByZXZpb3VzIHByb2Nlc3MgdHJpZXMgdG8gZGVzdHJveSB0aGUgbmF2 aWdhdGlvbiBidXQgdGhlIHByb3Zpc2lvbmFsIHByb2Nlc3MgaXMgYWN0dWFsbHkgdGFraW5nIG92 ZXIgdGhlIG5hdmlnYXRpb24uCisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlICYmIG1fcHJvdmlz aW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSA9PSBuYXZpZ2F0aW9uSUQpCisgICAgICAgIHJldHVy bjsKKwogICAgIC8vIEZJWE1FOiBNZXNzYWdlIGNoZWNrIHRoZSBuYXZpZ2F0aW9uSUQuCiAgICAg bV9uYXZpZ2F0aW9uU3RhdGUtPmRpZERlc3Ryb3lOYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCk7CiB9 CkBAIC0zNzk1LDE0ICszNzQ1LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlz aW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmEKICAgICBpZiAo ZnJhbWUtPmlzTWFpbkZyYW1lKCkgJiYgbmF2aWdhdGlvbklEKQogICAgICAgICBuYXZpZ2F0aW9u ID0gbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpOwogCi0gICAgLy8g SWYgdGhpcyBzZWVtaW5nbHkgbmV3IGxvYWQgaXMgYWN0dWFsbHkgY29udGludWluZyBhIHNlcnZl ciByZWRpcmVjdCBmb3IgYSBwcmV2aW91cyBuYXZpZ2F0aW9uIGluIGEgbmV3IHByb2Nlc3MsCi0g ICAgLy8gdGhlbiB3ZSBpZ25vcmUgdGhpcyBub3RpZmljYXRpb24uCi0gICAgaWYgKG5hdmlnYXRp b24gJiYgbmF2aWdhdGlvbi0+Y3VycmVudFJlcXVlc3RJc1JlZGlyZWN0KCkpIHsKLSAgICAgICAg YXV0byBuYXZpZ2F0aW9uUHJvY2Vzc0lkZW50aWZpZXIgPSBuYXZpZ2F0aW9uLT5jdXJyZW50UmVx dWVzdFByb2Nlc3NJZGVudGlmaWVyKCk7Ci0gICAgICAgIGlmIChuYXZpZ2F0aW9uUHJvY2Vzc0lk ZW50aWZpZXIgJiYgKm5hdmlnYXRpb25Qcm9jZXNzSWRlbnRpZmllciAhPSBtX3Byb2Nlc3MtPmNv cmVQcm9jZXNzSWRlbnRpZmllcigpKQotICAgICAgICAgICAgcmV0dXJuOwotICAgIH0KLQogICAg IExPRyhMb2FkaW5nLCAiV2ViUGFnZVByb3h5ICUiIFBSSXU2NCAiIGluIHByb2Nlc3MgcGlkICVp IGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUgdG8gZnJhbWVJRCAlIiBQUkl1NjQgIiwg bmF2aWdhdGlvbklEICUiIFBSSXU2NCAiLCB1cmwgJXMiLCBtX3BhZ2VJRCwgbV9wcm9jZXNzLT5w cm9jZXNzSWRlbnRpZmllcigpLCBmcmFtZUlELCBuYXZpZ2F0aW9uSUQsIHVybC5zdHJpbmcoKS51 dGY4KCkuZGF0YSgpKTsKICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJkaWRT dGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJ dTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIo KSwgbV9wYWdlSUQsIGZyYW1lSUQpOwogCkBAIC0zOTEwLDYgKzM4NTIsMTEgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlE LCBjb25zdCBTZWN1cmkKIAogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VD bGllbnQoKSk7CiAKKyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UgJiYgbV9wcm92aXNpb25hbFBh Z2UtPm5hdmlnYXRpb25JRCgpID09IG5hdmlnYXRpb25JRCAmJiAmbV9wcm92aXNpb25hbFBhZ2Ut PnByb2Nlc3MoKSAhPSBtX3Byb2Nlc3MucHRyKCkpIHsKKyAgICAgICAgLy8gVGhlIGxvYWQgZGlk IG5vdCBmYWlsLCBpdCBtZXJlbHkgaGFwcGVuaW5nIGluIGEgbmV3IHByb3Zpc2lvbmFsIHByb2Nl c3MuCisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9 IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7CiAgICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7 CiAKQEAgLTM5NDgsNiArMzg5NSwxMCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zp c2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaQogICAgIH0K IAogICAgIG1fZmFpbGluZ1Byb3Zpc2lvbmFsTG9hZFVSTCA9IHsgfTsKKworICAgIC8vIElmIHRo ZSBwcm92aXNpb25hbCBwYWdlJ3MgbG9hZCBmYWlscyB0aGVuIHdlIGRlc3Ryb3kgdGhlIHByb3Zp c2lvbmFsIHBhZ2UuCisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlICYmIG1fcHJvdmlzaW9uYWxQ YWdlLT5tYWluRnJhbWUoKSA9PSBmcmFtZSkKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBu dWxscHRyOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6Y2xlYXJMb2FkRGVwZW5kZW50Q2FsbGJh Y2tzKCkKQEAgLTQzMzksOCArNDI5MCw4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xp Y3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmModWludDY0X3QgZnJhbWVJRCwgV2ViQ29yCiAgICAg YXV0byogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwogICAgIE1FU1NBR0Vf Q0hFQ0soZnJhbWUpOwogCi0gICAgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbigqZnJh bWUsIFdURk1vdmUoZnJhbWVTZWN1cml0eU9yaWdpbiksIG5hdmlnYXRpb25JRCwgV1RGTW92ZShu YXZpZ2F0aW9uQWN0aW9uRGF0YSksIFdURk1vdmUoZnJhbWVJbmZvRGF0YSksIG9yaWdpbmF0aW5n UGFnZUlELCBvcmlnaW5hbFJlcXVlc3QsIFdURk1vdmUocmVxdWVzdCksIFdURk1vdmUocmVxdWVz dEJvZHkpLCBXVEZNb3ZlKHJlZGlyZWN0UmVzcG9uc2UpLCB1c2VyRGF0YSwgUG9saWN5RGVjaXNp b25TZW5kZXI6OmNyZWF0ZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBm cmFtZUlELCBsaXN0ZW5lcklEXSAoYXV0by4uLiBhcmdzKSB7Ci0gICAgICAgIG1fcHJvY2Vzcy0+ c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQs IGxpc3RlbmVySUQsIGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CisgICAgZGVjaWRlUG9saWN5Rm9yTmF2 aWdhdGlvbkFjdGlvbigqZnJhbWUsIFdURk1vdmUoZnJhbWVTZWN1cml0eU9yaWdpbiksIG5hdmln YXRpb25JRCwgV1RGTW92ZShuYXZpZ2F0aW9uQWN0aW9uRGF0YSksIFdURk1vdmUoZnJhbWVJbmZv RGF0YSksIG9yaWdpbmF0aW5nUGFnZUlELCBvcmlnaW5hbFJlcXVlc3QsIFdURk1vdmUocmVxdWVz dCksIFdURk1vdmUocmVxdWVzdEJvZHkpLCBXVEZNb3ZlKHJlZGlyZWN0UmVzcG9uc2UpLCB1c2Vy RGF0YSwgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9 IG1ha2VSZWYoKnRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklELCBwcm9jZXNzID0gbV9wcm9jZXNz LmNvcHlSZWYoKV0gKGF1dG8uLi4gYXJncykgeworICAgICAgICBwcm9jZXNzLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlOjpEaWRSZWNlaXZlUG9saWN5RGVjaXNpb24oZnJhbWVJRCwgbGlzdGVuZXJJ RCwgYXJncy4uLiksIG1fcGFnZUlEKTsKICAgICB9KSk7CiB9CiAKQEAgLTQ1NzQsMTIgKzQ1MjUs MTIgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlKHVpbnQ2NF90 IGZyYW1lSUQsIGNvbnN0IFNlY3VyaXR5T3JpZ2kKICAgICBNRVNTQUdFX0NIRUNLX1VSTChyZXNw b25zZS51cmwoKSk7CiAKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBuYXZpZ2F0aW9uID0g bmF2aWdhdGlvbklEID8gbV9uYXZpZ2F0aW9uU3RhdGUtPm5hdmlnYXRpb24obmF2aWdhdGlvbklE KSA6IG51bGxwdHI7Ci0gICAgYXV0byBsaXN0ZW5lciA9IG1ha2VSZWYoZnJhbWUtPnNldFVwUG9s aWN5TGlzdGVuZXJQcm94eShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBm cmFtZUlELCBsaXN0ZW5lcklELCBuYXZpZ2F0aW9uID0gV1RGTW92ZShuYXZpZ2F0aW9uKV0gKFdl YlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwgUHJvY2Vz c1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBSZWZQ dHI8U2FmZUJyb3dzaW5nV2FybmluZz4mJiBzYWZlQnJvd3NpbmdXYXJuaW5nKSBtdXRhYmxlIHsK KyAgICBhdXRvIGxpc3RlbmVyID0gbWFrZVJlZihmcmFtZS0+c2V0VXBQb2xpY3lMaXN0ZW5lclBy b3h5KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxpc3Rl bmVySUQsIG5hdmlnYXRpb24gPSBXVEZNb3ZlKG5hdmlnYXRpb24pLCBwcm9jZXNzID0gbV9wcm9j ZXNzLmNvcHlSZWYoKV0gKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0 ZVBvbGljaWVzKiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVl c3RlZEJ5Q2xpZW50LCBSZWZQdHI8U2FmZUJyb3dzaW5nV2FybmluZz4mJiBzYWZlQnJvd3NpbmdX YXJuaW5nKSBtdXRhYmxlIHsKICAgICAgICAgLy8gRklYTUU6IEFzc2VydCB0aGUgQVBJOjpXZWJz aXRlUG9saWNpZXMqIGlzIG51bGxwdHIgaGVyZSBvbmNlIGNsaWVudHMgb2YgV0tGcmFtZVBvbGlj eUxpc3RlbmVyVXNlV2l0aFBvbGljaWVzIGdvIGF3YXkuCiAgICAgICAgIFJFTEVBU0VfQVNTRVJU KHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgPT0gUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNs aWVudDo6Tm8pOwogICAgICAgICBBU1NFUlRfVU5VU0VEKHNhZmVCcm93c2luZ1dhcm5pbmcsICFz YWZlQnJvd3NpbmdXYXJuaW5nKTsKLSAgICAgICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xp Y3lBY3Rpb24sIG5hdmlnYXRpb24uZ2V0KCksIFdURjo6bnVsbG9wdCwgUG9saWN5RGVjaXNpb25T ZW5kZXI6OmNyZWF0ZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhp cyksIGZyYW1lSUQsIGxpc3RlbmVySURdIChhdXRvLi4uIGFyZ3MpIHsKLSAgICAgICAgICAgIG1f cHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9u KGZyYW1lSUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CisgICAgICAgIHJlY2Vp dmVkUG9saWN5RGVjaXNpb24ocG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uLmdldCgpLCBXVEY6Om51 bGxvcHQsIFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMg PSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklELCBwcm9jZXNzID0g V1RGTW92ZShwcm9jZXNzKV0gKGF1dG8uLi4gYXJncykgeworICAgICAgICAgICAgcHJvY2Vzcy0+ c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQs IGxpc3RlbmVySUQsIGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CiAgICAgICAgIH0pKTsKICAgICB9LCBT aG91bGRFeHBlY3RTYWZlQnJvd3NpbmdSZXN1bHQ6Ok5vKSk7CiAKQEAgLTY0ODYsOCArNjQzNyw2 IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpwcm9jZXNzV2lsbEJlY29tZUZvcmVncm91bmQoKQogdm9p ZCBXZWJQYWdlUHJveHk6OnJlc2V0U3RhdGUoUmVzZXRTdGF0ZVJlYXNvbiByZXNldFN0YXRlUmVh c29uKQogewogICAgIG1fbWFpbkZyYW1lID0gbnVsbHB0cjsKLSAgICBtX21haW5GcmFtZUNyZWF0 aW9uSGFuZGxlciA9IG51bGxwdHI7Ci0gICAgbV9tYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRs ZXIgPSBudWxscHRyOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgbV9zY3JvbGxpbmdQZXJm b3JtYW5jZURhdGEgPSBudWxscHRyOwpAQCAtNjc3OCw2ICs2NzI3LDEwIEBAIFdlYlBhZ2VDcmVh dGlvblBhcmFtZXRlcnMgV2ViUGFnZVByb3h5OjpjcmVhdGlvblBhcmFtZXRlcnMoKQogICAgIHBh cmFtZXRlcnMuYXBwbGljYXRpb25NYW5pZmVzdCA9IG1fY29uZmlndXJhdGlvbi0+YXBwbGljYXRp b25NYW5pZmVzdCgpID8gT3B0aW9uYWw8V2ViQ29yZTo6QXBwbGljYXRpb25NYW5pZmVzdD4obV9j b25maWd1cmF0aW9uLT5hcHBsaWNhdGlvbk1hbmlmZXN0KCktPmFwcGxpY2F0aW9uTWFuaWZlc3Qo KSkgOiBXVEY6Om51bGxvcHQ7CiAjZW5kaWYKIAorI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikK KyAgICBwYXJhbWV0ZXJzLmhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyA9IHByb2Nlc3MoKS5w cm9jZXNzUG9vbCgpLm1heUhhdmVSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMobV93ZWJzaXRlRGF0 YVN0b3JlKTsKKyNlbmRpZgorCiAgICAgcGFyYW1ldGVycy5uZWVkc0ZvbnRBdHRyaWJ1dGVzID0g bV9uZWVkc0ZvbnRBdHRyaWJ1dGVzOwogCiAgICAgbV9wcm9jZXNzLT5hZGRXZWJVc2VyQ29udGVu dENvbnRyb2xsZXJQcm94eShtX3VzZXJDb250ZW50Q29udHJvbGxlciwgcGFyYW1ldGVycyk7CkBA IC04NTM5LDYgKzg0OTIsMjEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNpbXVsYXRlRGV2aWNlT3Jp ZW50YXRpb25DaGFuZ2UoZG91YmxlIGFscGhhLCBkb3VibGUgYmV0YSwgZG8KICAgICBtX3Byb2Nl c3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNpbXVsYXRlRGV2aWNlT3JpZW50YXRpb25DaGFu Z2UoYWxwaGEsIGJldGEsIGdhbW1hKSwgbV9wYWdlSUQpOwogfQogCitXZWJQYWdlUHJveHk6OlBh Z2VQcm9jZXNzT3ZlcnJpZGU6OlBhZ2VQcm9jZXNzT3ZlcnJpZGUoV2ViUGFnZVByb3h5JiBwYWdl LCBXZWJQcm9jZXNzUHJveHkmIG5ld1Byb2Nlc3MpCisgICAgOiBtX3BhZ2UoJnBhZ2UpCisgICAg LCBtX3ByZXZpb3VzUHJvY2VzcyhwYWdlLnByb2Nlc3MoKSkKK3sKKyAgICBwYWdlLm1fcHJvY2Vz cyA9IG5ld1Byb2Nlc3M7Cit9CisKK1dlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6 UGFnZVByb2Nlc3NPdmVycmlkZShQYWdlUHJvY2Vzc092ZXJyaWRlJiYpID0gZGVmYXVsdDsKKwor V2ViUGFnZVByb3h5OjpQYWdlUHJvY2Vzc092ZXJyaWRlOjp+UGFnZVByb2Nlc3NPdmVycmlkZSgp Cit7CisgICAgaWYgKG1fcGFnZSkKKyAgICAgICAgbV9wYWdlLT5tX3Byb2Nlc3MgPSBXVEZNb3Zl KG1fcHJldmlvdXNQcm9jZXNzKTsKK30KKwogI2lmIEVOQUJMRShEQVRBX0RFVEVDVElPTikKIAog dm9pZCBXZWJQYWdlUHJveHk6OmRldGVjdERhdGFJbkFsbEZyYW1lcyhXZWJDb3JlOjpEYXRhRGV0 ZWN0b3JUeXBlcyB0eXBlcywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBEYXRhRGV0ZWN0 aW9uUmVzdWx0Jik+JiYgY29tcGxldGlvbkhhbmRsZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oCmluZGV4IGNkODAxYjgwOGM0Li5jNjY2ZmRiNmZiMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTIyNSw2ICsyMjUsNyBAQCBjbGFzcyBOYXRp dmVXZWJLZXlib2FyZEV2ZW50OwogY2xhc3MgTmF0aXZlV2ViTW91c2VFdmVudDsKIGNsYXNzIE5h dGl2ZVdlYldoZWVsRXZlbnQ7CiBjbGFzcyBQYWdlQ2xpZW50OworY2xhc3MgUHJvdmlzaW9uYWxQ YWdlUHJveHk7CiBjbGFzcyBSZW1vdGVMYXllclRyZWVIb3N0OwogY2xhc3MgUmVtb3RlTGF5ZXJU cmVlU2Nyb2xsaW5nUGVyZm9ybWFuY2VEYXRhOwogY2xhc3MgUmVtb3RlTGF5ZXJUcmVlVHJhbnNh Y3Rpb247CkBAIC00NTgsOCArNDU5LDcgQEAgcHVibGljOgogICAgIEFQSTo6SWNvbkxvYWRpbmdD bGllbnQmIGljb25Mb2FkaW5nQ2xpZW50KCkgeyByZXR1cm4gKm1faWNvbkxvYWRpbmdDbGllbnQ7 IH0KICAgICB2b2lkIHNldEljb25Mb2FkaW5nQ2xpZW50KHN0ZDo6dW5pcXVlX3B0cjxBUEk6Oklj b25Mb2FkaW5nQ2xpZW50PiYmKTsKIAotICAgIGVudW0gY2xhc3MgSXNTd2FwRnJvbVN1c3BlbmRl ZCB7IE5vLCBZZXMgfTsKLSAgICB2b2lkIGluaXRpYWxpemVXZWJQYWdlKElzU3dhcEZyb21TdXNw ZW5kZWQgPSBJc1N3YXBGcm9tU3VzcGVuZGVkOjpObyk7CisgICAgdm9pZCBpbml0aWFsaXplV2Vi UGFnZSgpOwogCiAgICAgV2Vha1B0cjxTZWNLZXlQcm94eVN0b3JlPiBzZWNLZXlQcm94eVN0b3Jl KGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJik7CiAgICAgICAgIApAQCAt MTAyNSw2ICsxMDI1LDE5IEBAIHB1YmxpYzoKICAgICBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3Mo KSB7IHJldHVybiBtX3Byb2Nlc3M7IH0KICAgICBQcm9jZXNzSUQgcHJvY2Vzc0lkZW50aWZpZXIo KSBjb25zdDsKIAorICAgIGNsYXNzIFBhZ2VQcm9jZXNzT3ZlcnJpZGUgeworICAgIHB1YmxpYzoK KyAgICAgICAgUGFnZVByb2Nlc3NPdmVycmlkZShXZWJQYWdlUHJveHkmLCBXZWJQcm9jZXNzUHJv eHkmIG5ld1Byb2Nlc3MpOworICAgICAgICBQYWdlUHJvY2Vzc092ZXJyaWRlKFBhZ2VQcm9jZXNz T3ZlcnJpZGUmJik7CisgICAgICAgIH5QYWdlUHJvY2Vzc092ZXJyaWRlKCk7CisKKyAgICBwcml2 YXRlOgorICAgICAgICBSZWZQdHI8V2ViUGFnZVByb3h5PiBtX3BhZ2U7CisgICAgICAgIFJlZjxX ZWJQcm9jZXNzUHJveHk+IG1fcHJldmlvdXNQcm9jZXNzOworICAgIH07CisKKyAgICBQYWdlUHJv Y2Vzc092ZXJyaWRlIHRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKFdlYlByb2Nlc3NQcm94eSYg bmV3UHJvY2VzcykgeyByZXR1cm4gUGFnZVByb2Nlc3NPdmVycmlkZSgqdGhpcywgbmV3UHJvY2Vz cyk7IH0KKwogICAgIFdlYlByZWZlcmVuY2VzJiBwcmVmZXJlbmNlcygpIHsgcmV0dXJuIG1fcHJl ZmVyZW5jZXM7IH0KICAgICB2b2lkIHNldFByZWZlcmVuY2VzKFdlYlByZWZlcmVuY2VzJik7CiAK QEAgLTE0MTQsNiArMTQyNywyMSBAQCBwdWJsaWM6CiAgICAgRWRpdGFibGVJbWFnZUNvbnRyb2xs ZXImIGVkaXRhYmxlSW1hZ2VDb250cm9sbGVyKCkgeyByZXR1cm4gKm1fZWRpdGFibGVJbWFnZUNv bnRyb2xsZXI7IH0KICNlbmRpZgogCisgICAgUHJvdmlzaW9uYWxQYWdlUHJveHkqIHByb3Zpc2lv bmFsUGFnZVByb3h5KCkgY29uc3QgeyByZXR1cm4gbV9wcm92aXNpb25hbFBhZ2UuZ2V0KCk7IH0K KyAgICB2b2lkIGNvbW1pdFByb3Zpc2lvbmFsUGFnZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRf dCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0 b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6 OkNlcnRpZmljYXRlSW5mbyYsIGJvb2wgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9uYWw8 V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIGNv bnN0IFVzZXJEYXRhJik7CisKKyAgICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJh bWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiwgVVJMJiYg dW5yZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRGYWlsUHJvdmlz aW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6U2VjdXJp dHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQs IGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJy b3ImLCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0 Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2 aWdhdGlvbklELCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgY29uc3QgVXNlckRhdGEmKTsK KworICAgIHZvaWQgbG9hZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBjb25z dCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJp bmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0 YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRl UG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKKyAgICB2b2lkIGxvYWRSZXF1ZXN0V2l0 aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYs IFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2Vy RGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJz aXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKKworICAgIC8vIElQQzo6TWVzc2Fn ZVJlY2VpdmVyCisgICAgLy8gSW1wbGVtZW50ZWQgaW4gZ2VuZXJhdGVkIFdlYlBhZ2VQcm94eU1l c3NhZ2VSZWNlaXZlci5jcHAKKyAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVj dGlvbiYsIElQQzo6RGVjb2RlciYpIG92ZXJyaWRlOworICAgIHZvaWQgZGlkUmVjZWl2ZVN5bmNN ZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYsIHN0ZDo6dW5pcXVlX3B0cjxJ UEM6OkVuY29kZXI+Jikgb3ZlcnJpZGU7CisKIHByaXZhdGU6CiAgICAgV2ViUGFnZVByb3h5KFBh Z2VDbGllbnQmLCBXZWJQcm9jZXNzUHJveHkmLCB1aW50NjRfdCBwYWdlSUQsIFJlZjxBUEk6OlBh Z2VDb25maWd1cmF0aW9uPiYmKTsKICAgICB2b2lkIHBsYXRmb3JtSW5pdGlhbGl6ZSgpOwpAQCAt MTQzOCwxMiArMTQ2Niw2IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHNldFVzZXJBZ2VudChTdHJp bmcmJik7CiAKLSAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgotICAgIC8vIEltcGxlbWVudGVk IGluIGdlbmVyYXRlZCBXZWJQYWdlUHJveHlNZXNzYWdlUmVjZWl2ZXIuY3BwCi0gICAgdm9pZCBk aWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImKSBvdmVycmlk ZTsKLSAgICB2b2lkIGRpZFJlY2VpdmVTeW5jTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6 OkRlY29kZXImLCBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVyPiYpIG92ZXJyaWRlOwotCi0K ICAgICAvLyBJUEM6Ok1lc3NhZ2VTZW5kZXIKICAgICBib29sIHNlbmRNZXNzYWdlKHN0ZDo6dW5p cXVlX3B0cjxJUEM6OkVuY29kZXI+LCBPcHRpb25TZXQ8SVBDOjpTZW5kT3B0aW9uPikgb3ZlcnJp ZGU7CiAgICAgSVBDOjpDb25uZWN0aW9uKiBtZXNzYWdlU2VuZGVyQ29ubmVjdGlvbigpIG92ZXJy aWRlOwpAQCAtMTQ2NSwxMiArMTQ4Nyw5IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaWRDcmVhdGVT dWJmcmFtZSh1aW50NjRfdCBmcmFtZUlEKTsKICAgICB2b2lkIGRpZENyZWF0ZVdpbmRvdyh1aW50 NjRfdCBmcmFtZUlELCBXZWJDb3JlOjpHbG9iYWxXaW5kb3dJZGVudGlmaWVyJiYpOwogCi0gICAg dm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVp bnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYsIFVSTCYmIHVucmVhY2hhYmxlVVJMLCBjb25zdCBV c2VyRGF0YSYpOwotICAgIHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9u YWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2b2lkIHdp bGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBT dHJpbmcmIHVybCwgZG91YmxlIGRlbGF5LCBXZWJDb3JlOjpMb2NrQmFja0ZvcndhcmRMaXN0KTsK ICAgICB2b2lkIGRpZENhbmNlbENsaWVudFJlZGlyZWN0Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJ RCk7CiAgICAgdm9pZCBkaWRDaGFuZ2VQcm92aXNpb25hbFVSTEZvckZyYW1lKHVpbnQ2NF90IGZy YW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYpOwotICAgIHZvaWQgZGlkRmFpbFBy b3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNl Y3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlv bklELCBjb25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJMLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJj ZUVycm9yJiwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2b2lkIGRpZENvbW1pdExvYWRGb3JGcmFt ZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYg bWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90IGZy YW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYsIGJvb2wgY29udGFp bnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiBm b3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIGNvbnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCBkaWRG aW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZp Z2F0aW9uSUQsIGNvbnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJh bWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBVc2VyRGF0 YSYpOwpAQCAtMTU3NCwxOCArMTU5MywxNSBAQCBwcml2YXRlOgogICAgIHZvaWQgc2V0Q2FuU2hv cnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRzKGJvb2wgY2FuU2hvcnRDaXJjdWl0SG9yaXpv bnRhbFdoZWVsRXZlbnRzKSB7IG1fY2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRz ID0gY2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRzOyB9CiAKICAgICB2b2lkIHJl YXR0YWNoVG9XZWJQcm9jZXNzKCk7Ci0gICAgdm9pZCBzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQ cm9jZXNzUHJveHk+JiYsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYsIElz U3dhcEZyb21TdXNwZW5kZWQpOworICAgIHZvaWQgc3dhcFRvV2ViUHJvY2VzcyhSZWY8V2ViUHJv Y2Vzc1Byb3h5PiYmLCBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4mJiwgUmVmUHRy PFdlYkZyYW1lUHJveHk+JiYgbWFpbkZyYW1lKTsKICAgICB2b2lkIGRpZEZhaWxUb1N1c3BlbmRB ZnRlclByb2Nlc3NTd2FwKCk7CiAgICAgdm9pZCBkaWRTdXNwZW5kQWZ0ZXJQcm9jZXNzU3dhcCgp OwogCi0gICAgdm9pZCBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoSXNTd2FwRnJvbVN1c3Bl bmRlZCA9IElzU3dhcEZyb21TdXNwZW5kZWQ6Ok5vKTsKKyAgICB2b2lkIGZpbmlzaEF0dGFjaGlu Z1RvV2ViUHJvY2VzcygpOwogCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVhdHRhY2hU b1dlYlByb2Nlc3NGb3JSZWxvYWQoKTsKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiByZWF0 dGFjaFRvV2ViUHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKTsKIAotICAg IHZvaWQgbG9hZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBjb25zdCBJUEM6 OkRhdGFSZWZlcmVuY2UmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVu Y29kaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2Vi Q29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNp ZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKLSAgICB2b2lkIGxvYWRSZXF1ZXN0V2l0aE5hdmln YXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNv cmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwg V2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9s aWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKLQogICAgIHZvaWQgcmVxdWVzdE5vdGlmaWNh dGlvblBlcm1pc3Npb24odWludDY0X3Qgbm90aWZpY2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgb3Jp Z2luU3RyaW5nKTsKICAgICB2b2lkIHNob3dOb3RpZmljYXRpb24oY29uc3QgU3RyaW5nJiB0aXRs ZSwgY29uc3QgU3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcmIGljb25VUkwsIGNvbnN0IFN0cmlu ZyYgdGFnLCBjb25zdCBTdHJpbmcmIGxhbmcsIFdlYkNvcmU6Ok5vdGlmaWNhdGlvbkRpcmVjdGlv biwgY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsK ICAgICB2b2lkIGNhbmNlbE5vdGlmaWNhdGlvbih1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CkBA IC0xOTUxLDggKzE5NjcsNiBAQCBwcml2YXRlOgogICAgIFJlZjxXZWJzaXRlRGF0YVN0b3JlPiBt X3dlYnNpdGVEYXRhU3RvcmU7CiAKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9tYWluRnJh bWU7Ci0gICAgRnVuY3Rpb248dm9pZCgpPiBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlcjsKLSAg ICBGdW5jdGlvbjx2b2lkKGNvbnN0IFdlYkNvcmU6Okdsb2JhbFdpbmRvd0lkZW50aWZpZXImKT4g bV9tYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXI7CiAKICAgICBSZWZQdHI8V2ViRnJhbWVQ cm94eT4gbV9mb2N1c2VkRnJhbWU7CiAgICAgUmVmUHRyPFdlYkZyYW1lUHJveHk+IG1fZnJhbWVT ZXRMYXJnZXN0RnJhbWU7CkBAIC0yMzIyLDYgKzIzMzYsOCBAQCBwcml2YXRlOgogICAgIGJvb2wg bV9uZWVkc0ZvbnRBdHRyaWJ1dGVzIHsgZmFsc2UgfTsKICAgICBib29sIG1fbWF5SGF2ZVVuaXZl cnNhbEZpbGVSZWFkU2FuZGJveEV4dGVuc2lvbiB7IGZhbHNlIH07CiAKKyAgICBzdGQ6OnVuaXF1 ZV9wdHI8UHJvdmlzaW9uYWxQYWdlUHJveHk+IG1fcHJvdmlzaW9uYWxQYWdlOworCiAjaWYgSEFW RShQRU5DSUxLSVQpCiAgICAgc3RkOjp1bmlxdWVfcHRyPEVkaXRhYmxlSW1hZ2VDb250cm9sbGVy PiBtX2VkaXRhYmxlSW1hZ2VDb250cm9sbGVyOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAppbmRleCBkYjFmZDU4YjkzZC4uZjdkZmFlODYyNmMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAtMzQs NiArMzQsNyBAQAogI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJQbHVnaW5JbmZvU3Rv cmUuaCIKICNpbmNsdWRlICJQbHVnaW5Qcm9jZXNzTWFuYWdlci5oIgorI2luY2x1ZGUgIlByb3Zp c2lvbmFsUGFnZVByb3h5LmgiCiAjaW5jbHVkZSAiVGV4dENoZWNrZXIuaCIKICNpbmNsdWRlICJU ZXh0Q2hlY2tlclN0YXRlLmgiCiAjaW5jbHVkZSAiVUlNZXNzYWdlUG9ydENoYW5uZWxQcm92aWRl ci5oIgpAQCAtNDM2LDcgKzQzNyw3IEBAIFJlZjxXZWJQYWdlUHJveHk+IFdlYlByb2Nlc3NQcm94 eTo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBSZWY8QVBJCiB2b2lkIFdl YlByb2Nlc3NQcm94eTo6YWRkRXhpc3RpbmdXZWJQYWdlKFdlYlBhZ2VQcm94eSYgd2ViUGFnZSwg dWludDY0X3QgcGFnZUlELCBCZWdpbnNVc2luZ0RhdGFTdG9yZSBiZWdpbnNVc2luZ0RhdGFTdG9y ZSkKIHsKICAgICBBU1NFUlQoIW1fcGFnZU1hcC5jb250YWlucyhwYWdlSUQpKTsKLSAgICBBU1NF UlQoIWdsb2JhbFBhZ2VNYXAoKS5jb250YWlucyhwYWdlSUQpKTsKKyAgICBBU1NFUlQoIWdsb2Jh bFBhZ2VNYXAoKS5jb250YWlucyhwYWdlSUQpIHx8IGdsb2JhbFBhZ2VNYXAoKS5nZXQocGFnZUlE KSA9PSAmd2ViUGFnZSk7CiAKICAgICBpZiAoYmVnaW5zVXNpbmdEYXRhU3RvcmUgPT0gQmVnaW5z VXNpbmdEYXRhU3RvcmU6OlllcykKICAgICAgICAgbV9wcm9jZXNzUG9vbC0+cGFnZUJlZ2luVXNp bmdXZWJzaXRlRGF0YVN0b3JlKHdlYlBhZ2UpOwpAQCAtNTg0LDYgKzU4NSwxNSBAQCBib29sIFdl YlByb2Nlc3NQcm94eTo6ZnVsbEtleWJvYXJkQWNjZXNzRW5hYmxlZCgpCiB9CiAjZW5kaWYKIAor Ym9vbCBXZWJQcm9jZXNzUHJveHk6Omhhc1Byb3Zpc2lvbmFsUGFnZVdpdGhJRCh1aW50NjRfdCBw YWdlSUQpIGNvbnN0Cit7CisgICAgZm9yIChhdXRvKiBwcm92aXNpb25hbFBhZ2UgOiBtX3Byb3Zp c2lvbmFsUGFnZXMpIHsKKyAgICAgICAgaWYgKHByb3Zpc2lvbmFsUGFnZS0+cGFnZSgpLnBhZ2VJ RCgpID09IHBhZ2VJRCkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKyAgICByZXR1 cm4gZmFsc2U7Cit9CisKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojp1cGRhdGVCYWNrRm9yd2FyZEl0 ZW0oY29uc3QgQmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlJiBpdGVtU3RhdGUpCiB7CiAgICAgaWYg KGF1dG8qIGl0ZW0gPSBXZWJCYWNrRm9yd2FyZExpc3RJdGVtOjppdGVtRm9ySUQoaXRlbVN0YXRl LmlkZW50aWZpZXIpKSB7CkBAIC01OTEsNyArNjAxLDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6 OnVwZGF0ZUJhY2tGb3J3YXJkSXRlbShjb25zdCBCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUmIGl0 ZW0KICAgICAgICAgLy8gdGhlIGJhY2svZm9yd2FyZCBpdGVtcyBwYWdlLgogICAgICAgICAvLyBl LmcuIFRoZSBvbGQgd2ViIHByb2Nlc3MgaXMgbmF2aWdhdGluZyB0byBhYm91dDpibGFuayBmb3Ig c3VzcGVuc2lvbi4KICAgICAgICAgLy8gV2UgaWdub3JlIHRoZXNlIHVwZGF0ZXMuCi0gICAgICAg IGlmIChtX3BhZ2VNYXAuY29udGFpbnMoaXRlbS0+cGFnZUlEKCkpKQorICAgICAgICBpZiAobV9w YWdlTWFwLmNvbnRhaW5zKGl0ZW0tPnBhZ2VJRCgpKSB8fCBoYXNQcm92aXNpb25hbFBhZ2VXaXRo SUQoaXRlbS0+cGFnZUlEKCkpKQogICAgICAgICAgICAgaXRlbS0+c2V0UGFnZVN0YXRlKGl0ZW1T dGF0ZS5wYWdlU3RhdGUpOwogICAgIH0KIH0KQEAgLTg3Myw3ICs4ODMsNyBAQCB2b2lkIFdlYlBy b2Nlc3NQcm94eTo6bWF5YmVTaHV0RG93bigpCiAKIGJvb2wgV2ViUHJvY2Vzc1Byb3h5OjpjYW5U ZXJtaW5hdGVDaGlsZFByb2Nlc3MoKQogewotICAgIGlmICghbV9wYWdlTWFwLmlzRW1wdHkoKSB8 fCBtX3Byb2Nlc3NQb29sLT5oYXNTdXNwZW5kZWRQYWdlRm9yKCp0aGlzKSkKKyAgICBpZiAoIW1f cGFnZU1hcC5pc0VtcHR5KCkgfHwgbV9wcm9jZXNzUG9vbC0+aGFzU3VzcGVuZGVkUGFnZUZvcigq dGhpcykgfHwgIW1fcHJvdmlzaW9uYWxQYWdlcy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBm YWxzZTsKIAogICAgIGlmICghbV9wcm9jZXNzUG9vbC0+c2hvdWxkVGVybWluYXRlKHRoaXMpKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmggYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaAppbmRleCA3NWY2NWE3Zjdl Yi4uNTA0MjYzMGRlMzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBy b2Nlc3NQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94 eS5oCkBAIC03MCw2ICs3MCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgTmV0d29ya1By b2Nlc3NQcm94eTsKIGNsYXNzIE9iakNPYmplY3RHcmFwaDsKIGNsYXNzIFBhZ2VDbGllbnQ7Citj bGFzcyBQcm92aXNpb25hbFBhZ2VQcm94eTsKIGNsYXNzIFVzZXJNZWRpYUNhcHR1cmVNYW5hZ2Vy UHJveHk7CiBjbGFzcyBWaXNpdGVkTGlua1N0b3JlOwogY2xhc3MgV2ViQmFja0ZvcndhcmRMaXN0 SXRlbTsKQEAgLTEyNCw2ICsxMjUsOSBAQCBwdWJsaWM6CiAgICAgZW51bSBjbGFzcyBFbmRzVXNp bmdEYXRhU3RvcmUgOiBib29sIHsgTm8sIFllcyB9OwogICAgIHZvaWQgcmVtb3ZlV2ViUGFnZShX ZWJQYWdlUHJveHkmLCB1aW50NjRfdCBwYWdlSUQsIEVuZHNVc2luZ0RhdGFTdG9yZSk7CiAKKyAg ICB2b2lkIGFkZFByb3Zpc2lvbmFsUGFnZVByb3h5KFByb3Zpc2lvbmFsUGFnZVByb3h5JiBwcm92 aXNpb25hbFBhZ2UpIHsgQVNTRVJUKCFtX3Byb3Zpc2lvbmFsUGFnZXMuY29udGFpbnMoJnByb3Zp c2lvbmFsUGFnZSkpOyBtX3Byb3Zpc2lvbmFsUGFnZXMuYWRkKCZwcm92aXNpb25hbFBhZ2UpOyB9 CisgICAgdm9pZCByZW1vdmVQcm92aXNpb25hbFBhZ2VQcm94eShQcm92aXNpb25hbFBhZ2VQcm94 eSYgcHJvdmlzaW9uYWxQYWdlKSB7IEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFnZXMuY29udGFpbnMo JnByb3Zpc2lvbmFsUGFnZSkpOyBtX3Byb3Zpc2lvbmFsUGFnZXMucmVtb3ZlKCZwcm92aXNpb25h bFBhZ2UpOyB9CisKICAgICB0eXBlbmFtZSBXZWJQYWdlUHJveHlNYXA6OlZhbHVlc0NvbnN0SXRl cmF0b3JSYW5nZSBwYWdlcygpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZU1hcC52YWx1ZXMoKTsgfQog ICAgIHVuc2lnbmVkIHBhZ2VDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZU1hcC5zaXplKCk7 IH0KICAgICB1bnNpZ25lZCB2aXNpYmxlUGFnZUNvdW50KCkgY29uc3QgeyByZXR1cm4gbV92aXNp YmxlUGFnZUNvdW50ZXIudmFsdWUoKTsgfQpAQCAtMzMwLDYgKzMzNCw4IEBAIHByaXZhdGU6CiAK ICAgICB2b2lkIGxvZ0RpYWdub3N0aWNNZXNzYWdlRm9yUmVzb3VyY2VMaW1pdFRlcm1pbmF0aW9u KGNvbnN0IFN0cmluZyYgbGltaXRLZXkpOwogCisgICAgYm9vbCBoYXNQcm92aXNpb25hbFBhZ2VX aXRoSUQodWludDY0X3QgcGFnZUlEKSBjb25zdDsKKwogICAgIGVudW0gY2xhc3MgSXNXZWFrIHsg Tm8sIFllcyB9OwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGNsYXNzIFdlYWtPclN0cm9uZ1B0 ciB7CiAgICAgcHVibGljOgpAQCAtMzczLDYgKzM3OSw3IEBAIHByaXZhdGU6CiAKICAgICBXZWJQ YWdlUHJveHlNYXAgbV9wYWdlTWFwOwogICAgIFdlYkZyYW1lUHJveHlNYXAgbV9mcmFtZU1hcDsK KyAgICBIYXNoU2V0PFByb3Zpc2lvbmFsUGFnZVByb3h5Kj4gbV9wcm92aXNpb25hbFBhZ2VzOwog ICAgIFVzZXJJbml0aWF0ZWRBY3Rpb25NYXAgbV91c2VySW5pdGlhdGVkQWN0aW9uTWFwOwogCiAg ICAgSGFzaFNldDxWaXNpdGVkTGlua1N0b3JlKj4gbV92aXNpdGVkTGlua1N0b3JlczsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9T b3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDUwN2Vk YjczZTc0Li43MDc5YjI2OTg4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qCkBAIC0zMDk1LDYgKzMwOTUsOCBAQAogCQk0NjZCQzAzODFGQTI2 NkM5MDAyRkE5QzEgLyogV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rp b24uY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NjZCQzAzOTFGQTI2NkM5MDAy RkE5QzEgLyogV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uaDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDY2QkMwM0ExRkEyNjZDOTAwMkZBOUMxIC8qIFdlYlNX Q29udGV4dE1hbmFnZXJDb25uZWN0aW9uLm1lc3NhZ2VzLmluICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0 aCA9IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLm1lc3NhZ2VzLmluOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OworCQk0NjgzNTY5QTIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9u YWxQYWdlUHJveHkuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gUHJvdmlzaW9u YWxQYWdlUHJveHkuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJNDY4MzU2OUIyMUU4 MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmNwcCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFByb3Zpc2lvbmFsUGFnZVByb3h5LmNwcDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDZBMkI2MDYxRTU2NzVBMjAwQzNERURBIC8qIEJhY2tncm91 bmRQcm9jZXNzUmVzcG9uc2l2ZW5lc3NUaW1lci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNw cC5jcHA7IHBhdGggPSBCYWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NkEyQjYwNzFFNTY3NUEyMDBDM0RFREEgLyog QmFja2dyb3VuZFByb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVyLmggKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmMuaDsgcGF0aCA9IEJhY2tncm91bmRQcm9jZXNzUmVzcG9uc2l2ZW5lc3NUaW1lci5oOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NkRGMDYzOTFGMzkwNUU1MDAxOTgwQkIgLyog TmV0d29ya0NPUlNQcmVmbGlnaHRDaGVja2VyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw LmNwcDsgcGF0aCA9IE5ldHdvcmtDT1JTUHJlZmxpZ2h0Q2hlY2tlci5jcHA7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CkBAIC03MzUwLDYgKzczNTIsOCBAQAogCQkJCTg2RTY3QTIyMTkwRjQx MTgwMDAwNEFCNyAvKiBQcm9jZXNzVGhyb3R0bGVyLmNwcCAqLywKIAkJCQk4NkU2N0EyMTE5MEY0 MTE4MDAwMDRBQjcgLyogUHJvY2Vzc1Rocm90dGxlci5oICovLAogCQkJCTgzMDQ4QUU1MUFDQTQ1 REMwMDgyQzgzMiAvKiBQcm9jZXNzVGhyb3R0bGVyQ2xpZW50LmggKi8sCisJCQkJNDY4MzU2OUIy MUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmNwcCAqLywKKwkJCQk0Njgz NTY5QTIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQYWdlUHJveHkuaCAqLywKIAkJCQlB NTVCQTgxQjFCQTI1QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkuY3BwICov LAogCQkJCUE1NUJBODE5MUJBMjVCMUUwMDdDRDMzRCAvKiBSZW1vdGVXZWJJbnNwZWN0b3JQcm94 eS5oICovLAogCQkJCUE1NUJBODFBMUJBMjVCMUUwMDdDRDMzRCAvKiBSZW1vdGVXZWJJbnNwZWN0 b3JQcm94eS5tZXNzYWdlcy5pbiAqLywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYkZyYW1lLmNwcAppbmRleCAwMDc0OWI0NzdhMi4uZmZlZDAwYzgyMDYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAKQEAgLTI2Myw4ICsy NjMsNiBAQCBzdGF0aWMgV2ViQ29yZTo6UG9saWN5QWN0aW9uIHRvUG9saWN5QWN0aW9uKFdlYlBv bGljeUFjdGlvbiBwb2xpY3lBY3Rpb24pCiAgICAgICAgIHJldHVybiBXZWJDb3JlOjpQb2xpY3lB Y3Rpb246Oklnbm9yZTsKICAgICBjYXNlIFdlYlBvbGljeUFjdGlvbjo6RG93bmxvYWQ6CiAgICAg ICAgIHJldHVybiBXZWJDb3JlOjpQb2xpY3lBY3Rpb246OkRvd25sb2FkOwotICAgIGNhc2UgV2Vi UG9saWN5QWN0aW9uOjpTdXNwZW5kOgotICAgICAgICBicmVhazsKICAgICB9CiAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CiAgICAgcmV0dXJuIFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6SWdub3Jl OwpAQCAtMjcyLDExICsyNzAsOCBAQCBzdGF0aWMgV2ViQ29yZTo6UG9saWN5QWN0aW9uIHRvUG9s aWN5QWN0aW9uKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24pCiAKIHZvaWQgV2ViRnJhbWU6 OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1aW50NjRfdCBsaXN0ZW5lcklELCBXZWJQb2xpY3lB Y3Rpb24gYWN0aW9uLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIERvd25sb2FkSUQgZG93bmxvYWRJ RCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCiB7Ci0g ICAgaWYgKCFtX2NvcmVGcmFtZSB8fCAhbV9wb2xpY3lMaXN0ZW5lcklEIHx8IGxpc3RlbmVySUQg IT0gbV9wb2xpY3lMaXN0ZW5lcklEIHx8ICFtX3BvbGljeUZ1bmN0aW9uKSB7Ci0gICAgICAgIGlm IChhY3Rpb24gPT0gV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kKQotICAgICAgICAgICAgcGFnZSgp LT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZEZhaWxUb1N1c3BlbmRBZnRlclByb2Nl c3NTd2FwKCkpOworICAgIGlmICghbV9jb3JlRnJhbWUgfHwgIW1fcG9saWN5TGlzdGVuZXJJRCB8 fCBsaXN0ZW5lcklEICE9IG1fcG9saWN5TGlzdGVuZXJJRCB8fCAhbV9wb2xpY3lGdW5jdGlvbikK ICAgICAgICAgcmV0dXJuOwotICAgIH0KIAogICAgIEZyYW1lUG9saWN5RnVuY3Rpb24gZnVuY3Rp b24gPSBXVEZNb3ZlKG1fcG9saWN5RnVuY3Rpb24pOwogICAgIGJvb2wgZm9yTmF2aWdhdGlvbkFj dGlvbiA9IG1fcG9saWN5RnVuY3Rpb25Gb3JOYXZpZ2F0aW9uQWN0aW9uID09IEZvck5hdmlnYXRp b25BY3Rpb246OlllczsKQEAgLTI5MiwxNiArMjg3LDcgQEAgdm9pZCBXZWJGcmFtZTo6ZGlkUmVj ZWl2ZVBvbGljeURlY2lzaW9uKHVpbnQ2NF90IGxpc3RlbmVySUQsIFdlYlBvbGljeUFjdGlvbiBh Y3QKICAgICAgICAgICAgIGRvY3VtZW50TG9hZGVyLT5zZXROYXZpZ2F0aW9uSUQobmF2aWdhdGlv bklEKTsKICAgICB9CiAKLSAgICBib29sIHNob3VsZFN1c3BlbmQgPSBmYWxzZTsKLSAgICBpZiAo YWN0aW9uID09IFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZCkgewotICAgICAgICBzaG91bGRTdXNw ZW5kID0gdHJ1ZTsKLSAgICAgICAgYWN0aW9uID0gV2ViUG9saWN5QWN0aW9uOjpJZ25vcmU7Ci0g ICAgfQotCiAgICAgZnVuY3Rpb24odG9Qb2xpY3lBY3Rpb24oYWN0aW9uKSk7Ci0KLSAgICBpZiAo c2hvdWxkU3VzcGVuZCkKLSAgICAgICAgcGFnZSgpLT5zdXNwZW5kRm9yUHJvY2Vzc1N3YXAoKTsK IH0KIAogdm9pZCBXZWJGcmFtZTo6c3RhcnREb3dubG9hZChjb25zdCBXZWJDb3JlOjpSZXNvdXJj ZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkTmFtZSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMjVkNmRmYjcxZDAu LmU0OTE4MjQ3YTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcApAQCAtNDAxLDcgKzQwMSw3IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFn ZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICAsIG1fb3Zl cnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgeyBwYXJhbWV0ZXJzLm92ZXJyaWRlQ29udGVudFNl Y3VyaXR5UG9saWN5IH0KICAgICAsIG1fY3B1TGltaXQocGFyYW1ldGVycy5jcHVMaW1pdCkKICNp ZiBQTEFURk9STShNQUMpCi0gICAgLCBtX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdlVHJh bnNpdGlvbihwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQpCisgICAgLCBtX3Nob3VsZEF0 dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNpdGlvbihwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXAp CiAjZW5kaWYKIHsKICAgICBBU1NFUlQobV9wYWdlSUQpOwpAQCAtNDcxLDcgKzQ3MSw3IEBAIFdl YlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz JiYgcGFyYW1ldGVycykKICAgICBtX2RyYXdpbmdBcmVhLT5zZXRQYWludGluZ0VuYWJsZWQoZmFs c2UpOwogICAgIG1fZHJhd2luZ0FyZWEtPnNldFNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQo cGFyYW1ldGVycy5zaG91bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50KTsKIAotICAgIGlmIChwYXJh bWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQpCisgICAgaWYgKHBhcmFtZXRlcnMuaXNQcm9jZXNz U3dhcCkKICAgICAgICAgZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6U3dh cEZyb21TdXNwZW5kZWQpOwogCiAjaWYgRU5BQkxFKEFTWU5DX1NDUk9MTElORykKQEAgLTY5Niw3 ICs2OTYsNyBAQCB2b2lkIFdlYlBhZ2U6OnJlaW5pdGlhbGl6ZVdlYlBhZ2UoV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAgICAgICAgIG1fZHJhd2luZ0FyZWEtPnVwZGF0 ZVByZWZlcmVuY2VzKHBhcmFtZXRlcnMuc3RvcmUpOwogICAgICAgICBtX2RyYXdpbmdBcmVhLT5z ZXRQYWludGluZ0VuYWJsZWQodHJ1ZSk7CiAjaWYgUExBVEZPUk0oTUFDKQotICAgICAgICBtX3No b3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNpdGlvbiA9IHBhcmFtZXRlcnMuaXNTd2Fw RnJvbVN1c3BlbmRlZDsKKyAgICAgICAgbV9zaG91bGRBdHRhY2hEcmF3aW5nQXJlYU9uUGFnZVRy YW5zaXRpb24gPSBwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXA7CiAjZW5kaWYKICAgICAgICAgdW5m cmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29uOjpQYWdlU3VzcGVuZGVkKTsKICAg ICB9CkBAIC0zMDUzLDEyICszMDUzLDYgQEAgdm9pZCBXZWJQYWdlOjpkaWRSZWNlaXZlUG9saWN5 RGVjaXNpb24odWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbGlzdGVuZXJJRCwgV2UKICAgICBX ZWJGcmFtZSogZnJhbWUgPSBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS53ZWJGcmFtZShmcmFtZUlE KTsKICAgICBpZiAoIWZyYW1lKQogICAgICAgICByZXR1cm47Ci0gICAgaWYgKHBvbGljeUFjdGlv biA9PSBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQpIHsKLSAgICAgICAgQVNTRVJUKGZyYW1lID09 IG1fbWFpbkZyYW1lKTsKLSAgICAgICAgc2V0SXNTdXNwZW5kZWQodHJ1ZSk7Ci0KLSAgICAgICAg V2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuc2VuZFByZXdhcm1JbmZvcm1hdGlvbihtYWluV2ViRnJh bWUoKS0+dXJsKCkpOwotICAgIH0KICAgICBmcmFtZS0+ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9u KGxpc3RlbmVySUQsIHBvbGljeUFjdGlvbiwgbmF2aWdhdGlvbklELCBkb3dubG9hZElELCBXVEZN b3ZlKHdlYnNpdGVQb2xpY2llcykpOwogfQogCkBAIC02MzEyLDYgKzYzMDYsMTAgQEAgdm9pZCBX ZWJQYWdlOjpzZXRJc1N1c3BlbmRlZChib29sIHN1c3BlbmRlZCkKICAgICBpZiAobV9pc1N1c3Bl bmRlZCkgewogICAgICAgICAvLyBVbmZyb3plbiBvbiBkcmF3aW5nIGFyZWEgcmVzZXQuCiAgICAg ICAgIGZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlBhZ2VTdXNwZW5kZWQp OworCisgICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnNlbmRQcmV3YXJtSW5mb3JtYXRp b24obWFpbldlYkZyYW1lKCktPnVybCgpKTsKKworICAgICAgICBzdXNwZW5kRm9yUHJvY2Vzc1N3 YXAoKTsKICAgICB9IGVsc2UKICAgICAgICAgbV9zaG91bGRSZXNldERyYXdpbmdBcmVhQWZ0ZXJT dXNwZW5kID0gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbSBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5t bQppbmRleCA5MWFkNzFhZGUxYi4uODNiNjU5OTI3MGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5p bWF0aW9uRHJhd2luZ0FyZWEubW0KQEAgLTk3LDcgKzk3LDcgQEAgVGlsZWRDb3JlQW5pbWF0aW9u RHJhd2luZ0FyZWE6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhKFdlYlBhZ2UmIHdlYlBh Z2UsIGMKICAgICB1cGRhdGVMYXllckhvc3RpbmdDb250ZXh0KCk7CiAgICAgc2V0Q29sb3JTcGFj ZShwYXJhbWV0ZXJzLmNvbG9yU3BhY2UpOwogCi0gICAgaWYgKCFwYXJhbWV0ZXJzLmlzU3dhcEZy b21TdXNwZW5kZWQpCisgICAgaWYgKCFwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXApCiAgICAgICAg IGF0dGFjaCgpOwogfQogCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQppbmRleCBmMzVk OGJhYTM1My4uNTNlZTdkNThhZGMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KKysrIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQpA QCAtMTQwNSw3ICsxNDA1LDcgQEAgVEVTVChQcm9jZXNzU3dhcCwgU2VydmVyUmVkaXJlY3QpCiAK ICAgICBFWFBFQ1RfRkFMU0Uoc2VydmVyUmVkaXJlY3RlZCk7CiAgICAgRVhQRUNUX0VRKDMsIG51 bWJlck9mRGVjaWRlUG9saWN5Q2FsbHMpOwotICAgIEVYUEVDVF9FUSgydSwgc2VlblBJRHMuc2l6 ZSgpKTsKKyAgICBFWFBFQ1RfRVEoM3UsIHNlZW5QSURzLnNpemUoKSk7CiB9CiAKIFRFU1QoUHJv Y2Vzc1N3YXAsIFNlcnZlclJlZGlyZWN0MikKQEAgLTIyMzIsMTIgKzIyMzIsMjcgQEAgVEVTVChQ cm9jZXNzU3dhcCwgUGFnZVNob3dIaWRlKQogCiAgICAgRVhQRUNUX0VRKDd1LCBbcmVjZWl2ZWRN ZXNzYWdlcyBjb3VudF0pOwogICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0 Lm9yZy9tYWluLmh0bWwgLSBwYWdlc2hvdyBOT1QgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdl cy5nZXQoKVswXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3Jn L21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClb MV0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRt bCAtIHBhZ2VzaG93IE5PVCBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsK LSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBw YWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKLSAgICBFWFBF Q1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cg cGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs0XSk7Ci0gICAgRVhQRUNUX1dLX1NU UkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3Rl ZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBz b246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2Vp dmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAgIGlmIChbcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsx XSBoYXNQcmVmaXg6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIl0pIHsKKyAgICAg ICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBh Z2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0pOworICAgICAgICBF WFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlc2hv dyBOT1QgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7CisgICAgfSBlbHNl IHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5o dG1sIC0gcGFnZXNob3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0p OworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5o dG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7Cisg ICAgfQorICAgIGlmIChbcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSBoYXNQcmVmaXg6QCJwc29u Oi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwiXSkgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEo QCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCBy ZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNv bjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2Vp dmVkTWVzc2FnZXMuZ2V0KClbNF0pOworICAgIH0gZWxzZSB7CisgICAgICAgIEVYUEVDVF9XS19T VFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0 ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVR KEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwg cmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs0XSk7CisgICAgfQorICAgIGlmIChbcmVjZWl2ZWRNZXNz YWdlcy5nZXQoKVs1XSBoYXNQcmVmaXg6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1s Il0pIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21h aW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0p OworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0 bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAg ICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNv bS9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgp WzVdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21h aW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0p OworICAgIH0KIH0KIAogLy8gRGlzYWJsaW5nIHRoZSBwYWdlIGNhY2hlIGV4cGxpY2l0bHkgaXMg KGZvciBzb21lIHJlYXNvbikgbm90IGF2YWlsYWJsZSBvbiBpT1MuCg== 358960 2019-01-11 16:18:39 -0800 2019-01-11 16:30:36 -0800 Prototype (with test) 193361_pson_provisional_process_wip.patch text/plain 79019 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggOGU5NTllZGFm ZmQuLjlkOTBiZThiNDhlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVz dEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0 aW9ucwpAQCAtNzMzLDggKzczMyw4IEBAIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGlj cy9yZW1vdmUtYmxvY2tpbmctaW4tcmVkaXJlY3QuaHRtbCBbIFNraXAgXQogaHR0cC90ZXN0cy9y ZXNvdXJjZUxvYWRTdGF0aXN0aWNzL25vbi1wcmV2YWxlbnQtcmVzb3VyY2VzLWNhbi1hY2Nlc3Mt Y29va2llcy1pbi1hLXRoaXJkLXBhcnR5LWNvbnRleHQuaHRtbCBbIFNraXAgXQogaHR0cC90ZXN0 cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL2NhcC1jYWNoZS1tYXgtYWdlLWZvci1wcmV2YWxlbnQt cmVzb3VyY2UuaHRtbCBbIFNraXAgXQogCi0jIFByb2Nlc3Mgc3dhcHBpbmcgaXMgb25seSBpbXBs ZW1lbnRlZCBvbiBXZWJLaXQyLgotaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3Byb2Nlc3Mtc3dhcC13 aW5kb3ctb3Blbi5odG1sIFsgUGFzcyBdCisjIFRoaXMgZmVhdHVyZSBpcyBjdXJyZW50bHkgZGlz YWJsZWQgYnkgZGVmYXVsdCBhbmQgdW5maW5pc2hlZCA8cmRhcjovL3Byb2JsZW0vMzg5MjUwNzc+ LgoraHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3Byb2Nlc3Mtc3dhcC13aW5kb3ctb3Blbi5odG1sIFsg U2tpcCBdCiAKICMgQ3Jvc3MtT3JpZ2luLVJlc291cmNlLVBvbGljeSByZXNwb25zZSBoZWFkZXIg aXMgb25seSBpbXBsZW1lbnRlZCBpbiBXZWJLaXQyLgogaHR0cC93cHQvY3Jvc3Mtb3JpZ2luLXJl c291cmNlLXBvbGljeS8gWyBQYXNzIF0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw CmluZGV4IDRjMjZhNjk4MWI0Li5lYmY5NTBiYTZjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuY3BwCkBAIC0yMDMyLDExICsyMDMyLDExIEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNv bW1pdFByb3Zpc2lvbmFsTG9hZCgpCiAKICAgICAgICAgT3B0aW9uYWw8SGFzSW5zZWN1cmVDb250 ZW50PiBoYXNJbnNlY3VyZUNvbnRlbnQgPSBjYWNoZWRQYWdlLT5jYWNoZWRNYWluRnJhbWUoKS0+ aGFzSW5zZWN1cmVDb250ZW50KCk7CiAKKyAgICAgICAgZGlzcGF0Y2hEaWRDb21taXRMb2FkKGhh c0luc2VjdXJlQ29udGVudCk7CisKICAgICAgICAgLy8gRklYTUU6IFRoaXMgQVBJIHNob3VsZCBi ZSB0dXJuZWQgYXJvdW5kIHNvIHRoYXQgd2UgZ3JvdW5kIENhY2hlZFBhZ2UgaW50byB0aGUgUGFn ZS4KICAgICAgICAgY2FjaGVkUGFnZS0+cmVzdG9yZSgqbV9mcmFtZS5wYWdlKCkpOwogCi0gICAg ICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOwotCiAjaWYgUExB VEZPUk0oSU9TX0ZBTUlMWSkKICAgICAgICAgbV9mcmFtZS5wYWdlKCktPmNocm9tZSgpLnNldERp c3BhdGNoVmlld3BvcnREYXRhRGlkQ2hhbmdlU3VwcHJlc3NlZChmYWxzZSk7CiAgICAgICAgIG1f ZnJhbWUucGFnZSgpLT5jaHJvbWUoKS5kaXNwYXRjaFZpZXdwb3J0UHJvcGVydGllc0RpZENoYW5n ZShtX2ZyYW1lLnBhZ2UoKS0+dmlld3BvcnRBcmd1bWVudHMoKSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcCBiL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCmluZGV4IGNhMmRmNDBl ZTFkLi42ZDA3YzAzYWQ4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKQEAgLTczLDcgKzczLDcgQEAgdm9pZCBXZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzOjplbmNvZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAg IGVuY29kZXIuZW5jb2RlRW51bShsYXllckhvc3RpbmdNb2RlKTsKICAgICBlbmNvZGVyIDw8IG1p bWVUeXBlc1dpdGhDdXN0b21Db250ZW50UHJvdmlkZXJzOwogICAgIGVuY29kZXIgPDwgY29udHJv bGxlZEJ5QXV0b21hdGlvbjsKLSAgICBlbmNvZGVyIDw8IGlzU3dhcEZyb21TdXNwZW5kZWQ7Cisg ICAgZW5jb2RlciA8PCBpc1Byb2Nlc3NTd2FwOwogCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIGVu Y29kZXIgPDwgY29sb3JTcGFjZTsKQEAgLTIyNyw3ICsyMjcsNyBAQCBPcHRpb25hbDxXZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzPiBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoSVBD OjpEZWNvZAogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogICAgIGlmICghZGVjb2Rlci5k ZWNvZGUocGFyYW1ldGVycy5jb250cm9sbGVkQnlBdXRvbWF0aW9uKSkKICAgICAgICAgcmV0dXJu IFdURjo6bnVsbG9wdDsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuaXNTd2Fw RnJvbVN1c3BlbmRlZCkpCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmlzUHJv Y2Vzc1N3YXApKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAjaWYgUExBVEZPUk0o TUFDKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVycy5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVy cy5oCmluZGV4IGFlNDMyNWNiZDVmLi5iMzgyY2VlZGQ0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaApAQCAtMTI5LDcgKzEyOSw3IEBA IHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICAgICBWZWN0b3I8U3RyaW5nPiBt aW1lVHlwZXNXaXRoQ3VzdG9tQ29udGVudFByb3ZpZGVyczsKIAogICAgIGJvb2wgY29udHJvbGxl ZEJ5QXV0b21hdGlvbjsKLSAgICBib29sIGlzU3dhcEZyb21TdXNwZW5kZWQgeyBmYWxzZSB9Owor ICAgIGJvb2wgaXNQcm9jZXNzU3dhcCB7IGZhbHNlIH07CiAKICNpZiBQTEFURk9STShNQUMpCiAg ICAgQ29sb3JTcGFjZURhdGEgY29sb3JTcGFjZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv U2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5 QWN0aW9uLmgKaW5kZXggMTQyYTUxOGRmMDkuLjM5NzE3OTVjNDZhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQb2xpY3lBY3Rpb24uaApAQCAtMjksMTEgKzI5LDExIEBACiAKIG5hbWVzcGFjZSBX ZWJLaXQgewogCisvLyBGSVhNRTogUmVtb3ZlIHRoaXMgdHlwZSBhbmQgdXNlIFdlYkNvcmU6OlBv bGljeUFjdGlvbiBpbnN0ZWFkLgogZW51bSBjbGFzcyBXZWJQb2xpY3lBY3Rpb24gOiB1aW50OF90 IHsKICAgICBVc2UsCiAgICAgRG93bmxvYWQsCi0gICAgSWdub3JlLAotICAgIFN1c3BlbmQKKyAg ICBJZ25vcmUKIH07CiAKIH0KQEAgLTQ1LDggKzQ1LDcgQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgRW51 bVRyYWl0czxXZWJLaXQ6OldlYlBvbGljeUFjdGlvbj4gewogICAgICAgICBXZWJLaXQ6OldlYlBv bGljeUFjdGlvbiwKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OlVzZSwKICAgICAg ICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OkRvd25sb2FkLAotICAgICAgICBXZWJLaXQ6Oldl YlBvbGljeUFjdGlvbjo6SWdub3JlLAotICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6 U3VzcGVuZAorICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6SWdub3JlCiAgICAgPjsK IH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQgYi9Tb3VyY2UvV2Vi S2l0L1NvdXJjZXMudHh0CmluZGV4IGEwYjZmNzI4NDYwLi44YWVjYjg2NDcyNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9Tb3VyY2VzLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMu dHh0CkBAIC0yMzAsNiArMjMwLDcgQEAgVUlQcm9jZXNzL0luc3BlY3RvclRhcmdldFByb3h5LmNw cAogVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuY3BwCiBVSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlv bi5jcHAKIFVJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNwcAorVUlQcm9jZXNzL1Byb3Zpc2lv bmFsUGFnZVByb3h5LmNwcAogVUlQcm9jZXNzL1JlbW90ZVdlYkluc3BlY3RvclByb3h5LmNwcAog VUlQcm9jZXNzL1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwCiBVSVByb2Nlc3MvU2VydmljZVdvcmtl clByb2Nlc3NQcm94eS5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tCmluZGV4IGNmMTkxOWM5M2E3Li5jNzlmY2IyMTBiNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC00NCw2ICs0NCw3 IEBACiAjaW1wb3J0ICJOYXZpZ2F0aW9uU3RhdGUuaCIKICNpbXBvcnQgIk9iakNPYmplY3RHcmFw aC5oIgogI2ltcG9ydCAiUGFnZUNsaWVudC5oIgorI2ltcG9ydCAiUHJvdmlzaW9uYWxQYWdlUHJv eHkuaCIKICNpbXBvcnQgIlJlbW90ZUxheWVyVHJlZVNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YS5o IgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24uaCIKICNpbXBvcnQgIlJlbW90 ZU9iamVjdFJlZ2lzdHJ5LmgiCkBAIC00NjY0LDYgKzQ2NjUsMTEgQEAgLSAodm9pZClfa2lsbFdl YkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRTdGF0ZQogewogICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nl c3NQcm94eT4gcHJvdGVjdGVkUHJvY2Vzc1Byb3h5KF9wYWdlLT5wcm9jZXNzKCkpOwogICAgIHBy b3RlY3RlZFByb2Nlc3NQcm94eS0+cmVxdWVzdFRlcm1pbmF0aW9uKFdlYktpdDo6UHJvY2Vzc1Rl cm1pbmF0aW9uUmVhc29uOjpSZXF1ZXN0ZWRCeUNsaWVudCk7CisKKyAgICBpZiAoYXV0byogcHJv dmlzaW9uYWxQYWdlUHJveHkgPSBfcGFnZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKSkgeworICAg ICAgICBSZWY8V2ViS2l0OjpXZWJQcm9jZXNzUHJveHk+IHByb3RlY3RlZFByb2Nlc3NQcm94eShw cm92aXNpb25hbFBhZ2VQcm94eS0+cHJvY2VzcygpKTsKKyAgICAgICAgcHJvdGVjdGVkUHJvY2Vz c1Byb3h5LT5yZXF1ZXN0VGVybWluYXRpb24oV2ViS2l0OjpQcm9jZXNzVGVybWluYXRpb25SZWFz b246OlJlcXVlc3RlZEJ5Q2xpZW50KTsKKyAgICB9CiB9CiAKICNpZiBQTEFURk9STShNQUMpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmggYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKaW5kZXggMGI4NThjNDZlZTQuLjZmM2RmODQ1 MmIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCkBAIC00OCw2ICs0OCw3IEBA CiAKIE9CSkNfQ0xBU1MgQ0FMYXllcjsKIE9CSkNfQ0xBU1MgTlNGaWxlV3JhcHBlcjsKK09CSkNf Q0xBU1MgTlNNZW51OwogT0JKQ19DTEFTUyBOU1NldDsKIE9CSkNfQ0xBU1MgV0tEcmF3aW5nVmll dzsKIE9CSkNfQ0xBU1MgX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAuLmJkYTA1OTljY2Y5Ci0tLSAvZGV2L251bGwKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCkBAIC0wLDAgKzEs Mjg2IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAq IDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUg Y29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZv cm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQor ICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGgg dGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQ UExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJF U1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywK KyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNT IEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5U IFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBB TlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgor ICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywg UFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0Yg VVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dF VkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAq IENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5D RSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0Yg VEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1ZGUgIlByb3Zp c2lvbmFsUGFnZVByb3h5LmgiCisKKyNpbmNsdWRlICJBUElOYXZpZ2F0aW9uLmgiCisjaW5jbHVk ZSAiRHJhd2luZ0FyZWFQcm94eS5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKKyNpbmNsdWRlICJQ YWdlQ2xpZW50LmgiCisjaW5jbHVkZSAiV2ViQmFja0ZvcndhcmRMaXN0LmgiCisjaW5jbHVkZSAi V2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oIgorI2luY2x1ZGUgIldlYkVycm9ycy5oIgorI2luY2x1 ZGUgIldlYk5hdmlnYXRpb25TdGF0ZS5oIgorI2luY2x1ZGUgIldlYlBhZ2VNZXNzYWdlcy5oIgor I2luY2x1ZGUgIldlYlBhZ2VQcm94eS5oIgorI2luY2x1ZGUgIldlYlBhZ2VQcm94eU1lc3NhZ2Vz LmgiCisjaW5jbHVkZSAiV2ViUHJvY2Vzc01lc3NhZ2VzLmgiCisjaW5jbHVkZSAiV2ViUHJvY2Vz c1Byb3h5LmgiCisjaW5jbHVkZSA8V2ViQ29yZS9TaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQu aD4KKworbmFtZXNwYWNlIFdlYktpdCB7CisKKyNkZWZpbmUgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RChjaGFubmVsLCBmbXQsIC4uLikgUkVMRUFTRV9MT0dfSUYobV9wYWdlLmlzQWx3YXlzT25Mb2dn aW5nQWxsb3dlZCgpLCBjaGFubmVsLCAiJXAgLSBQcm92aXNpb25hbFBhZ2VQcm94eTo6IiBmbXQs IHRoaXMsICMjX19WQV9BUkdTX18pCisKK1Byb3Zpc2lvbmFsUGFnZVByb3h5OjpQcm92aXNpb25h bFBhZ2VQcm94eShXZWJQYWdlUHJveHkmIHBhZ2UsIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJv Y2Vzcywgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4gc3VzcGVuZGVkUGFnZSwg dWludDY0X3QgbmF2aWdhdGlvbklELCBib29sIGlzU2VydmVyUmVkaXJlY3QsIGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVu dCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KQorICAgIDogbV9wYWdlKHBhZ2UpCisgICAg LCBtX3Byb2Nlc3MoV1RGTW92ZShwcm9jZXNzKSkKKyAgICAsIG1fbmF2aWdhdGlvbklEKG5hdmln YXRpb25JRCkKKyAgICAsIG1faXNTZXJ2ZXJSZWRpcmVjdChpc1NlcnZlclJlZGlyZWN0KQorICAg ICwgbV9yZXF1ZXN0KHJlcXVlc3QpCisgICAgLCBtX3Byb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGll bnQocHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCkKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZ KQorICAgICwgbV9zdXNwZW5zaW9uVG9rZW4obV9wcm9jZXNzLT50aHJvdHRsZXIoKS5iYWNrZ3Jv dW5kQWN0aXZpdHlUb2tlbigpKQorI2VuZGlmCit7CisgICAgbV9wcm9jZXNzLT5hZGRNZXNzYWdl UmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBt X3BhZ2UucGFnZUlEKCksICp0aGlzKTsKKyAgICBtX3Byb2Nlc3MtPmFkZFByb3Zpc2lvbmFsUGFn ZVByb3h5KCp0aGlzKTsKKworICAgIGluaXRpYWxpemVXZWJQYWdlKCk7CisKKyAgICAvLyBJZiB3 ZSBhcmUgcmVhdHRhY2hpbmcgdG8gYSBTdXNwZW5kZWRQYWdlLCB0aGVuIHRoZSBXZWJQcm9jZXNz JyBXZWJQYWdlIGFscmVhZHkgZXhpc3RzIGFuZAorICAgIC8vIFdlYlBhZ2VQcm94eTo6ZGlkQ3Jl YXRlTWFpbkZyYW1lKCkgd2lsbCBub3QgYmUgY2FsbGVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJh bWUuIEluIHN1Y2gKKyAgICAvLyBjYXNlLCB3ZSBuZWVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJh bWUgdG8gcmVmbGVjdCB0aGUgZmFjdCB0aGUgdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UKKyAgICAv LyBhbHJlYWR5IGV4aXN0cyBhbmQgYWxyZWFkeSBoYXMgYSBtYWluIGZyYW1lLgorICAgIGlmIChz dXNwZW5kZWRQYWdlKSB7CisgICAgICAgIEFTU0VSVCgmc3VzcGVuZGVkUGFnZS0+cHJvY2Vzcygp ID09IG1fcHJvY2Vzcy5wdHIoKSk7CisgICAgICAgIHN1c3BlbmRlZFBhZ2UtPnVuc3VzcGVuZCgp OworICAgICAgICBtX21haW5GcmFtZSA9IFdlYkZyYW1lUHJveHk6OmNyZWF0ZShtX3BhZ2UsIHN1 c3BlbmRlZFBhZ2UtPm1haW5GcmFtZUlEKCkpOworICAgICAgICBtX3Byb2Nlc3MtPmZyYW1lQ3Jl YXRlZChzdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpLCAqbV9tYWluRnJhbWUpOworICAgIH0K K30KKworUHJvdmlzaW9uYWxQYWdlUHJveHk6On5Qcm92aXNpb25hbFBhZ2VQcm94eSgpCit7Cisg ICAgbV9wcm9jZXNzLT5yZW1vdmVQcm92aXNpb25hbFBhZ2VQcm94eSgqdGhpcyk7CisKKyAgICBp ZiAobV93YXNDb21taXR0ZWQpCisgICAgICAgIHJldHVybjsKKworICAgIG1fcHJvY2Vzcy0+cmVt b3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZl ck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6 OldlYlBhZ2U6OkNsb3NlKCksIG1fcGFnZS5wYWdlSUQoKSk7CisKKyAgICBpZiAobV9kcmF3aW5n QXJlYSkgeworICAgICAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9y YXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICAgICAgbV9kcmF3aW5nQXJlYSA9 IG51bGxwdHI7CisgICAgfQorCisgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtwcm9jZXNz ID0gbV9wcm9jZXNzLmNvcHlSZWYoKV0geworICAgICAgICBwcm9jZXNzLT5tYXliZVNodXREb3du KCk7CisgICAgfSk7Cit9CisKK3N0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBQcm92 aXNpb25hbFBhZ2VQcm94eTo6dGFrZURyYXdpbmdBcmVhKCkKK3sKKyAgICByZXR1cm4gV1RGTW92 ZShtX2RyYXdpbmdBcmVhKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6Y2FuY2Vs KCkKK3sKKyAgICAvLyBJZiB0aGUgcHJvdmlzaW9uYWwgbG9hZCBzdGFydGVkLCB0aGVuIGluZGlj YXRlIHRoYXQgaXQgZmFpbGVkIGR1ZSB0byBjYW5jZWxsYXRpb24gYnkgY2FsbGluZyBkaWRGYWls UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoKS4KKyAgICBpZiAobV9wcm92aXNpb25hbExvYWRVUkwu aXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CisKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VE KFByb2Nlc3NTd2FwcGluZywgImNhbmNlbDogU2ltdWxhdGluZyBhIGRpZEZhaWxQcm92aXNpb25h bExvYWRGb3JGcmFtZSBmb3IgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCkpOwor ICAgIEFTU0VSVChtX21haW5GcmFtZSk7CisgICAgYXV0byBlcnJvciA9IFdlYktpdDo6Y2FuY2Vs bGVkRXJyb3IobV9yZXF1ZXN0KTsKKyAgICBlcnJvci5zZXRUeXBlKFdlYkNvcmU6OlJlc291cmNl RXJyb3I6OlR5cGU6OkNhbmNlbGxhdGlvbik7CisgICAgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lKG1fbWFpbkZyYW1lLT5mcmFtZUlEKCksIHsgfSwgbV9uYXZpZ2F0aW9uSUQsIG1fcHJv dmlzaW9uYWxMb2FkVVJMLCBlcnJvciwgVXNlckRhdGEgeyB9KTsgLy8gV2lsbCBkZWxldGUgfHRo aXN8LgorfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSgp Cit7CisgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3Zl cnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgbV9kcmF3aW5nQXJlYSA9IG1fcGFnZS5wYWdl Q2xpZW50KCkuY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpOworCisgICAgYXV0byBwYXJhbWV0ZXJz ID0gbV9wYWdlLmNyZWF0aW9uUGFyYW1ldGVycygpOworICAgIHBhcmFtZXRlcnMuaXNQcm9jZXNz U3dhcCA9IHRydWU7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpD cmVhdGVXZWJQYWdlKG1fcGFnZS5wYWdlSUQoKSwgcGFyYW1ldGVycyksIDApOworfQorCit2b2lk IFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdh dGlvbiYgbmF2aWdhdGlvbiwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBkYXRhLCBjb25zdCBT dHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcmIGJh c2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0 YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit7CisgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0g bV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgbV9wYWdl LmxvYWREYXRhV2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgZGF0YSwgTUlNRVR5cGUsIGVuY29k aW5nLCBiYXNlVVJMLCB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdM b2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9u YWxQYWdlUHJveHk6OmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBu YXZpZ2F0aW9uLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBXZWJDb3JlOjpT aG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5IHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ks IEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3 ZWJzaXRlUG9saWNpZXMpCit7CisgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdl LnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgbV9wYWdlLmxvYWRS ZXF1ZXN0V2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgV1RGTW92ZShyZXF1ZXN0KSwgc2hvdWxk T3BlbkV4dGVybmFsVVJMc1BvbGljeSwgdXNlckRhdGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXND b250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOworfQorCit2b2lk IFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpnb1RvQmFja0ZvcndhcmRJdGVtKEFQSTo6TmF2aWdhdGlv biYgbmF2aWdhdGlvbiwgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYgaXRlbSwgT3B0aW9uYWw8V2Vi c2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit7CisgICAgYXV0byBpdGVtU3Rh dGVzID0gbV9wYWdlLmJhY2tGb3J3YXJkTGlzdCgpLmZpbHRlcmVkSXRlbVN0YXRlcyhbdGhpcywg dGFyZ2V0SXRlbSA9ICZpdGVtXShhdXRvJiBpdGVtKSB7CisgICAgICAgIGlmIChhdXRvKiBwYWdl ID0gaXRlbS5zdXNwZW5kZWRQYWdlKCkpIHsKKyAgICAgICAgICAgIGlmICgmcGFnZS0+cHJvY2Vz cygpID09IG1fcHJvY2Vzcy5wdHIoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgICAgIH0KKyAgICAgICAgcmV0dXJuICZpdGVtICE9IHRhcmdldEl0ZW07CisgICAgfSk7Cisg ICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpVcGRhdGVCYWNrRm9yd2FyZExp c3RGb3JSZWF0dGFjaChXVEZNb3ZlKGl0ZW1TdGF0ZXMpKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKyAg ICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0o bmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgaXRlbS5pdGVtSUQoKSwgKm5hdmlnYXRpb24uYmFj a0ZvcndhcmRGcmFtZUxvYWRUeXBlKCksIFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5n TG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpLCBtX3BhZ2UucGFnZUlEKCkpOwor ICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7Cit9CisKK3ZvaWQg UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZENyZWF0ZU1haW5GcmFtZSh1aW50NjRfdCBmcmFtZUlE KQoreworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiZGlkQ3Jl YXRlTWFpbkZyYW1lOiBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCwg bV9wYWdlLnBhZ2VJRCgpLCBmcmFtZUlEKTsKKyAgICBBU1NFUlQoIW1fbWFpbkZyYW1lKTsKKwor ICAgIG1fbWFpbkZyYW1lID0gV2ViRnJhbWVQcm94eTo6Y3JlYXRlKG1fcGFnZSwgZnJhbWVJRCk7 CisKKyAgICAvLyBBZGQgdGhlIGZyYW1lIHRvIHRoZSBwcm9jZXNzIHdpZGUgbWFwLgorICAgIG1f cHJvY2Vzcy0+ZnJhbWVDcmVhdGVkKGZyYW1lSUQsICptX21haW5GcmFtZSk7CisKKyAgICAvLyBU aGlzIG5hdmlnYXRpb24gd2FzIGRlc3Ryb3llZCBzbyBubyBuZWVkIHRvIG5vdGlmeSBvZiByZWRp cmVjdC4KKyAgICBpZiAoIW1fcGFnZS5uYXZpZ2F0aW9uU3RhdGUoKS5oYXNOYXZpZ2F0aW9uKG1f bmF2aWdhdGlvbklEKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gUmVzdG9yZSB0aGUgbWFp biBmcmFtZSdzIGNvbW1pdHRlZCBVUkwgYXMgc29tZSBjbGllbnRzIG1heSByZWx5IG9uIGl0IHVu dGlsIHRoZSBuZXh0IGxvYWQgaXMgY29tbWl0dGVkLgorICAgIGlmIChhdXRvKiBtYWluRnJhbWUg PSBtX3BhZ2UubWFpbkZyYW1lKCkpCisgICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0 ZSgpLnNldFVSTChtYWluRnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkudXJsKCkpOworCisgICAgLy8g Tm9ybWFsbHksIG5vdGlmaWNhdGlvbiBvZiBhIHNlcnZlciByZWRpcmVjdCBjb21lcyBmcm9tIHRo ZSBXZWJDb250ZW50IHByb2Nlc3MuCisgICAgLy8gSWYgd2UgYXJlIHByb2Nlc3Mgc3dhcHBpbmcg aW4gcmVzcG9uc2UgdG8gYSBzZXJ2ZXIgcmVkaXJlY3QgdGhlbiB0aGF0IG5vdGlmaWNhdGlvbiB3 aWxsIG5vdCBjb21lIGZyb20gdGhlIG5ldyBXZWJDb250ZW50IHByb2Nlc3MuCisgICAgLy8gSW4g dGhpcyBjYXNlIHdlIGhhdmUgdGhlIFVJUHJvY2VzcyBzeW50aGVzaXplIHRoZSByZWRpcmVjdCBu b3RpZmljYXRpb24gYXQgdGhlIGFwcHJvcHJpYXRlIHRpbWUuCisgICAgaWYgKG1faXNTZXJ2ZXJS ZWRpcmVjdCkgeworICAgICAgICBtX21haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5kaWRTdGFy dFByb3Zpc2lvbmFsTG9hZChtX3JlcXVlc3QudXJsKCkpOworCisgICAgICAgIGF1dG8gcGFnZVBy b2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nl c3MpOworICAgICAgICBtX3BhZ2UuZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9u YWxMb2FkRm9yRnJhbWUobV9tYWluRnJhbWUtPmZyYW1lSUQoKSwgbV9uYXZpZ2F0aW9uSUQsIFdU Rk1vdmUobV9yZXF1ZXN0KSwgeyB9KTsKKyAgICB9Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdl UHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwg dWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiB1cmwsIFVSTCYmIHVucmVhY2hhYmxlVVJMLCBj b25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCit7CisgICAgLy8gSWYgdGhlIHByZXZpb3VzIHByb3Zp c2lvbmFsIGxvYWQgdXNlZCB0aGUgc2FtZSBwcm9jZXNzLCB3ZSBtYXkgcmVjZWl2ZSBJUEMgZm9y IHRoaXMgcHJldmlvdXMgcHJvdmlzaW9uYWwncyBtYWluIGZyYW1lIHRoYXQgd2UgbmVlZCB0byBp Z25vcmUuCisgICAgaWYgKCFtX21haW5GcmFtZSB8fCBtX21haW5GcmFtZS0+ZnJhbWVJRCgpICE9 IGZyYW1lSUQpCisgICAgICAgIHJldHVybjsKKworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQo UHJvY2Vzc1N3YXBwaW5nLCAiZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTogcGFnZUlE ID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEID0gJSIg UFJJdTY0LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCk7CisgICAgQVNT RVJUKG1fcHJvdmlzaW9uYWxMb2FkVVJMLmlzTnVsbCgpKTsKKyAgICBtX3Byb3Zpc2lvbmFsTG9h ZFVSTCA9IHVybDsKKworICAgIC8vIE1lcmVseSBmb2xsb3dpbmcgYSBzZXJ2ZXIgc2lkZSByZWRp cmVjdCBzbyB0aGVyZSBpcyBubyBuZWVkIHRvIHNlbmQgYSBkaWRTdGFydFByb3Zpc2lvbmFsTG9h ZCBhZ2Fpbi4KKyAgICBpZiAobV9pc1NlcnZlclJlZGlyZWN0KQorICAgICAgICByZXR1cm47CisK KyAgICAvLyBDbGllbnRzIGV4cGVjdCB0aGUgUGFnZSdzIG1haW4gZnJhbWUncyBleHBlY3RlZFVS TCB0byBiZSB0aGUgcHJvdmlzaW9uYWwgb25lIHdoZW4gYSBwcm92aXNpb25hbCBsb2FkIGlzIHN0 YXJ0ZWQuCisgICAgaWYgKGF1dG8qIHBhZ2VNYWluRnJhbWUgPSBtX3BhZ2UubWFpbkZyYW1lKCkp CisgICAgICAgIHBhZ2VNYWluRnJhbWUtPmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKHVybCk7CisK KyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlk ZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBtX3BhZ2UuZGlkU3RhcnRQcm92aXNpb25hbExvYWRG b3JGcmFtZShmcmFtZUlELCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUodXJsKSwgV1RGTW92ZSh1bnJl YWNoYWJsZVVSTCksIHVzZXJEYXRhKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6 ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdl YkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3Qg bmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJMLCBjb25zdCBXZWJDb3Jl OjpSZXNvdXJjZUVycm9yJiBlcnJvciwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAg IGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJv Y2VzcyhtX3Byb2Nlc3MpOworCisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dh cHBpbmcsICJkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6IHBhZ2VJRCA9ICUiIFBSSXU2 NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIG5hdmlnYXRpb25JRCA9ICUiIFBSSXU2NCwgbV9w YWdlLnBhZ2VJRCgpLCBmcmFtZUlELCBuYXZpZ2F0aW9uSUQpOworICAgIG1fcHJvdmlzaW9uYWxM b2FkVVJMID0geyB9OworCisgICAgLy8gTWFrZSBzdXJlIHRoZSBQYWdlJ3MgbWFpbiBmcmFtZSdz IGV4cGVjdGVkVVJMIGdldHMgY2xlYXJlZCBzaW5jZSB3ZSB1cGRhdGVkIGl0IGluIGRpZFN0YXJ0 UHJvdmlzaW9uYWxMb2FkLgorICAgIGlmIChhdXRvKiBwYWdlTWFpbkZyYW1lID0gbV9wYWdlLm1h aW5GcmFtZSgpKQorICAgICAgICBwYWdlTWFpbkZyYW1lLT5kaWRGYWlsUHJvdmlzaW9uYWxMb2Fk KCk7CisKKyAgICBtX3BhZ2UuZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKGZyYW1lSUQs IGZyYW1lU2VjdXJpdHlPcmlnaW4sIG5hdmlnYXRpb25JRCwgcHJvdmlzaW9uYWxVUkwsIGVycm9y LCB1c2VyRGF0YSk7IC8vIFdpbGwgZGVsZXRlIHx0aGlzfC4KK30KKwordm9pZCBQcm92aXNpb25h bFBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2 NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1 c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29y ZTo6Q2VydGlmaWNhdGVJbmZvJiBjZXJ0aWZpY2F0ZUluZm8sIGJvb2wgY29udGFpbnNQbHVnaW5E b2N1bWVudCwgT3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJ bnNlY3VyZUNvbnRlbnQsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICAvLyBJZiB0 aGUgcHJldmlvdXMgcHJvdmlzaW9uYWwgbG9hZCB1c2VkIHRoZSBzYW1lIHByb2Nlc3MsIHdlIG1h eSByZWNlaXZlIElQQyBmb3IgdGhpcyBwcmV2aW91cyBwcm92aXNpb25hbCdzIG1haW4gZnJhbWUg dGhhdCB3ZSBuZWVkIHRvIGlnbm9yZS4KKyAgICBpZiAoIW1fbWFpbkZyYW1lIHx8IG1fbWFpbkZy YW1lLT5mcmFtZUlEKCkgIT0gZnJhbWVJRCkKKyAgICAgICAgcmV0dXJuOworCisgICAgUkVMRUFT RV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJkaWRDb21taXRMb2FkRm9yRnJhbWU6 IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIG5hdmlnYXRpb25J RCA9ICUiIFBSSXU2NCwgbV9wYWdlLnBhZ2VJRCgpLCBmcmFtZUlELCBuYXZpZ2F0aW9uSUQpOwor ICAgIG1fcHJvdmlzaW9uYWxMb2FkVVJMID0geyB9OworICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVz c2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUo KSwgbV9wYWdlLnBhZ2VJRCgpKTsKKworICAgIG1fd2FzQ29tbWl0dGVkID0gdHJ1ZTsKKyAgICBt X3BhZ2UuY29tbWl0UHJvdmlzaW9uYWxQYWdlKGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgbWltZVR5 cGUsIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCBmcmFtZUxvYWRUeXBlLCBjZXJ0aWZp Y2F0ZUluZm8sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIGZvcmNlZEhhc0luc2VjdXJlQ29udGVu dCwgdXNlckRhdGEpOyAvLyBXaWxsIGRlbGV0ZSB8dGhpc3wuCit9CisKK3ZvaWQgUHJvdmlzaW9u YWxQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlv biwgSVBDOjpEZWNvZGVyJiBkZWNvZGVyKQoreworICAgIEFTU0VSVChkZWNvZGVyLm1lc3NhZ2VS ZWNlaXZlck5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJO YW1lKCkpOworCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjpEaWRTdGFydFByb2dyZXNzOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5t ZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENoYW5nZVByb2dyZXNz OjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OkJhY2tGb3J3YXJkQWRkSXRlbTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29k ZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpMb2dEaWFnbm9zdGlj TWVzc2FnZTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpMb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhFbmhhbmNlZFByaXZh Y3k6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6U2V0TmV0d29ya1JlcXVlc3RzSW5Qcm9ncmVzczo6bmFtZSgpCisgICAg ICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpS ZWdpc3RlcldlYlByb2Nlc3NBY2Nlc3NpYmlsaXR5VG9rZW46Om5hbWUoKQorICAgICAgICB8fCBk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5t ZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlN0YXJ0VVJMU2NoZW1lVGFz azo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpEZWNpZGVQb2xpY3lGb3JSZXNwb25zZTo6bmFtZSgpCisgICAgICAgIHx8 IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRQZXJm b3JtQ2xpZW50UmVkaXJlY3Q6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1l KCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JG cmFtZTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpEaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YTo6bmFtZSgpKQor ICAgIHsKKyAgICAgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFy aWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgICAgIG1fcGFnZS5kaWRSZWNlaXZl TWVzc2FnZShjb25uZWN0aW9uLCBkZWNvZGVyKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwor ICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6 RGlkQ3JlYXRlTWFpbkZyYW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdl PE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENyZWF0ZU1haW5GcmFtZT4oZGVjb2RlciwgdGhp cywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOworICAgICAgICBy ZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOjpuYW1lKCkp IHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRp ZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25h bFBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OkRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZTo6bmFtZSgpKSB7 CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRG YWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBh Z2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6RGlkQ29tbWl0TG9hZEZvckZyYW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBD OjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENvbW1pdExvYWRGb3JG cmFtZT4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDb21taXRMb2Fk Rm9yRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgTE9HKFByb2Nlc3NTd2Fw cGluZywgIlVuaGFuZGxlZCBtZXNzYWdlICVzOjolcyBmcm9tIHByb3Zpc2lvbmFsIHByb2Nlc3Mi LCBkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKS50b1N0cmluZygpLmRhdGEoKSwgZGVjb2Rl ci5tZXNzYWdlTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgpKTsKK30KKwordm9pZCBQcm92aXNpb25h bFBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYgY29ubmVj dGlvbiwgSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVy PiYgZW5jb2RlcikKK3sKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OkJhY2tGb3J3YXJkSXRlbUF0SW5kZXg6Om5hbWUoKSB8fCBkZWNvZGVy Lm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6QmFja0ZvcndhcmRHb1Rv SXRlbTo6bmFtZSgpKSB7CisgICAgICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFn ZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgICAgICBtX3BhZ2Uu ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKGNvbm5lY3Rpb24sIGRlY29kZXIsIGVuY29kZXIpOworICAg ICAgICByZXR1cm47CisgICAgfQorCisgICAgTE9HKFByb2Nlc3NTd2FwcGluZywgIlVuaGFuZGxl ZCBzeW5jIG1lc3NhZ2UgJXM6OiVzIGZyb20gcHJvdmlzaW9uYWwgcHJvY2VzcyIsIGRlY29kZXIu bWVzc2FnZVJlY2VpdmVyTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgpLCBkZWNvZGVyLm1lc3NhZ2VO YW1lKCkudG9TdHJpbmcoKS5kYXRhKCkpOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5Lmgg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi5lZGMxNDE1NTQ5YgotLS0gL2Rldi9udWxs CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmgKQEAg LTAsMCArMSw4OSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxOSBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBt ZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhl IGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJp bmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBp biB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRl ZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURF RCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFO WSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJM RSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFS WSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBM T1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElP TikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVS IElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5F R0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUg VVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNwcmFnbWEgb25jZQorCisjaW5jbHVkZSAiTWVz c2FnZVJlY2VpdmVyLmgiCisKK25hbWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNzIFJlc291cmNlUmVx dWVzdDsKK30KKworbmFtZXNwYWNlIFdlYktpdCB7CisKK2NsYXNzIERyYXdpbmdBcmVhUHJveHk7 CitjbGFzcyBTdXNwZW5kZWRQYWdlUHJveHk7CitjbGFzcyBXZWJGcmFtZVByb3h5OworY2xhc3Mg V2ViUGFnZVByb3h5OworY2xhc3MgV2ViUHJvY2Vzc1Byb3h5OworCitjbGFzcyBQcm92aXNpb25h bFBhZ2VQcm94eSA6IHB1YmxpYyBJUEM6Ok1lc3NhZ2VSZWNlaXZlciB7CisgICAgV1RGX01BS0Vf RkFTVF9BTExPQ0FURUQ7CitwdWJsaWM6CisgICAgUHJvdmlzaW9uYWxQYWdlUHJveHkoV2ViUGFn ZVByb3h5JiwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiwgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRl ZFBhZ2VQcm94eT4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgYm9vbCBpc1NlcnZlclJlZGlyZWN0 LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5 Q2xpZW50KTsKKyAgICB+UHJvdmlzaW9uYWxQYWdlUHJveHkoKTsKKworICAgIFdlYlBhZ2VQcm94 eSYgcGFnZSgpIHsgcmV0dXJuIG1fcGFnZTsgfQorICAgIFdlYkZyYW1lUHJveHkqIG1haW5GcmFt ZSgpIGNvbnN0IHsgcmV0dXJuIG1fbWFpbkZyYW1lLmdldCgpOyB9CisgICAgV2ViUHJvY2Vzc1By b3h5JiBwcm9jZXNzKCkgeyByZXR1cm4gbV9wcm9jZXNzLmdldCgpOyB9CisgICAgUHJvY2Vzc1N3 YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KCkgY29uc3Qg eyByZXR1cm4gbV9wcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50OyB9CisgICAgdWludDY0X3Qg bmF2aWdhdGlvbklEKCkgY29uc3QgeyByZXR1cm4gbV9uYXZpZ2F0aW9uSUQ7IH0KKworICAgIHN0 ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiB0YWtlRHJhd2luZ0FyZWEoKTsKKworICAg IHZvaWQgbG9hZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBjb25zdCBJUEM6 OkRhdGFSZWZlcmVuY2UmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVu Y29kaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0 aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7CisgICAgdm9pZCBs b2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYsIFdlYkNvcmU6OlJlc291 cmNlUmVxdWVzdCYmLCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6 Ok9iamVjdCogdXNlckRhdGEsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6 Om51bGxvcHQpOworICAgIHZvaWQgZ29Ub0JhY2tGb3J3YXJkSXRlbShBUEk6Ok5hdmlnYXRpb24m LCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtJiwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4m Jik7CisgICAgdm9pZCBjYW5jZWwoKTsKKworcHJpdmF0ZToKKyAgICAvLyBJUEM6Ok1lc3NhZ2VS ZWNlaXZlcgorICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBD OjpEZWNvZGVyJikgZmluYWw7CisgICAgdm9pZCBkaWRSZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpD b25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJiwgc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4m KSBmaW5hbDsKKworICAgIHZvaWQgZGlkQ3JlYXRlTWFpbkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQp OworICAgIHZvaWQgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFt ZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwg Y29uc3QgVXNlckRhdGEmKTsKKyAgICB2b2lkIGRpZENvbW1pdExvYWRGb3JGcmFtZSh1aW50NjRf dCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUs IGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90IGZyYW1lTG9hZFR5 cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYsIGJvb2wgY29udGFpbnNQbHVnaW5E b2N1bWVudCwgT3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJ bnNlY3VyZUNvbnRlbnQsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRGYWlsUHJvdmlz aW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6U2VjdXJp dHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQs IGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJy b3ImLCBjb25zdCBVc2VyRGF0YSYpOworCisgICAgdm9pZCBpbml0aWFsaXplV2ViUGFnZSgpOwor CisgICAgV2ViUGFnZVByb3h5JiBtX3BhZ2U7CisgICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gbV9w cm9jZXNzOworICAgIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBtX2RyYXdpbmdB cmVhOworICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5PiBtX21haW5GcmFtZTsKKyAgICB1aW50NjRf dCBtX25hdmlnYXRpb25JRDsKKyAgICBib29sIG1faXNTZXJ2ZXJSZWRpcmVjdDsKKyAgICBXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3QgbV9yZXF1ZXN0OworICAgIFByb2Nlc3NTd2FwUmVxdWVzdGVk QnlDbGllbnQgbV9wcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50OworICAgIGJvb2wgbV93YXND b21taXR0ZWQgeyBmYWxzZSB9OworICAgIFVSTCBtX3Byb3Zpc2lvbmFsTG9hZFVSTDsKKworI2lm IFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgUHJvY2Vzc1Rocm90dGxlcjo6QmFja2dyb3VuZEFj dGl2aXR5VG9rZW4gbV9zdXNwZW5zaW9uVG9rZW47CisjZW5kaWYKK307CisKK30gLy8gbmFtZXNw YWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVk UGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94 eS5jcHAKaW5kZXggZjE5OGE4MTUzM2YuLmZmNzZkOWY3Zjk3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAKQEAgLTEwMCw3ICsxMDAsOSBAQCBT dXNwZW5kZWRQYWdlUHJveHk6On5TdXNwZW5kZWRQYWdlUHJveHkoKQogICAgIC8vIElmIHRoZSBz dXNwZW5kZWQgcGFnZSB3YXMgbm90IGNvbnN1bWVkIGJlZm9yZSBnZXR0aW5nIGRlc3Ryb3llZCwg dGhlbiBjbG9zZSB0aGUgY29ycmVzcG9uZGluZyBwYWdlCiAgICAgLy8gb24gdGhlIFdlYlByb2Nl c3Mgc2lkZS4KICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNsb3NlKCks IG1fcGFnZS5wYWdlSUQoKSk7Ci0gICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIo TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFn ZUlEKCkpOworCisgICAgaWYgKG1fc3VzcGVuc2lvblN0YXRlID09IFN1c3BlbnNpb25TdGF0ZTo6 U3VzcGVuZGluZykKKyAgICAgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVz c2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlE KCkpOwogCiAgICAgLy8gV2UgY2FsbCBtYXliZVNodXREb3duKCkgYXN5bmNocm9ub3VzbHkgc2lu Y2UgdGhlIFN1c3BlbmRlZFBhZ2UgaXMgY3VycmVudGx5IGJlaW5nIHJlbW92ZWQgZnJvbSB0aGUg V2ViUHJvY2Vzc1Bvb2wKICAgICAvLyBhbmQgd2Ugd2FudCB0byBhdm9pZCByZS1lbnRlcmluZyBX ZWJQcm9jZXNzUG9vbCBtZXRob2RzLgpAQCAtMTM0LDcgKzEzNiw2IEBAIHZvaWQgU3VzcGVuZGVk UGFnZVByb3h5Ojp1bnN1c3BlbmQoKQogICAgIEFTU0VSVChtX3N1c3BlbnNpb25TdGF0ZSA9PSBT dXNwZW5zaW9uU3RhdGU6OlN1c3BlbmRlZCk7CiAKICAgICBtX3N1c3BlbnNpb25TdGF0ZSA9IFN1 c3BlbnNpb25TdGF0ZTo6UmVzdW1lZDsKLSAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNl aXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFn ZS5wYWdlSUQoKSk7CiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRJ c1N1c3BlbmRlZChmYWxzZSksIG1fcGFnZS5wYWdlSUQoKSk7CiB9CiAKQEAgLTE1MSw2ICsxNTIs OCBAQCB2b2lkIFN1c3BlbmRlZFBhZ2VQcm94eTo6ZGlkUHJvY2Vzc1JlcXVlc3RUb1N1c3BlbmQo U3VzcGVuc2lvblN0YXRlIG5ld1N1c3BlbnNpbwogICAgIG1fc3VzcGVuc2lvblRva2VuID0gbnVs bHB0cjsKICNlbmRpZgogCisgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVz c2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlE KCkpOworCiAgICAgaWYgKG1fcmVhZHlUb1Vuc3VzcGVuZEhhbmRsZXIpCiAgICAgICAgIG1fcmVh ZHlUb1Vuc3VzcGVuZEhhbmRsZXIodGhpcyk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YkZyYW1lUHJveHkuY3BwCmluZGV4IGM3N2EyNmI3NDI3Li41M2M3MTk2YzJhYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNp bmNsdWRlICJXZWJGcmFtZVByb3h5LmgiCiAKICNpbmNsdWRlICJBUElOYXZpZ2F0aW9uLmgiCisj aW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbmNsdWRlICJXZWJDZXJ0aWZpY2F0 ZUluZm8uaCIKICNpbmNsdWRlICJXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkuaCIKICNpbmNs dWRlICJXZWJQYWdlTWVzc2FnZXMuaCIKQEAgLTc0LDcgKzc1LDcgQEAgYm9vbCBXZWJGcmFtZVBy b3h5Ojppc01haW5GcmFtZSgpIGNvbnN0CiAgICAgaWYgKCFtX3BhZ2UpCiAgICAgICAgIHJldHVy biBmYWxzZTsKIAotICAgIHJldHVybiB0aGlzID09IG1fcGFnZS0+bWFpbkZyYW1lKCk7CisgICAg cmV0dXJuIHRoaXMgPT0gbV9wYWdlLT5tYWluRnJhbWUoKSB8fCAobV9wYWdlLT5wcm92aXNpb25h bFBhZ2VQcm94eSgpICYmIHRoaXMgPT0gbV9wYWdlLT5wcm92aXNpb25hbFBhZ2VQcm94eSgpLT5t YWluRnJhbWUoKSk7CiB9CiAKIHZvaWQgV2ViRnJhbWVQcm94eTo6bG9hZFVSTChjb25zdCBVUkwm IHVybCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDM5Mjc0 M2JkNTY3Li43N2FkNjBjMmFkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCkBAIC03Nyw2ICs3Nyw3IEBACiAjaW5jbHVkZSAiUGx1Z2luSW5mb3JtYXRpb24uaCIK ICNpbmNsdWRlICJQbHVnaW5Qcm9jZXNzTWFuYWdlci5oIgogI2luY2x1ZGUgIlByaW50SW5mby5o IgorI2luY2x1ZGUgIlByb3Zpc2lvbmFsUGFnZVByb3h5LmgiCiAjaW5jbHVkZSAiU2FmZUJyb3dz aW5nV2FybmluZy5oIgogI2luY2x1ZGUgIlNoYXJlU2hlZXRDYWxsYmFja0lELmgiCiAjaW5jbHVk ZSAiU2hhcmVkQnVmZmVyRGF0YVJlZmVyZW5jZS5oIgpAQCAtNzY4LDM4ICs3NjksMjUgQEAgYm9v bCBXZWJQYWdlUHJveHk6OnN1c3BlbmRDdXJyZW50UGFnZUlmUG9zc2libGUoQVBJOjpOYXZpZ2F0 aW9uJiBuYXZpZ2F0aW9uLCBPcHQKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBXZWJQYWdl UHJveHk6OnN3YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBz dGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmIGRlc3RpbmF0aW9uU3VzcGVuZGVk UGFnZSwgSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9pZCBXZWJQ YWdlUHJveHk6OnN3YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNz LCBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4mJiBkcmF3aW5nQXJlYSwgUmVmUHRy PFdlYkZyYW1lUHJveHk+JiYgbWFpbkZyYW1lKQogewogICAgIEFTU0VSVCghbV9pc0Nsb3NlZCk7 CiAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAic3dhcFRvV2ViUHJvY2Vzczog d2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRp ZmllcigpLCBtX3BhZ2VJRCk7CiAKICAgICBtX3Byb2Nlc3MgPSBXVEZNb3ZlKHByb2Nlc3MpOwor ICAgIEFTU0VSVCghbV9kcmF3aW5nQXJlYSk7CisgICAgbV9kcmF3aW5nQXJlYSA9IFdURk1vdmUo ZHJhd2luZ0FyZWEpOworICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOworICAgIG1fbWFpbkZyYW1l ID0gV1RGTW92ZShtYWluRnJhbWUpOwogICAgIG1faXNWYWxpZCA9IHRydWU7CiAKLSAgICAvLyBJ ZiB3ZSBhcmUgcmVhdHRhY2hpbmcgdG8gYSBTdXNwZW5kZWRQYWdlLCB0aGVuIHRoZSBXZWJQcm9j ZXNzJyBXZWJQYWdlIGFscmVhZHkgZXhpc3RzIGFuZAotICAgIC8vIFdlYlBhZ2VQcm94eTo6ZGlk Q3JlYXRlTWFpbkZyYW1lKCkgd2lsbCBub3QgYmUgY2FsbGVkIHRvIGluaXRpYWxpemUgbV9tYWlu RnJhbWUuIEluIHN1Y2gKLSAgICAvLyBjYXNlLCB3ZSBuZWVkIHRvIGluaXRpYWxpemUgbV9tYWlu RnJhbWUgdG8gcmVmbGVjdCB0aGUgZmFjdCB0aGUgdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UKLSAg ICAvLyBhbHJlYWR5IGV4aXN0cyBhbmQgYWxyZWFkeSBoYXMgYSBtYWluIGZyYW1lLgotICAgIGlm IChkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UpIHsKLSAgICAgICAgaWYgKCFkZXN0aW5hdGlvblN1 c3BlbmRlZFBhZ2UtPmZhaWxlZFRvU3VzcGVuZCgpKSB7Ci0gICAgICAgICAgICBBU1NFUlQoIW1f bWFpbkZyYW1lKTsKLSAgICAgICAgICAgIEFTU0VSVCgmZGVzdGluYXRpb25TdXNwZW5kZWRQYWdl LT5wcm9jZXNzKCkgPT0gbV9wcm9jZXNzLnB0cigpKTsKLSAgICAgICAgICAgIGRlc3RpbmF0aW9u U3VzcGVuZGVkUGFnZS0+dW5zdXNwZW5kKCk7Ci0gICAgICAgICAgICBtX21haW5GcmFtZSA9IFdl YkZyYW1lUHJveHk6OmNyZWF0ZSgqdGhpcywgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5tYWlu RnJhbWVJRCgpKTsKLSAgICAgICAgICAgIG1fcHJvY2Vzcy0+ZnJhbWVDcmVhdGVkKGRlc3RpbmF0 aW9uU3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSwgKm1fbWFpbkZyYW1lKTsKLSAgICAgICAg fSBlbHNlIHsKLSAgICAgICAgICAgIC8vIFdlIGZhaWxlZCB0byBzdXNwZW5kIHRoZSBwYWdlIHNv IGRlc3Ryb3kgaXQgbm93IGFuZCBtZXJlbHkgcmV1c2UgaXRzIFdlYkNvbnRlbnQgcHJvY2Vzcy4K LSAgICAgICAgICAgIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSA9IG51bGxwdHI7Ci0gICAgICAg IH0KLSAgICB9Ci0KICAgICBtX3Byb2Nlc3MtPmFkZEV4aXN0aW5nV2ViUGFnZSgqdGhpcywgbV9w YWdlSUQsIFdlYlByb2Nlc3NQcm94eTo6QmVnaW5zVXNpbmdEYXRhU3RvcmU6Ok5vKTsKICAgICBt X3Byb2Nlc3MtPmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNz YWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZUlELCAqdGhpcyk7CiAKLSAgICBmaW5pc2hBdHRhY2hp bmdUb1dlYlByb2Nlc3MoaXNTd2FwRnJvbVN1c3BlbmRlZCk7CisgICAgZmluaXNoQXR0YWNoaW5n VG9XZWJQcm9jZXNzKCk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hpbmdU b1dlYlByb2Nlc3MoSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9p ZCBXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcygpCiB7CiAgICAgQVNT RVJUKG1fcHJvY2Vzcy0+c3RhdGUoKSAhPSBDaGlsZFByb2Nlc3NQcm94eTo6U3RhdGU6OlRlcm1p bmF0ZWQpOwogCkBAIC04MzUsNyArODIzLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmZpbmlzaEF0 dGFjaGluZ1RvV2ViUHJvY2VzcyhJc1N3YXBGcm9tU3VzcGVuZGVkIGlzU3dhcEZyb21TdXMKICAg ICBtX2VkaXRhYmxlSW1hZ2VDb250cm9sbGVyID0gc3RkOjptYWtlX3VuaXF1ZTxFZGl0YWJsZUlt YWdlQ29udHJvbGxlcj4oKnRoaXMpOwogI2VuZGlmCiAKLSAgICBpbml0aWFsaXplV2ViUGFnZShp c1N3YXBGcm9tU3VzcGVuZGVkKTsKKyAgICBpbml0aWFsaXplV2ViUGFnZSgpOwogCiAgICAgbV9p bnNwZWN0b3ItPnVwZGF0ZUZvck5ld1BhZ2VQcm9jZXNzKHRoaXMpOwogCkBAIC05MDAsMTIgKzg4 OCwxNCBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9X ZWJQcm9jZXNzV2l0aEl0ZW0oV2ViQmFja0ZvcndhcgogICAgIHJldHVybiBXVEZNb3ZlKG5hdmln YXRpb24pOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoSXNTd2Fw RnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9pZCBXZWJQYWdlUHJveHk6Omlu aXRpYWxpemVXZWJQYWdlKCkKIHsKICAgICBBU1NFUlQoaXNWYWxpZCgpKTsKIAotICAgIG1fZHJh d2luZ0FyZWEgPSBwYWdlQ2xpZW50KCkuY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpOwotICAgIEFT U0VSVChtX2RyYXdpbmdBcmVhKTsKKyAgICBpZiAoIW1fZHJhd2luZ0FyZWEpIHsKKyAgICAgICAg bV9kcmF3aW5nQXJlYSA9IHBhZ2VDbGllbnQoKS5jcmVhdGVEcmF3aW5nQXJlYVByb3h5KCk7Cisg ICAgICAgIEFTU0VSVChtX2RyYXdpbmdBcmVhKTsKKyAgICB9CiAKICNpZiBFTkFCTEUoQVNZTkNf U0NST0xMSU5HKSAmJiBQTEFURk9STShDT0NPQSkKICAgICBpZiAobV9kcmF3aW5nQXJlYS0+dHlw ZSgpID09IERyYXdpbmdBcmVhVHlwZVJlbW90ZUxheWVyVHJlZSkgewpAQCAtOTE3LDE0ICs5MDcs NyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoSXNTd2FwRnJvbVN1c3Bl bmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQogICAgIH0KICNlbmRpZgogCi0gICAgYXV0byBwYXJh bWV0ZXJzID0gY3JlYXRpb25QYXJhbWV0ZXJzKCk7Ci0gICAgcGFyYW1ldGVycy5pc1N3YXBGcm9t U3VzcGVuZGVkID0gaXNTd2FwRnJvbVN1c3BlbmRlZCA9PSBJc1N3YXBGcm9tU3VzcGVuZGVkOjpZ ZXM7Ci0KLSNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCi0gICAgcGFyYW1ldGVycy5oYXNSZWdp c3RlcmVkU2VydmljZVdvcmtlcnMgPSBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS5tYXlIYXZlUmVn aXN0ZXJlZFNlcnZpY2VXb3JrZXJzKG1fd2Vic2l0ZURhdGFTdG9yZSk7Ci0jZW5kaWYKLQotICAg IHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpDcmVhdGVXZWJQYWdlKG1fcGFn ZUlELCBwYXJhbWV0ZXJzKSwgMCk7CisgICAgcHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OldlYlBy b2Nlc3M6OkNyZWF0ZVdlYlBhZ2UobV9wYWdlSUQsIGNyZWF0aW9uUGFyYW1ldGVycygpKSwgMCk7 CiAKICAgICBtX25lZWRzVG9GaW5pc2hJbml0aWFsaXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1 bmNoID0gdHJ1ZTsKICAgICBmaW5pc2hJbml0aWFsaXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1 bmNoKCk7CkBAIC0xMDc2LDcgKzEwNTksOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6bG9hZFJlcXVl c3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIFJlc291cgogICAg IGF1dG8gdHJhbnNhY3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKIAogICAg IGF1dG8gdXJsID0gcmVxdWVzdC51cmwoKTsKLSAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0UGVuZGlu Z0FQSVJlcXVlc3RVUkwodHJhbnNhY3Rpb24sIHVybCk7CisgICAgaWYgKHNob3VsZFRyZWF0QXND b250aW51aW5nTG9hZCAhPSBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcykKKyAgICAg ICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCB1 cmwpOwogCiAgICAgaWYgKCFpc1ZhbGlkKCkpCiAgICAgICAgIHJlYXR0YWNoVG9XZWJQcm9jZXNz KCk7CkBAIC0yNjk3LDcgKzI2ODEsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVjZWl2ZWROYXZp Z2F0aW9uUG9saWN5RGVjaXNpb24oV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbgogICAgICAg ICB9CiAKICAgICAgICAgaWYgKHByb2Nlc3NGb3JOYXZpZ2F0aW9uLnB0cigpICE9ICZwcm9jZXNz KCkpIHsKLSAgICAgICAgICAgIHBvbGljeUFjdGlvbiA9IGlzUGFnZU9wZW5lZEJ5RE9NU2hvd2lu Z0luaXRpYWxFbXB0eURvY3VtZW50KCkgPyBXZWJQb2xpY3lBY3Rpb246Oklnbm9yZSA6IFdlYlBv bGljeUFjdGlvbjo6U3VzcGVuZDsKKyAgICAgICAgICAgIHBvbGljeUFjdGlvbiA9IFdlYlBvbGlj eUFjdGlvbjo6SWdub3JlOwogICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9j ZXNzU3dhcHBpbmcsICJkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uLCBzd2FwcGluZyBw cm9jZXNzICVpIHdpdGggcHJvY2VzcyAlaSBmb3IgbmF2aWdhdGlvbiwgcmVhc29uOiAle3B1Ymxp Y31zIiwgcHJvY2Vzc0lkZW50aWZpZXIoKSwgcHJvY2Vzc0Zvck5hdmlnYXRpb24tPnByb2Nlc3NJ ZGVudGlmaWVyKCksIHJlYXNvbi51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgICAgIExPRyhQcm9j ZXNzU3dhcHBpbmcsICIoUHJvY2Vzc1N3YXBwaW5nKSBTd2l0Y2hpbmcgZnJvbSBwcm9jZXNzICVp IHRvIG5ldyBwcm9jZXNzICglaSkgZm9yIG5hdmlnYXRpb24gJSIgUFJJdTY0ICIgJyVzJyIsIHBy b2Nlc3NJZGVudGlmaWVyKCksIHByb2Nlc3NGb3JOYXZpZ2F0aW9uLT5wcm9jZXNzSWRlbnRpZmll cigpLCBuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi0+bG9nZ2luZ1N0cmlu ZygpKTsKICAgICAgICAgfSBlbHNlCkBAIC0yNzA2LDggKzI2OTAsMTQgQEAgdm9pZCBXZWJQYWdl UHJveHk6OnJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uKFdlYlBvbGljeUFjdGlvbiBw b2xpY3lBY3Rpb24KICAgICAgICAgYm9vbCBzaG91bGRQcm9jZXNzU3dhcCA9IHByb2Nlc3NGb3JO YXZpZ2F0aW9uLnB0cigpICE9ICZwcm9jZXNzKCk7CiAgICAgICAgIHJlY2VpdmVkUG9saWN5RGVj aXNpb24ocG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uLnB0cigpLCBzaG91bGRQcm9jZXNzU3dhcCA/ IFdURjo6bnVsbG9wdCA6IFdURk1vdmUoZGF0YSksIFdURk1vdmUoc2VuZGVyKSk7CiAKLSAgICAg ICAgaWYgKHNob3VsZFByb2Nlc3NTd2FwKQotICAgICAgICAgICAgY29udGludWVOYXZpZ2F0aW9u SW5OZXdQcm9jZXNzKG5hdmlnYXRpb24sIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSA/IHByb2Nl c3MoKS5wcm9jZXNzUG9vbCgpLnRha2VTdXNwZW5kZWRQYWdlKCpkZXN0aW5hdGlvblN1c3BlbmRl ZFBhZ2UpIDogbnVsbHB0ciwgV1RGTW92ZShwcm9jZXNzRm9yTmF2aWdhdGlvbiksIHByb2Nlc3NT d2FwUmVxdWVzdGVkQnlDbGllbnQsIFdURk1vdmUoZGF0YSkpOworICAgICAgICBpZiAoIXNob3Vs ZFByb2Nlc3NTd2FwKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGF1dG8gc3VzcGVu ZGVkUGFnZSA9IGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSA/IHByb2Nlc3MoKS5wcm9jZXNzUG9v bCgpLnRha2VTdXNwZW5kZWRQYWdlKCpkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UpIDogbnVsbHB0 cjsKKyAgICAgICAgaWYgKHN1c3BlbmRlZFBhZ2UgJiYgc3VzcGVuZGVkUGFnZS0+ZmFpbGVkVG9T dXNwZW5kKCkpCisgICAgICAgICAgICBzdXNwZW5kZWRQYWdlID0gbnVsbHB0cjsKKworICAgICAg ICBjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MobmF2aWdhdGlvbiwgV1RGTW92ZShzdXNw ZW5kZWRQYWdlKSwgV1RGTW92ZShwcm9jZXNzRm9yTmF2aWdhdGlvbiksIHByb2Nlc3NTd2FwUmVx dWVzdGVkQnlDbGllbnQsIFdURk1vdmUoZGF0YSkpOwogICAgIH0pOwogfQogCkBAIC0yNzQzLDI0 ICsyNzMzLDQ1IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZFBvbGljeURlY2lzaW9uKFdl YlBvbGljeUFjdGlvbiBhY3Rpb24sIEFQSTo6TmF2aWdhdGlvCiAgICAgc2VuZGVyLT5zZW5kKGFj dGlvbiwgbmF2aWdhdGlvbiA/IG5hdmlnYXRpb24tPm5hdmlnYXRpb25JRCgpIDogMCwgZG93bmxv YWRJRCwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6 OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRp b24sIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYgc3VzcGVuZGVkUGFnZVBy b3h5LCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIFByb2Nlc3NTd2FwUmVxdWVzdGVk QnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgT3B0aW9uYWw8V2Vic2l0ZVBv bGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit2b2lkIFdlYlBhZ2VQcm94eTo6Y29tbWl0 UHJvdmlzaW9uYWxQYWdlKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwg Y29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRl ciwgdWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZv JiBjZXJ0aWZpY2F0ZUluZm8sIGJvb2wgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9uYWw8 V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIGNv bnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKIHsKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExv YWRpbmcsICJjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3M6IHdlYlBJRCA9ICVpLCBwYWdl SUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQp OwotICAgIExPRyhMb2FkaW5nLCAiQ29udGludWluZyBuYXZpZ2F0aW9uICUiIFBSSXU2NCAiICcl cycgaW4gYSBuZXcgd2ViIHByb2Nlc3MiLCBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBuYXZp Z2F0aW9uLmxvZ2dpbmdTdHJpbmcoKSk7CisgICAgQVNTRVJUKG1fcHJvdmlzaW9uYWxQYWdlKTsK KyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJjb21taXRQcm92aXNpb25hbFBh Z2U6IHByZXZpb3VzUElEID0gJWksIG5ld1BJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQsIG1f cHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3Mo KS5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCk7CiAKLSAgICBSZWY8V2ViUHJvY2Vzc1By b3h5PiBwcmV2aW91c1Byb2Nlc3MgPSBtX3Byb2Nlc3MuY29weVJlZigpOwogICAgIE9wdGlvbmFs PHVpbnQ2NF90PiBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzID0gbV9tYWluRnJhbWUgPyBt YWtlT3B0aW9uYWwobV9tYWluRnJhbWUtPmZyYW1lSUQoKSkgOiBXVEY6Om51bGxvcHQ7Ci0gICAg YXV0byBtYWluRnJhbWVVUkwgPSBtX21haW5GcmFtZSA/IG1fbWFpbkZyYW1lLT51cmwoKSA6IFVS TCgpOwogCi0gICAgQVNTRVJUKG1fcHJvY2Vzcy5wdHIoKSAhPSBwcm9jZXNzLnB0cigpKTsKKyAg ICBBU1NFUlQobV9wcm9jZXNzLnB0cigpICE9ICZtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2Vzcygp KTsKIAogICAgIHByb2Nlc3NEaWRUZXJtaW5hdGUoUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpO YXZpZ2F0aW9uU3dhcCk7CiAKICAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihN ZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZUlEKTsK LSAgICBib29sIGRpZFN1c3BlbmRQcmV2aW91c1BhZ2UgPSBzdXNwZW5kQ3VycmVudFBhZ2VJZlBv c3NpYmxlKG5hdmlnYXRpb24sIG1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MsIHByb2Nlc3NT d2FwUmVxdWVzdGVkQnlDbGllbnQpOworICAgIGF1dG8qIG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9u U3RhdGUoKS5uYXZpZ2F0aW9uKG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSk7Cisg ICAgYm9vbCBkaWRTdXNwZW5kUHJldmlvdXNQYWdlID0gbmF2aWdhdGlvbiA/IHN1c3BlbmRDdXJy ZW50UGFnZUlmUG9zc2libGUoKm5hdmlnYXRpb24sIG1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nl c3MsIG1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KCkpIDog ZmFsc2U7CiAgICAgbV9wcm9jZXNzLT5yZW1vdmVXZWJQYWdlKCp0aGlzLCBtX3BhZ2VJRCwgV2Vi UHJvY2Vzc1Byb3h5OjpFbmRzVXNpbmdEYXRhU3RvcmU6Ok5vKTsKIAotICAgIHN3YXBUb1dlYlBy b2Nlc3MoV1RGTW92ZShwcm9jZXNzKSwgV1RGTW92ZShzdXNwZW5kZWRQYWdlUHJveHkpLCBkaWRT dXNwZW5kUHJldmlvdXNQYWdlID8gSXNTd2FwRnJvbVN1c3BlbmRlZDo6WWVzIDogSXNTd2FwRnJv bVN1c3BlbmRlZDo6Tm8pOworICAgIC8vIFRoZXJlIGlzIG5vIHdheSB3ZSdsbCBiZSBhYmxlIHRv IHJldHVybiB0byB0aGUgcGFnZSBpbiB0aGUgcHJldmlvdXMgcGFnZSBzbyBjbG9zZSBpdC4KKyAg ICBpZiAoIWRpZFN1c3BlbmRQcmV2aW91c1BhZ2UpCisgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChN ZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgcGFnZUlEKCkpOworCisgICAgc3dhcFRvV2ViUHJv Y2VzcyhtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2VzcygpLCBtX3Byb3Zpc2lvbmFsUGFnZS0+dGFr ZURyYXdpbmdBcmVhKCksIG1fcHJvdmlzaW9uYWxQYWdlLT5tYWluRnJhbWUoKSk7CisKKyAgICBk aWRDb21taXRMb2FkRm9yRnJhbWUoZnJhbWVJRCwgbmF2aWdhdGlvbklELCBtaW1lVHlwZSwgZnJh bWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIGZyYW1lTG9hZFR5cGUsIGNlcnRpZmljYXRlSW5m bywgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCB1c2Vy RGF0YSk7CisKKyAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7Cit9CisKK3ZvaWQgV2Vi UGFnZVByb3h5Ojpjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpOYXZpZ2F0aW9u JiBuYXZpZ2F0aW9uLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmIHN1c3Bl bmRlZFBhZ2VQcm94eSwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBuZXdQcm9jZXNzLCBQcm9jZXNz U3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIE9wdGlv bmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQoreworICAgIFJFTEVB U0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2Vz czogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRl bnRpZmllcigpLCBtX3BhZ2VJRCk7CisgICAgTE9HKExvYWRpbmcsICJDb250aW51aW5nIG5hdmln YXRpb24gJSIgUFJJdTY0ICIgJyVzJyBpbiBhIG5ldyB3ZWIgcHJvY2VzcyIsIG5hdmlnYXRpb24u bmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24ubG9nZ2luZ1N0cmluZygpKTsKKworICAgIGlmICht X3Byb3Zpc2lvbmFsUGFnZSkgeworICAgICAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UtPm5hdmln YXRpb25JRCgpICE9IG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCkpCisgICAgICAgICAgICBtX3By b3Zpc2lvbmFsUGFnZS0+Y2FuY2VsKCk7CisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlID0gbnVs bHB0cjsKKyAgICB9CisKKyAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IHN0ZDo6bWFrZV91bmlxdWU8 UHJvdmlzaW9uYWxQYWdlUHJveHk+KCp0aGlzLCBuZXdQcm9jZXNzLmNvcHlSZWYoKSwgV1RGTW92 ZShzdXNwZW5kZWRQYWdlUHJveHkpLCBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBuYXZpZ2F0 aW9uLmN1cnJlbnRSZXF1ZXN0SXNSZWRpcmVjdCgpLCBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0 KCksIHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpOwogCiAgICAgaWYgKGF1dG8qIGl0ZW0g PSBuYXZpZ2F0aW9uLnRhcmdldEl0ZW0oKSkgewogICAgICAgICBMT0coTG9hZGluZywgIldlYlBh Z2VQcm94eSAlcCBjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MgdG8gYmFjayBpdGVtIFVS TCAlcyIsIHRoaXMsIGl0ZW0tPnVybCgpLnV0ZjgoKS5kYXRhKCkpOwpAQCAtMjc2OCw2NyArMjc3 OSwyMiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNz KEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgcwogICAgICAgICBhdXRvIHRyYW5zYWN0aW9u ID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CiAgICAgICAgIG1fcGFnZUxvYWRTdGF0 ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFuc2FjdGlvbiwgaXRlbS0+dXJsKCkpOwogCi0g ICAgICAgIGF1dG8gaXRlbVN0YXRlcyA9IG1fYmFja0ZvcndhcmRMaXN0LT5maWx0ZXJlZEl0ZW1T dGF0ZXMoW3RoaXMsIHRhcmdldEl0ZW0gPSBpdGVtXShXZWJCYWNrRm9yd2FyZExpc3RJdGVtJiBp dGVtKSB7Ci0gICAgICAgICAgICBpZiAoYXV0byogcGFnZSA9IGl0ZW0uc3VzcGVuZGVkUGFnZSgp KSB7Ci0gICAgICAgICAgICAgICAgaWYgKCZwYWdlLT5wcm9jZXNzKCkgPT0gbV9wcm9jZXNzLnB0 cigpKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICB9Ci0g ICAgICAgICAgICByZXR1cm4gJml0ZW0gIT0gdGFyZ2V0SXRlbTsKLSAgICAgICAgfSk7Ci0gICAg ICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6VXBkYXRlQmFja0ZvcndhcmRM aXN0Rm9yUmVhdHRhY2goV1RGTW92ZShpdGVtU3RhdGVzKSksIG1fcGFnZUlEKTsKLSAgICAgICAg bV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtKG5h dmlnYXRpb24ubmF2aWdhdGlvbklEKCksIGl0ZW0tPml0ZW1JRCgpLCAqbmF2aWdhdGlvbi5iYWNr Rm9yd2FyZEZyYW1lTG9hZFR5cGUoKSwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMs IFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSksIG1fcGFnZUlEKTsKLSAgICAgICAgbV9wcm9jZXNz LT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKLQorICAgICAgICBtX3Byb3Zpc2lvbmFs UGFnZS0+Z29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uLCAqaXRlbSwgV1RGTW92ZSh3ZWJz aXRlUG9saWNpZXMpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGlmIChtX2JhY2tG b3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKSAmJiAobmF2aWdhdGlvbi5sb2NrQmFja0ZvcndhcmRM aXN0KCkgPT0gTG9ja0JhY2tGb3J3YXJkTGlzdDo6WWVzIHx8IG5hdmlnYXRpb24ubG9ja0hpc3Rv cnkoKSA9PSBMb2NrSGlzdG9yeTo6WWVzKSkgewogICAgICAgICAvLyBJZiBXZWJDb3JlIGlzIHN1 cHBvc2VkIHRvIGxvY2sgdGhlIGhpc3RvcnkgZm9yIHRoaXMgbG9hZCwgdGhlbiB0aGUgbmV3IHBy b2Nlc3MgbmVlZHMgdG8ga25vdyBhYm91dCB0aGUgY3VycmVudCBoaXN0b3J5IGl0ZW0gc28gaXQg Y2FuIHVwZGF0ZQogICAgICAgICAvLyBpdCBpbnN0ZWFkIG9mIGNyZWF0aW5nIGEgbmV3IG9uZS4K LSAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRDdXJyZW50SGlz dG9yeUl0ZW1Gb3JSZWF0dGFjaChtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKS0+aXRl bVN0YXRlKCkpLCBtX3BhZ2VJRCk7CisgICAgICAgIG5ld1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6 OldlYlBhZ2U6OlNldEN1cnJlbnRIaXN0b3J5SXRlbUZvclJlYXR0YWNoKG1fYmFja0ZvcndhcmRM aXN0LT5jdXJyZW50SXRlbSgpLT5pdGVtU3RhdGUoKSksIG1fcGFnZUlEKTsKICAgICB9CiAKICAg ICAvLyBGSVhNRTogV29yayBvdXQgdGltaW5nIG9mIHJlc3BvbmRpbmcgd2l0aCB0aGUgbGFzdCBw b2xpY3kgZGVsZWdhdGUsIGV0YwogICAgIEFTU0VSVCghbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVz dCgpLmlzRW1wdHkoKSk7CiAgICAgaWYgKGF1dG8mIHN1YnN0aXR1dGVEYXRhID0gbmF2aWdhdGlv bi5zdWJzdGl0dXRlRGF0YSgpKQotICAgICAgICBsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKG5hdmln YXRpb24sIHsgc3Vic3RpdHV0ZURhdGEtPmNvbnRlbnQuZGF0YSgpLCBzdWJzdGl0dXRlRGF0YS0+ Y29udGVudC5zaXplKCkgfSwgc3Vic3RpdHV0ZURhdGEtPk1JTUVUeXBlLCBzdWJzdGl0dXRlRGF0 YS0+ZW5jb2RpbmcsIHN1YnN0aXR1dGVEYXRhLT5iYXNlVVJMLCBzdWJzdGl0dXRlRGF0YS0+dXNl ckRhdGEuZ2V0KCksIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdl YnNpdGVQb2xpY2llcykpOworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZS0+bG9hZERhdGFXaXRo TmF2aWdhdGlvbihuYXZpZ2F0aW9uLCB7IHN1YnN0aXR1dGVEYXRhLT5jb250ZW50LmRhdGEoKSwg c3Vic3RpdHV0ZURhdGEtPmNvbnRlbnQuc2l6ZSgpIH0sIHN1YnN0aXR1dGVEYXRhLT5NSU1FVHlw ZSwgc3Vic3RpdHV0ZURhdGEtPmVuY29kaW5nLCBzdWJzdGl0dXRlRGF0YS0+YmFzZVVSTCwgc3Vi c3RpdHV0ZURhdGEtPnVzZXJEYXRhLmdldCgpLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOwog ICAgIGVsc2UKLSAgICAgICAgbG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCBS ZXNvdXJjZVJlcXVlc3QgeyBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCkgfSwgV2ViQ29yZTo6 U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkQWxsb3dFeHRlcm5hbFNjaGVtZXMs IG51bGxwdHIsIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNp dGVQb2xpY2llcykpOwotCi0gICAgQVNTRVJUKCFtX21haW5GcmFtZSk7Ci0gICAgbV9tYWluRnJh bWVDcmVhdGlvbkhhbmRsZXIgPSBbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyks IG5hdmlnYXRpb25JRCA9IG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIHJlcXVlc3QgPSAgbmF2 aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpLCBtYWluRnJhbWVVUkwsIGlzU2VydmVyUmVkaXJlY3Qg PSBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0SXNSZWRpcmVjdCgpXSgpIG11dGFibGUgewotICAg ICAgICBpZiAoIXdlYWtUaGlzKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIEFTU0VS VChtX21haW5GcmFtZSk7Ci0gICAgICAgIC8vIFRoaXMgbmF2aWdhdGlvbiB3YXMgZGVzdHJveWVk IHNvIG5vIG5lZWQgdG8gbm90aWZ5IG9mIHJlZGlyZWN0LgotICAgICAgICBpZiAoIW5hdmlnYXRp b25TdGF0ZSgpLm5hdmlnYXRpb24obmF2aWdhdGlvbklEKSkKLSAgICAgICAgICAgIHJldHVybjsK LQotICAgICAgICAvLyBSZXN0b3JlIHRoZSBtYWluIGZyYW1lJ3MgY29tbWl0dGVkIFVSTCBhcyBz b21lIGNsaWVudHMgbWF5IHJlbHkgb24gaXQgdW50aWwgdGhlIG5leHQgbG9hZCBpcyBjb21taXR0 ZWQuCi0gICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLnNldFVSTChtYWluRnJh bWVVUkwpOwotCi0gICAgICAgIC8vIE5vcm1hbGx5LCBub3RpZmljYXRpb24gb2YgYSBzZXJ2ZXIg cmVkaXJlY3QgY29tZXMgZnJvbSB0aGUgV2ViQ29udGVudCBwcm9jZXNzLgotICAgICAgICAvLyBJ ZiB3ZSBhcmUgcHJvY2VzcyBzd2FwcGluZyBpbiByZXNwb25zZSB0byBhIHNlcnZlciByZWRpcmVj dCB0aGVuIHRoYXQgbm90aWZpY2F0aW9uIHdpbGwgbm90IGNvbWUgZnJvbSB0aGUgbmV3IFdlYkNv bnRlbnQgcHJvY2Vzcy4KLSAgICAgICAgLy8gSW4gdGhpcyBjYXNlIHdlIGhhdmUgdGhlIFVJUHJv Y2VzcyBzeW50aGVzaXplIHRoZSByZWRpcmVjdCBub3RpZmljYXRpb24gYXQgdGhlIGFwcHJvcHJp YXRlIHRpbWUuCi0gICAgICAgIGlmIChpc1NlcnZlclJlZGlyZWN0KSB7Ci0gICAgICAgICAgICBt X21haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZChyZXF1 ZXN0LnVybCgpKTsKLSAgICAgICAgICAgIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zp c2lvbmFsTG9hZEZvckZyYW1lKG1fbWFpbkZyYW1lLT5mcmFtZUlEKCksIG5hdmlnYXRpb25JRCwg V1RGTW92ZShyZXF1ZXN0KSwgeyB9KTsKLSAgICAgICAgfQotICAgIH07Ci0KLSAgICBpZiAoIW1f cHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKS5jb25maWd1cmF0aW9uKCkucHJvY2Vzc1N3YXBzT25XaW5k b3dPcGVuV2l0aE9wZW5lcigpIHx8ICFpc1BhZ2VPcGVuZWRCeURPTVNob3dpbmdJbml0aWFsRW1w dHlEb2N1bWVudCgpIHx8ICFtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzKSB7Ci0gICAgICAg IC8vIFRoZXJlIGlzIG5vIHdheSB3ZSdsbCBiZSBhYmxlIHRvIHJldHVybiB0byB0aGUgcGFnZSBp biB0aGUgcHJldmlvdXMgcGFnZSBzbyBjbG9zZSBpdC4KLSAgICAgICAgaWYgKCFkaWRTdXNwZW5k UHJldmlvdXNQYWdlKQotICAgICAgICAgICAgcHJldmlvdXNQcm9jZXNzLT5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlOjpDbG9zZSgpLCBtX3BhZ2VJRCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0K LSAgICBtX21haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlciA9IFt0aGlzLCBwcmV2aW91c1By b2Nlc3MgPSBXVEZNb3ZlKHByZXZpb3VzUHJvY2VzcyksIG1haW5GcmFtZUlESW5QcmV2aW91c1By b2Nlc3MgPSAqbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2Vzc10oY29uc3QgR2xvYmFsV2luZG93 SWRlbnRpZmllciYgd2luZG93SWRlbnRpZmllcikgewotICAgICAgICBBU1NFUlQobV9tYWluRnJh bWUpOwotICAgICAgICBHbG9iYWxGcmFtZUlkZW50aWZpZXIgbmF2aWdhdGVkRnJhbWVJZGVudGlm aWVySW5OZXdQcm9jZXNzIHsgcGFnZUlEKCksIG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkgfTsKLSAg ICAgICAgcHJldmlvdXNQcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpGcmFtZUJlY2Ft ZVJlbW90ZShtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzLCBuYXZpZ2F0ZWRGcmFtZUlkZW50 aWZpZXJJbk5ld1Byb2Nlc3MsIHdpbmRvd0lkZW50aWZpZXIpLCBwYWdlSUQoKSk7Ci0gICAgfTsK KyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UtPmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24obmF2 aWdhdGlvbiwgUmVzb3VyY2VSZXF1ZXN0IHsgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpIH0s IFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZEFsbG93RXh0ZXJu YWxTY2hlbWVzLCBudWxscHRyLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOwogfQogCiBib29s IFdlYlBhZ2VQcm94eTo6aXNQYWdlT3BlbmVkQnlET01TaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1l bnQoKSBjb25zdApAQCAtMzY5MywxMSArMzY1OSw2IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRD cmVhdGVNYWluRnJhbWUodWludDY0X3QgZnJhbWVJRCkKIAogICAgIC8vIEFkZCB0aGUgZnJhbWUg dG8gdGhlIHByb2Nlc3Mgd2lkZSBtYXAuCiAgICAgbV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoZnJh bWVJRCwgKm1fbWFpbkZyYW1lKTsKLQotICAgIGlmIChtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxl cikgewotICAgICAgICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlcigpOwotICAgICAgICBtX21h aW5GcmFtZUNyZWF0aW9uSGFuZGxlciA9IG51bGxwdHI7Ci0gICAgfQogfQogCiB2b2lkIFdlYlBh Z2VQcm94eTo6ZGlkQ3JlYXRlU3ViZnJhbWUodWludDY0X3QgZnJhbWVJRCkKQEAgLTM3MjIsMTAg KzM2ODMsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlU3ViZnJhbWUodWludDY0X3Qg ZnJhbWVJRCkKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVdpbmRvdyh1aW50NjRfdCBm cmFtZUlELCBHbG9iYWxXaW5kb3dJZGVudGlmaWVyJiYgd2luZG93SWRlbnRpZmllcikKIHsKLSAg ICBpZiAobV9tYWluRnJhbWUgJiYgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSA9PSBmcmFtZUlEKSB7 Ci0gICAgICAgIGlmIChhdXRvIG1haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlciA9IFdURk1v dmUobV9tYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIpKQotICAgICAgICAgICAgbWFpbkZy YW1lV2luZG93Q3JlYXRpb25IYW5kbGVyKHdpbmRvd0lkZW50aWZpZXIpOwotICAgIH0KIH0KIAog ZG91YmxlIFdlYlBhZ2VQcm94eTo6ZXN0aW1hdGVkUHJvZ3Jlc3MoKSBjb25zdApAQCAtMzc3OCw2 ICszNzM1LDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWREZXN0cm95TmF2aWdhdGlvbih1aW50 NjRfdCBuYXZpZ2F0aW9uSUQpCiB7CiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90ZWN0b3Io cGFnZUNsaWVudCgpKTsKIAorICAgIC8vIE9uIHByb2Nlc3Mtc3dhcCwgdGhlIHByZXZpb3VzIHBy b2Nlc3MgdHJpZXMgdG8gZGVzdHJveSB0aGUgbmF2aWdhdGlvbiBidXQgdGhlIHByb3Zpc2lvbmFs IHByb2Nlc3MgaXMgYWN0dWFsbHkgdGFraW5nIG92ZXIgdGhlIG5hdmlnYXRpb24uCisgICAgaWYg KG1fcHJvdmlzaW9uYWxQYWdlICYmIG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSA9 PSBuYXZpZ2F0aW9uSUQpCisgICAgICAgIHJldHVybjsKKwogICAgIC8vIEZJWE1FOiBNZXNzYWdl IGNoZWNrIHRoZSBuYXZpZ2F0aW9uSUQuCiAgICAgbV9uYXZpZ2F0aW9uU3RhdGUtPmRpZERlc3Ry b3lOYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCk7CiB9CkBAIC0zNzk1LDE0ICszNzU2LDYgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3Qg ZnJhbWVJRCwgdWludDY0X3QgbmEKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkgJiYgbmF2 aWdhdGlvbklEKQogICAgICAgICBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0YXRlKCkubmF2aWdh dGlvbihuYXZpZ2F0aW9uSUQpOwogCi0gICAgLy8gSWYgdGhpcyBzZWVtaW5nbHkgbmV3IGxvYWQg aXMgYWN0dWFsbHkgY29udGludWluZyBhIHNlcnZlciByZWRpcmVjdCBmb3IgYSBwcmV2aW91cyBu YXZpZ2F0aW9uIGluIGEgbmV3IHByb2Nlc3MsCi0gICAgLy8gdGhlbiB3ZSBpZ25vcmUgdGhpcyBu b3RpZmljYXRpb24uCi0gICAgaWYgKG5hdmlnYXRpb24gJiYgbmF2aWdhdGlvbi0+Y3VycmVudFJl cXVlc3RJc1JlZGlyZWN0KCkpIHsKLSAgICAgICAgYXV0byBuYXZpZ2F0aW9uUHJvY2Vzc0lkZW50 aWZpZXIgPSBuYXZpZ2F0aW9uLT5jdXJyZW50UmVxdWVzdFByb2Nlc3NJZGVudGlmaWVyKCk7Ci0g ICAgICAgIGlmIChuYXZpZ2F0aW9uUHJvY2Vzc0lkZW50aWZpZXIgJiYgKm5hdmlnYXRpb25Qcm9j ZXNzSWRlbnRpZmllciAhPSBtX3Byb2Nlc3MtPmNvcmVQcm9jZXNzSWRlbnRpZmllcigpKQotICAg ICAgICAgICAgcmV0dXJuOwotICAgIH0KLQogICAgIExPRyhMb2FkaW5nLCAiV2ViUGFnZVByb3h5 ICUiIFBSSXU2NCAiIGluIHByb2Nlc3MgcGlkICVpIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUgdG8gZnJhbWVJRCAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEICUiIFBSSXU2NCAiLCB1 cmwgJXMiLCBtX3BhZ2VJRCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBmcmFtZUlE LCBuYXZpZ2F0aW9uSUQsIHVybC5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICAgICBSRUxFQVNF X0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1l OiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQs IG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQsIGZyYW1lSUQpOwogCkBA IC0zOTEwLDYgKzM4NjMsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25h bExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cmkKIAogICAgIFBhZ2VD bGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKKyAgICBpZiAobV9wcm92 aXNpb25hbFBhZ2UgJiYgbV9wcm92aXNpb25hbFBhZ2UtPm5hdmlnYXRpb25JRCgpID09IG5hdmln YXRpb25JRCAmJiAmbV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3MoKSAhPSBtX3Byb2Nlc3MucHRy KCkpIHsKKyAgICAgICAgLy8gVGhlIGxvYWQgZGlkIG5vdCBmYWlsLCBpdCBtZXJlbHkgaGFwcGVu aW5nIGluIGEgbmV3IHByb3Zpc2lvbmFsIHByb2Nlc3MuCisgICAgICAgIHJldHVybjsKKyAgICB9 CisKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJ RCk7CiAgICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CiAKQEAgLTM5NDgsNiArMzkwNiwxMCBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90 IGZyYW1lSUQsIGNvbnN0IFNlY3VyaQogICAgIH0KIAogICAgIG1fZmFpbGluZ1Byb3Zpc2lvbmFs TG9hZFVSTCA9IHsgfTsKKworICAgIC8vIElmIHRoZSBwcm92aXNpb25hbCBwYWdlJ3MgbG9hZCBm YWlscyB0aGVuIHdlIGRlc3Ryb3kgdGhlIHByb3Zpc2lvbmFsIHBhZ2UuCisgICAgaWYgKG1fcHJv dmlzaW9uYWxQYWdlICYmIG1fcHJvdmlzaW9uYWxQYWdlLT5tYWluRnJhbWUoKSA9PSBmcmFtZSkK KyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBudWxscHRyOwogfQogCiB2b2lkIFdlYlBhZ2VQ cm94eTo6Y2xlYXJMb2FkRGVwZW5kZW50Q2FsbGJhY2tzKCkKQEAgLTQzMzksOCArNDMwMSw4IEBA IHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmMo dWludDY0X3QgZnJhbWVJRCwgV2ViQ29yCiAgICAgYXV0byogZnJhbWUgPSBtX3Byb2Nlc3MtPndl YkZyYW1lKGZyYW1lSUQpOwogICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOwogCi0gICAgZGVjaWRl UG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbigqZnJhbWUsIFdURk1vdmUoZnJhbWVTZWN1cml0eU9y aWdpbiksIG5hdmlnYXRpb25JRCwgV1RGTW92ZShuYXZpZ2F0aW9uQWN0aW9uRGF0YSksIFdURk1v dmUoZnJhbWVJbmZvRGF0YSksIG9yaWdpbmF0aW5nUGFnZUlELCBvcmlnaW5hbFJlcXVlc3QsIFdU Rk1vdmUocmVxdWVzdCksIFdURk1vdmUocmVxdWVzdEJvZHkpLCBXVEZNb3ZlKHJlZGlyZWN0UmVz cG9uc2UpLCB1c2VyRGF0YSwgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShbdGhpcywgcHJv dGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklEXSAoYXV0by4u LiBhcmdzKSB7Ci0gICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlk UmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4pLCBtX3Bh Z2VJRCk7CisgICAgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbigqZnJhbWUsIFdURk1v dmUoZnJhbWVTZWN1cml0eU9yaWdpbiksIG5hdmlnYXRpb25JRCwgV1RGTW92ZShuYXZpZ2F0aW9u QWN0aW9uRGF0YSksIFdURk1vdmUoZnJhbWVJbmZvRGF0YSksIG9yaWdpbmF0aW5nUGFnZUlELCBv cmlnaW5hbFJlcXVlc3QsIFdURk1vdmUocmVxdWVzdCksIFdURk1vdmUocmVxdWVzdEJvZHkpLCBX VEZNb3ZlKHJlZGlyZWN0UmVzcG9uc2UpLCB1c2VyRGF0YSwgUG9saWN5RGVjaXNpb25TZW5kZXI6 OmNyZWF0ZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBmcmFtZUlELCBs aXN0ZW5lcklELCBwcm9jZXNzID0gbV9wcm9jZXNzLmNvcHlSZWYoKV0gKGF1dG8uLi4gYXJncykg eworICAgICAgICBwcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRSZWNlaXZlUG9s aWN5RGVjaXNpb24oZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJncy4uLiksIG1fcGFnZUlEKTsKICAg ICB9KSk7CiB9CiAKQEAgLTQ1NzQsMTIgKzQ1MzYsMTIgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRl Y2lkZVBvbGljeUZvclJlc3BvbnNlKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaXR5T3Jp Z2kKICAgICBNRVNTQUdFX0NIRUNLX1VSTChyZXNwb25zZS51cmwoKSk7CiAKICAgICBSZWZQdHI8 QVBJOjpOYXZpZ2F0aW9uPiBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvbklEID8gbV9uYXZpZ2F0aW9u U3RhdGUtPm5hdmlnYXRpb24obmF2aWdhdGlvbklEKSA6IG51bGxwdHI7Ci0gICAgYXV0byBsaXN0 ZW5lciA9IG1ha2VSZWYoZnJhbWUtPnNldFVwUG9saWN5TGlzdGVuZXJQcm94eShbdGhpcywgcHJv dGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklELCBuYXZpZ2F0 aW9uID0gV1RGTW92ZShuYXZpZ2F0aW9uKV0gKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24s IEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9j ZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBSZWZQdHI8U2FmZUJyb3dzaW5nV2FybmluZz4mJiBz YWZlQnJvd3NpbmdXYXJuaW5nKSBtdXRhYmxlIHsKKyAgICBhdXRvIGxpc3RlbmVyID0gbWFrZVJl ZihmcmFtZS0+c2V0VXBQb2xpY3lMaXN0ZW5lclByb3h5KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0g bWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIG5hdmlnYXRpb24gPSBXVEZNb3Zl KG5hdmlnYXRpb24pLCBwcm9jZXNzID0gbV9wcm9jZXNzLmNvcHlSZWYoKV0gKFdlYlBvbGljeUFj dGlvbiBwb2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwgUHJvY2Vzc1N3YXBSZXF1 ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBSZWZQdHI8U2FmZUJy b3dzaW5nV2FybmluZz4mJiBzYWZlQnJvd3NpbmdXYXJuaW5nKSBtdXRhYmxlIHsKICAgICAgICAg Ly8gRklYTUU6IEFzc2VydCB0aGUgQVBJOjpXZWJzaXRlUG9saWNpZXMqIGlzIG51bGxwdHIgaGVy ZSBvbmNlIGNsaWVudHMgb2YgV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNlV2l0aFBvbGljaWVzIGdv IGF3YXkuCiAgICAgICAgIFJFTEVBU0VfQVNTRVJUKHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGll bnQgPT0gUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDo6Tm8pOwogICAgICAgICBBU1NFUlRf VU5VU0VEKHNhZmVCcm93c2luZ1dhcm5pbmcsICFzYWZlQnJvd3NpbmdXYXJuaW5nKTsKLSAgICAg ICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24sIG5hdmlnYXRpb24uZ2V0KCks IFdURjo6bnVsbG9wdCwgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShbdGhpcywgcHJvdGVj dGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySURdIChh dXRvLi4uIGFyZ3MpIHsKLSAgICAgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2Vi UGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQsIGFyZ3Mu Li4pLCBtX3BhZ2VJRCk7CisgICAgICAgIHJlY2VpdmVkUG9saWN5RGVjaXNpb24ocG9saWN5QWN0 aW9uLCBuYXZpZ2F0aW9uLmdldCgpLCBXVEY6Om51bGxvcHQsIFBvbGljeURlY2lzaW9uU2VuZGVy OjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCBm cmFtZUlELCBsaXN0ZW5lcklELCBwcm9jZXNzID0gV1RGTW92ZShwcm9jZXNzKV0gKGF1dG8uLi4g YXJncykgeworICAgICAgICAgICAgcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlk UmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4pLCBtX3Bh Z2VJRCk7CiAgICAgICAgIH0pKTsKICAgICB9LCBTaG91bGRFeHBlY3RTYWZlQnJvd3NpbmdSZXN1 bHQ6Ok5vKSk7CiAKQEAgLTY0ODYsOCArNjQ0OCw2IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpwcm9j ZXNzV2lsbEJlY29tZUZvcmVncm91bmQoKQogdm9pZCBXZWJQYWdlUHJveHk6OnJlc2V0U3RhdGUo UmVzZXRTdGF0ZVJlYXNvbiByZXNldFN0YXRlUmVhc29uKQogewogICAgIG1fbWFpbkZyYW1lID0g bnVsbHB0cjsKLSAgICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlciA9IG51bGxwdHI7Ci0gICAg bV9tYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIgPSBudWxscHRyOwogCiAjaWYgUExBVEZP Uk0oQ09DT0EpCiAgICAgbV9zY3JvbGxpbmdQZXJmb3JtYW5jZURhdGEgPSBudWxscHRyOwpAQCAt Njc3OCw2ICs2NzM4LDEwIEBAIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMgV2ViUGFnZVByb3h5 OjpjcmVhdGlvblBhcmFtZXRlcnMoKQogICAgIHBhcmFtZXRlcnMuYXBwbGljYXRpb25NYW5pZmVz dCA9IG1fY29uZmlndXJhdGlvbi0+YXBwbGljYXRpb25NYW5pZmVzdCgpID8gT3B0aW9uYWw8V2Vi Q29yZTo6QXBwbGljYXRpb25NYW5pZmVzdD4obV9jb25maWd1cmF0aW9uLT5hcHBsaWNhdGlvbk1h bmlmZXN0KCktPmFwcGxpY2F0aW9uTWFuaWZlc3QoKSkgOiBXVEY6Om51bGxvcHQ7CiAjZW5kaWYK IAorI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikKKyAgICBwYXJhbWV0ZXJzLmhhc1JlZ2lzdGVy ZWRTZXJ2aWNlV29ya2VycyA9IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLm1heUhhdmVSZWdpc3Rl cmVkU2VydmljZVdvcmtlcnMobV93ZWJzaXRlRGF0YVN0b3JlKTsKKyNlbmRpZgorCiAgICAgcGFy YW1ldGVycy5uZWVkc0ZvbnRBdHRyaWJ1dGVzID0gbV9uZWVkc0ZvbnRBdHRyaWJ1dGVzOwogCiAg ICAgbV9wcm9jZXNzLT5hZGRXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eShtX3VzZXJDb250 ZW50Q29udHJvbGxlciwgcGFyYW1ldGVycyk7CkBAIC04NTM5LDYgKzg1MDMsMjEgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OnNpbXVsYXRlRGV2aWNlT3JpZW50YXRpb25DaGFuZ2UoZG91YmxlIGFscGhh LCBkb3VibGUgYmV0YSwgZG8KICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6 OlNpbXVsYXRlRGV2aWNlT3JpZW50YXRpb25DaGFuZ2UoYWxwaGEsIGJldGEsIGdhbW1hKSwgbV9w YWdlSUQpOwogfQogCitXZWJQYWdlUHJveHk6OlBhZ2VQcm9jZXNzT3ZlcnJpZGU6OlBhZ2VQcm9j ZXNzT3ZlcnJpZGUoV2ViUGFnZVByb3h5JiBwYWdlLCBXZWJQcm9jZXNzUHJveHkmIG5ld1Byb2Nl c3MpCisgICAgOiBtX3BhZ2UoJnBhZ2UpCisgICAgLCBtX3ByZXZpb3VzUHJvY2VzcyhwYWdlLnBy b2Nlc3MoKSkKK3sKKyAgICBwYWdlLm1fcHJvY2VzcyA9IG5ld1Byb2Nlc3M7Cit9CisKK1dlYlBh Z2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6UGFnZVByb2Nlc3NPdmVycmlkZShQYWdlUHJv Y2Vzc092ZXJyaWRlJiYpID0gZGVmYXVsdDsKKworV2ViUGFnZVByb3h5OjpQYWdlUHJvY2Vzc092 ZXJyaWRlOjp+UGFnZVByb2Nlc3NPdmVycmlkZSgpCit7CisgICAgaWYgKG1fcGFnZSkKKyAgICAg ICAgbV9wYWdlLT5tX3Byb2Nlc3MgPSBXVEZNb3ZlKG1fcHJldmlvdXNQcm9jZXNzKTsKK30KKwog I2lmIEVOQUJMRShEQVRBX0RFVEVDVElPTikKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRldGVjdERh dGFJbkFsbEZyYW1lcyhXZWJDb3JlOjpEYXRhRGV0ZWN0b3JUeXBlcyB0eXBlcywgQ29tcGxldGlv bkhhbmRsZXI8dm9pZChjb25zdCBEYXRhRGV0ZWN0aW9uUmVzdWx0Jik+JiYgY29tcGxldGlvbkhh bmRsZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGNkODAxYjgw OGM0Li5jNjY2ZmRiNmZiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgK QEAgLTIyNSw2ICsyMjUsNyBAQCBjbGFzcyBOYXRpdmVXZWJLZXlib2FyZEV2ZW50OwogY2xhc3Mg TmF0aXZlV2ViTW91c2VFdmVudDsKIGNsYXNzIE5hdGl2ZVdlYldoZWVsRXZlbnQ7CiBjbGFzcyBQ YWdlQ2xpZW50OworY2xhc3MgUHJvdmlzaW9uYWxQYWdlUHJveHk7CiBjbGFzcyBSZW1vdGVMYXll clRyZWVIb3N0OwogY2xhc3MgUmVtb3RlTGF5ZXJUcmVlU2Nyb2xsaW5nUGVyZm9ybWFuY2VEYXRh OwogY2xhc3MgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb247CkBAIC00NTgsOCArNDU5LDcgQEAg cHVibGljOgogICAgIEFQSTo6SWNvbkxvYWRpbmdDbGllbnQmIGljb25Mb2FkaW5nQ2xpZW50KCkg eyByZXR1cm4gKm1faWNvbkxvYWRpbmdDbGllbnQ7IH0KICAgICB2b2lkIHNldEljb25Mb2FkaW5n Q2xpZW50KHN0ZDo6dW5pcXVlX3B0cjxBUEk6Okljb25Mb2FkaW5nQ2xpZW50PiYmKTsKIAotICAg IGVudW0gY2xhc3MgSXNTd2FwRnJvbVN1c3BlbmRlZCB7IE5vLCBZZXMgfTsKLSAgICB2b2lkIGlu aXRpYWxpemVXZWJQYWdlKElzU3dhcEZyb21TdXNwZW5kZWQgPSBJc1N3YXBGcm9tU3VzcGVuZGVk OjpObyk7CisgICAgdm9pZCBpbml0aWFsaXplV2ViUGFnZSgpOwogCiAgICAgV2Vha1B0cjxTZWNL ZXlQcm94eVN0b3JlPiBzZWNLZXlQcm94eVN0b3JlKGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0 aW9uQ2hhbGxlbmdlJik7CiAgICAgICAgIApAQCAtMTAyNSw2ICsxMDI1LDE5IEBAIHB1YmxpYzoK ICAgICBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MoKSB7IHJldHVybiBtX3Byb2Nlc3M7IH0KICAg ICBQcm9jZXNzSUQgcHJvY2Vzc0lkZW50aWZpZXIoKSBjb25zdDsKIAorICAgIGNsYXNzIFBhZ2VQ cm9jZXNzT3ZlcnJpZGUgeworICAgIHB1YmxpYzoKKyAgICAgICAgUGFnZVByb2Nlc3NPdmVycmlk ZShXZWJQYWdlUHJveHkmLCBXZWJQcm9jZXNzUHJveHkmIG5ld1Byb2Nlc3MpOworICAgICAgICBQ YWdlUHJvY2Vzc092ZXJyaWRlKFBhZ2VQcm9jZXNzT3ZlcnJpZGUmJik7CisgICAgICAgIH5QYWdl UHJvY2Vzc092ZXJyaWRlKCk7CisKKyAgICBwcml2YXRlOgorICAgICAgICBSZWZQdHI8V2ViUGFn ZVByb3h5PiBtX3BhZ2U7CisgICAgICAgIFJlZjxXZWJQcm9jZXNzUHJveHk+IG1fcHJldmlvdXNQ cm9jZXNzOworICAgIH07CisKKyAgICBQYWdlUHJvY2Vzc092ZXJyaWRlIHRlbXBvcmFyaWx5T3Zl cnJpZGVQcm9jZXNzKFdlYlByb2Nlc3NQcm94eSYgbmV3UHJvY2VzcykgeyByZXR1cm4gUGFnZVBy b2Nlc3NPdmVycmlkZSgqdGhpcywgbmV3UHJvY2Vzcyk7IH0KKwogICAgIFdlYlByZWZlcmVuY2Vz JiBwcmVmZXJlbmNlcygpIHsgcmV0dXJuIG1fcHJlZmVyZW5jZXM7IH0KICAgICB2b2lkIHNldFBy ZWZlcmVuY2VzKFdlYlByZWZlcmVuY2VzJik7CiAKQEAgLTE0MTQsNiArMTQyNywyMSBAQCBwdWJs aWM6CiAgICAgRWRpdGFibGVJbWFnZUNvbnRyb2xsZXImIGVkaXRhYmxlSW1hZ2VDb250cm9sbGVy KCkgeyByZXR1cm4gKm1fZWRpdGFibGVJbWFnZUNvbnRyb2xsZXI7IH0KICNlbmRpZgogCisgICAg UHJvdmlzaW9uYWxQYWdlUHJveHkqIHByb3Zpc2lvbmFsUGFnZVByb3h5KCkgY29uc3QgeyByZXR1 cm4gbV9wcm92aXNpb25hbFBhZ2UuZ2V0KCk7IH0KKyAgICB2b2lkIGNvbW1pdFByb3Zpc2lvbmFs UGFnZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmlu ZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90 IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYsIGJvb2wgY29u dGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50 PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIGNvbnN0IFVzZXJEYXRhJik7CisKKyAgICB2b2lk IGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0 X3QgbmF2aWdhdGlvbklELCBVUkwmJiwgVVJMJiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJE YXRhJik7CisgICAgdm9pZCBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3Qg ZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5 T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxV UkwsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBjb25zdCBVc2VyRGF0YSYpOworICAg IHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUo dWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBXZWJDb3JlOjpSZXNvdXJj ZVJlcXVlc3QmJiwgY29uc3QgVXNlckRhdGEmKTsKKworICAgIHZvaWQgbG9hZERhdGFXaXRoTmF2 aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBjb25z dCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcm IGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0Nv bnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxs b3B0KTsKKyAgICB2b2lkIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9u JiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5h bFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRB c0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpu dWxsb3B0KTsKKworICAgIC8vIElQQzo6TWVzc2FnZVJlY2VpdmVyCisgICAgLy8gSW1wbGVtZW50 ZWQgaW4gZ2VuZXJhdGVkIFdlYlBhZ2VQcm94eU1lc3NhZ2VSZWNlaXZlci5jcHAKKyAgICB2b2lk IGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIG92ZXJy aWRlOworICAgIHZvaWQgZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQ Qzo6RGVjb2RlciYsIHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+Jikgb3ZlcnJpZGU7CisK IHByaXZhdGU6CiAgICAgV2ViUGFnZVByb3h5KFBhZ2VDbGllbnQmLCBXZWJQcm9jZXNzUHJveHkm LCB1aW50NjRfdCBwYWdlSUQsIFJlZjxBUEk6OlBhZ2VDb25maWd1cmF0aW9uPiYmKTsKICAgICB2 b2lkIHBsYXRmb3JtSW5pdGlhbGl6ZSgpOwpAQCAtMTQzOCwxMiArMTQ2Niw2IEBAIHByaXZhdGU6 CiAKICAgICB2b2lkIHNldFVzZXJBZ2VudChTdHJpbmcmJik7CiAKLSAgICAvLyBJUEM6Ok1lc3Nh Z2VSZWNlaXZlcgotICAgIC8vIEltcGxlbWVudGVkIGluIGdlbmVyYXRlZCBXZWJQYWdlUHJveHlN ZXNzYWdlUmVjZWl2ZXIuY3BwCi0gICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5l Y3Rpb24mLCBJUEM6OkRlY29kZXImKSBvdmVycmlkZTsKLSAgICB2b2lkIGRpZFJlY2VpdmVTeW5j TWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImLCBzdGQ6OnVuaXF1ZV9wdHI8 SVBDOjpFbmNvZGVyPiYpIG92ZXJyaWRlOwotCi0KICAgICAvLyBJUEM6Ok1lc3NhZ2VTZW5kZXIK ICAgICBib29sIHNlbmRNZXNzYWdlKHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+LCBPcHRp b25TZXQ8SVBDOjpTZW5kT3B0aW9uPikgb3ZlcnJpZGU7CiAgICAgSVBDOjpDb25uZWN0aW9uKiBt ZXNzYWdlU2VuZGVyQ29ubmVjdGlvbigpIG92ZXJyaWRlOwpAQCAtMTQ2NSwxMiArMTQ4Nyw5IEBA IHByaXZhdGU6CiAgICAgdm9pZCBkaWRDcmVhdGVTdWJmcmFtZSh1aW50NjRfdCBmcmFtZUlEKTsK ICAgICB2b2lkIGRpZENyZWF0ZVdpbmRvdyh1aW50NjRfdCBmcmFtZUlELCBXZWJDb3JlOjpHbG9i YWxXaW5kb3dJZGVudGlmaWVyJiYpOwogCi0gICAgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9h ZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYs IFVSTCYmIHVucmVhY2hhYmxlVVJMLCBjb25zdCBVc2VyRGF0YSYpOwotICAgIHZvaWQgZGlkUmVj ZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJh bWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwg Y29uc3QgVXNlckRhdGEmKTsKICAgICB2b2lkIHdpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RGb3JG cmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTdHJpbmcmIHVybCwgZG91YmxlIGRlbGF5LCBX ZWJDb3JlOjpMb2NrQmFja0ZvcndhcmRMaXN0KTsKICAgICB2b2lkIGRpZENhbmNlbENsaWVudFJl ZGlyZWN0Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCk7CiAgICAgdm9pZCBkaWRDaGFuZ2VQcm92 aXNpb25hbFVSTEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25J RCwgVVJMJiYpOwotICAgIHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2 NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1 cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIHByb3Zpc2lv bmFsVVJMLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgY29uc3QgVXNlckRhdGEmKTsK ICAgICB2b2lkIGRpZENvbW1pdExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRf dCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0 b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6 OkNlcnRpZmljYXRlSW5mbyYsIGJvb2wgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9uYWw8 V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIGNv bnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCBkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSh1 aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFVzZXJEYXRhJik7 CiAgICAgdm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0 X3QgbmF2aWdhdGlvbklELCBjb25zdCBVc2VyRGF0YSYpOwpAQCAtMTU3NCwxOCArMTU5MywxNSBA QCBwcml2YXRlOgogICAgIHZvaWQgc2V0Q2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZl bnRzKGJvb2wgY2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRzKSB7IG1fY2FuU2hv cnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRzID0gY2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRh bFdoZWVsRXZlbnRzOyB9CiAKICAgICB2b2lkIHJlYXR0YWNoVG9XZWJQcm9jZXNzKCk7Ci0gICAg dm9pZCBzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIHN0ZDo6dW5pcXVl X3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYsIElzU3dhcEZyb21TdXNwZW5kZWQpOworICAgIHZv aWQgc3dhcFRvV2ViUHJvY2VzcyhSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmLCBzdGQ6OnVuaXF1ZV9w dHI8RHJhd2luZ0FyZWFQcm94eT4mJiwgUmVmUHRyPFdlYkZyYW1lUHJveHk+JiYgbWFpbkZyYW1l KTsKICAgICB2b2lkIGRpZEZhaWxUb1N1c3BlbmRBZnRlclByb2Nlc3NTd2FwKCk7CiAgICAgdm9p ZCBkaWRTdXNwZW5kQWZ0ZXJQcm9jZXNzU3dhcCgpOwogCi0gICAgdm9pZCBmaW5pc2hBdHRhY2hp bmdUb1dlYlByb2Nlc3MoSXNTd2FwRnJvbVN1c3BlbmRlZCA9IElzU3dhcEZyb21TdXNwZW5kZWQ6 Ok5vKTsKKyAgICB2b2lkIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcygpOwogCiAgICAgUmVm UHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVhdHRhY2hUb1dlYlByb2Nlc3NGb3JSZWxvYWQoKTsKICAg ICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiByZWF0dGFjaFRvV2ViUHJvY2Vzc1dpdGhJdGVtKFdl YkJhY2tGb3J3YXJkTGlzdEl0ZW0mKTsKIAotICAgIHZvaWQgbG9hZERhdGFXaXRoTmF2aWdhdGlv bihBUEk6Ok5hdmlnYXRpb24mLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBjb25zdCBTdHJp bmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VV UkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVp bmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsK LSAgICB2b2lkIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQ b2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRp bnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0 KTsKLQogICAgIHZvaWQgcmVxdWVzdE5vdGlmaWNhdGlvblBlcm1pc3Npb24odWludDY0X3Qgbm90 aWZpY2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nKTsKICAgICB2b2lkIHNob3dO b3RpZmljYXRpb24oY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBib2R5LCBjb25z dCBTdHJpbmcmIGljb25VUkwsIGNvbnN0IFN0cmluZyYgdGFnLCBjb25zdCBTdHJpbmcmIGxhbmcs IFdlYkNvcmU6Ok5vdGlmaWNhdGlvbkRpcmVjdGlvbiwgY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJp bmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsKICAgICB2b2lkIGNhbmNlbE5vdGlmaWNhdGlv bih1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CkBAIC0xOTUxLDggKzE5NjcsNiBAQCBwcml2YXRl OgogICAgIFJlZjxXZWJzaXRlRGF0YVN0b3JlPiBtX3dlYnNpdGVEYXRhU3RvcmU7CiAKICAgICBS ZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9tYWluRnJhbWU7Ci0gICAgRnVuY3Rpb248dm9pZCgpPiBt X21haW5GcmFtZUNyZWF0aW9uSGFuZGxlcjsKLSAgICBGdW5jdGlvbjx2b2lkKGNvbnN0IFdlYkNv cmU6Okdsb2JhbFdpbmRvd0lkZW50aWZpZXImKT4gbV9tYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhh bmRsZXI7CiAKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9mb2N1c2VkRnJhbWU7CiAgICAg UmVmUHRyPFdlYkZyYW1lUHJveHk+IG1fZnJhbWVTZXRMYXJnZXN0RnJhbWU7CkBAIC0yMzIyLDYg KzIzMzYsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9uZWVkc0ZvbnRBdHRyaWJ1dGVzIHsgZmFs c2UgfTsKICAgICBib29sIG1fbWF5SGF2ZVVuaXZlcnNhbEZpbGVSZWFkU2FuZGJveEV4dGVuc2lv biB7IGZhbHNlIH07CiAKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJvdmlzaW9uYWxQYWdlUHJveHk+ IG1fcHJvdmlzaW9uYWxQYWdlOworCiAjaWYgSEFWRShQRU5DSUxLSVQpCiAgICAgc3RkOjp1bmlx dWVfcHRyPEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyPiBtX2VkaXRhYmxlSW1hZ2VDb250cm9sbGVy OwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNz UHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcApp bmRleCBkYjFmZDU4YjkzZC4uZjdkZmFlODYyNmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAtMzQsNiArMzQsNyBAQAogI2luY2x1ZGUgIkxvZ2dp bmcuaCIKICNpbmNsdWRlICJQbHVnaW5JbmZvU3RvcmUuaCIKICNpbmNsdWRlICJQbHVnaW5Qcm9j ZXNzTWFuYWdlci5oIgorI2luY2x1ZGUgIlByb3Zpc2lvbmFsUGFnZVByb3h5LmgiCiAjaW5jbHVk ZSAiVGV4dENoZWNrZXIuaCIKICNpbmNsdWRlICJUZXh0Q2hlY2tlclN0YXRlLmgiCiAjaW5jbHVk ZSAiVUlNZXNzYWdlUG9ydENoYW5uZWxQcm92aWRlci5oIgpAQCAtNDM2LDcgKzQzNyw3IEBAIFJl ZjxXZWJQYWdlUHJveHk+IFdlYlByb2Nlc3NQcm94eTo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50 JiBwYWdlQ2xpZW50LCBSZWY8QVBJCiB2b2lkIFdlYlByb2Nlc3NQcm94eTo6YWRkRXhpc3RpbmdX ZWJQYWdlKFdlYlBhZ2VQcm94eSYgd2ViUGFnZSwgdWludDY0X3QgcGFnZUlELCBCZWdpbnNVc2lu Z0RhdGFTdG9yZSBiZWdpbnNVc2luZ0RhdGFTdG9yZSkKIHsKICAgICBBU1NFUlQoIW1fcGFnZU1h cC5jb250YWlucyhwYWdlSUQpKTsKLSAgICBBU1NFUlQoIWdsb2JhbFBhZ2VNYXAoKS5jb250YWlu cyhwYWdlSUQpKTsKKyAgICBBU1NFUlQoIWdsb2JhbFBhZ2VNYXAoKS5jb250YWlucyhwYWdlSUQp IHx8IGdsb2JhbFBhZ2VNYXAoKS5nZXQocGFnZUlEKSA9PSAmd2ViUGFnZSk7CiAKICAgICBpZiAo YmVnaW5zVXNpbmdEYXRhU3RvcmUgPT0gQmVnaW5zVXNpbmdEYXRhU3RvcmU6OlllcykKICAgICAg ICAgbV9wcm9jZXNzUG9vbC0+cGFnZUJlZ2luVXNpbmdXZWJzaXRlRGF0YVN0b3JlKHdlYlBhZ2Up OwpAQCAtNTg0LDYgKzU4NSwxNSBAQCBib29sIFdlYlByb2Nlc3NQcm94eTo6ZnVsbEtleWJvYXJk QWNjZXNzRW5hYmxlZCgpCiB9CiAjZW5kaWYKIAorYm9vbCBXZWJQcm9jZXNzUHJveHk6Omhhc1By b3Zpc2lvbmFsUGFnZVdpdGhJRCh1aW50NjRfdCBwYWdlSUQpIGNvbnN0Cit7CisgICAgZm9yIChh dXRvKiBwcm92aXNpb25hbFBhZ2UgOiBtX3Byb3Zpc2lvbmFsUGFnZXMpIHsKKyAgICAgICAgaWYg KHByb3Zpc2lvbmFsUGFnZS0+cGFnZSgpLnBhZ2VJRCgpID09IHBhZ2VJRCkKKyAgICAgICAgICAg IHJldHVybiB0cnVlOworICAgIH0KKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIHZvaWQgV2ViUHJv Y2Vzc1Byb3h5Ojp1cGRhdGVCYWNrRm9yd2FyZEl0ZW0oY29uc3QgQmFja0ZvcndhcmRMaXN0SXRl bVN0YXRlJiBpdGVtU3RhdGUpCiB7CiAgICAgaWYgKGF1dG8qIGl0ZW0gPSBXZWJCYWNrRm9yd2Fy ZExpc3RJdGVtOjppdGVtRm9ySUQoaXRlbVN0YXRlLmlkZW50aWZpZXIpKSB7CkBAIC01OTEsNyAr NjAxLDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OnVwZGF0ZUJhY2tGb3J3YXJkSXRlbShjb25z dCBCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUmIGl0ZW0KICAgICAgICAgLy8gdGhlIGJhY2svZm9y d2FyZCBpdGVtcyBwYWdlLgogICAgICAgICAvLyBlLmcuIFRoZSBvbGQgd2ViIHByb2Nlc3MgaXMg bmF2aWdhdGluZyB0byBhYm91dDpibGFuayBmb3Igc3VzcGVuc2lvbi4KICAgICAgICAgLy8gV2Ug aWdub3JlIHRoZXNlIHVwZGF0ZXMuCi0gICAgICAgIGlmIChtX3BhZ2VNYXAuY29udGFpbnMoaXRl bS0+cGFnZUlEKCkpKQorICAgICAgICBpZiAobV9wYWdlTWFwLmNvbnRhaW5zKGl0ZW0tPnBhZ2VJ RCgpKSB8fCBoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQoaXRlbS0+cGFnZUlEKCkpKQogICAgICAg ICAgICAgaXRlbS0+c2V0UGFnZVN0YXRlKGl0ZW1TdGF0ZS5wYWdlU3RhdGUpOwogICAgIH0KIH0K QEAgLTg3Myw3ICs4ODMsNyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6bWF5YmVTaHV0RG93bigp CiAKIGJvb2wgV2ViUHJvY2Vzc1Byb3h5OjpjYW5UZXJtaW5hdGVDaGlsZFByb2Nlc3MoKQogewot ICAgIGlmICghbV9wYWdlTWFwLmlzRW1wdHkoKSB8fCBtX3Byb2Nlc3NQb29sLT5oYXNTdXNwZW5k ZWRQYWdlRm9yKCp0aGlzKSkKKyAgICBpZiAoIW1fcGFnZU1hcC5pc0VtcHR5KCkgfHwgbV9wcm9j ZXNzUG9vbC0+aGFzU3VzcGVuZGVkUGFnZUZvcigqdGhpcykgfHwgIW1fcHJvdmlzaW9uYWxQYWdl cy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmICghbV9wcm9jZXNz UG9vbC0+c2hvdWxkVGVybWluYXRlKHRoaXMpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUHJveHkuaAppbmRleCA3NWY2NWE3ZjdlYi4uNTA0MjYzMGRlMzcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCkBAIC03MCw2ICs3MCw3IEBAIG5hbWVz cGFjZSBXZWJLaXQgewogY2xhc3MgTmV0d29ya1Byb2Nlc3NQcm94eTsKIGNsYXNzIE9iakNPYmpl Y3RHcmFwaDsKIGNsYXNzIFBhZ2VDbGllbnQ7CitjbGFzcyBQcm92aXNpb25hbFBhZ2VQcm94eTsK IGNsYXNzIFVzZXJNZWRpYUNhcHR1cmVNYW5hZ2VyUHJveHk7CiBjbGFzcyBWaXNpdGVkTGlua1N0 b3JlOwogY2xhc3MgV2ViQmFja0ZvcndhcmRMaXN0SXRlbTsKQEAgLTEyNCw2ICsxMjUsOSBAQCBw dWJsaWM6CiAgICAgZW51bSBjbGFzcyBFbmRzVXNpbmdEYXRhU3RvcmUgOiBib29sIHsgTm8sIFll cyB9OwogICAgIHZvaWQgcmVtb3ZlV2ViUGFnZShXZWJQYWdlUHJveHkmLCB1aW50NjRfdCBwYWdl SUQsIEVuZHNVc2luZ0RhdGFTdG9yZSk7CiAKKyAgICB2b2lkIGFkZFByb3Zpc2lvbmFsUGFnZVBy b3h5KFByb3Zpc2lvbmFsUGFnZVByb3h5JiBwcm92aXNpb25hbFBhZ2UpIHsgQVNTRVJUKCFtX3By b3Zpc2lvbmFsUGFnZXMuY29udGFpbnMoJnByb3Zpc2lvbmFsUGFnZSkpOyBtX3Byb3Zpc2lvbmFs UGFnZXMuYWRkKCZwcm92aXNpb25hbFBhZ2UpOyB9CisgICAgdm9pZCByZW1vdmVQcm92aXNpb25h bFBhZ2VQcm94eShQcm92aXNpb25hbFBhZ2VQcm94eSYgcHJvdmlzaW9uYWxQYWdlKSB7IEFTU0VS VChtX3Byb3Zpc2lvbmFsUGFnZXMuY29udGFpbnMoJnByb3Zpc2lvbmFsUGFnZSkpOyBtX3Byb3Zp c2lvbmFsUGFnZXMucmVtb3ZlKCZwcm92aXNpb25hbFBhZ2UpOyB9CisKICAgICB0eXBlbmFtZSBX ZWJQYWdlUHJveHlNYXA6OlZhbHVlc0NvbnN0SXRlcmF0b3JSYW5nZSBwYWdlcygpIGNvbnN0IHsg cmV0dXJuIG1fcGFnZU1hcC52YWx1ZXMoKTsgfQogICAgIHVuc2lnbmVkIHBhZ2VDb3VudCgpIGNv bnN0IHsgcmV0dXJuIG1fcGFnZU1hcC5zaXplKCk7IH0KICAgICB1bnNpZ25lZCB2aXNpYmxlUGFn ZUNvdW50KCkgY29uc3QgeyByZXR1cm4gbV92aXNpYmxlUGFnZUNvdW50ZXIudmFsdWUoKTsgfQpA QCAtMzMwLDYgKzMzNCw4IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGxvZ0RpYWdub3N0aWNNZXNz YWdlRm9yUmVzb3VyY2VMaW1pdFRlcm1pbmF0aW9uKGNvbnN0IFN0cmluZyYgbGltaXRLZXkpOwog CisgICAgYm9vbCBoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQodWludDY0X3QgcGFnZUlEKSBjb25z dDsKKwogICAgIGVudW0gY2xhc3MgSXNXZWFrIHsgTm8sIFllcyB9OwogICAgIHRlbXBsYXRlPHR5 cGVuYW1lIFQ+IGNsYXNzIFdlYWtPclN0cm9uZ1B0ciB7CiAgICAgcHVibGljOgpAQCAtMzczLDYg KzM3OSw3IEBAIHByaXZhdGU6CiAKICAgICBXZWJQYWdlUHJveHlNYXAgbV9wYWdlTWFwOwogICAg IFdlYkZyYW1lUHJveHlNYXAgbV9mcmFtZU1hcDsKKyAgICBIYXNoU2V0PFByb3Zpc2lvbmFsUGFn ZVByb3h5Kj4gbV9wcm92aXNpb25hbFBhZ2VzOwogICAgIFVzZXJJbml0aWF0ZWRBY3Rpb25NYXAg bV91c2VySW5pdGlhdGVkQWN0aW9uTWFwOwogCiAgICAgSGFzaFNldDxWaXNpdGVkTGlua1N0b3Jl Kj4gbV92aXNpdGVkTGlua1N0b3JlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0 Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDUwN2VkYjczZTc0Li43MDc5YjI2OTg4NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysg Yi9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0zMDk1 LDYgKzMwOTUsOCBAQAogCQk0NjZCQzAzODFGQTI2NkM5MDAyRkE5QzEgLyogV2ViU1dDb250ZXh0 TWFuYWdlckNvbm5lY3Rpb24uY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRo ID0gV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQk0NjZCQzAzOTFGQTI2NkM5MDAyRkE5QzEgLyogV2ViU1dDb250ZXh0TWFuYWdl ckNvbm5lY3Rpb24uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViU1dDb250 ZXh0TWFuYWdlckNvbm5lY3Rpb24uaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDY2 QkMwM0ExRkEyNjZDOTAwMkZBOUMxIC8qIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLm1l c3NhZ2VzLmluICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IFdlYlNXQ29udGV4dE1hbmFnZXJDb25u ZWN0aW9uLm1lc3NhZ2VzLmluOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk0NjgzNTY5 QTIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQYWdlUHJveHkuaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gUHJvdmlzaW9uYWxQYWdlUHJveHkuaDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKKwkJNDY4MzU2OUIyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFs UGFnZVByb3h5LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFByb3Zp c2lvbmFsUGFnZVByb3h5LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDZBMkI2 MDYxRTU2NzVBMjAwQzNERURBIC8qIEJhY2tncm91bmRQcm9jZXNzUmVzcG9uc2l2ZW5lc3NUaW1l ci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBCYWNrZ3JvdW5kUHJv Y2Vzc1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog CQk0NkEyQjYwNzFFNTY3NUEyMDBDM0RFREEgLyogQmFja2dyb3VuZFByb2Nlc3NSZXNwb25zaXZl bmVzc1RpbWVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEJhY2tncm91bmRQ cm9jZXNzUmVzcG9uc2l2ZW5lc3NUaW1lci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog CQk0NkRGMDYzOTFGMzkwNUU1MDAxOTgwQkIgLyogTmV0d29ya0NPUlNQcmVmbGlnaHRDaGVja2Vy LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IE5ldHdvcmtDT1JTUHJl ZmxpZ2h0Q2hlY2tlci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC03MzUwLDYg KzczNTIsOCBAQAogCQkJCTg2RTY3QTIyMTkwRjQxMTgwMDAwNEFCNyAvKiBQcm9jZXNzVGhyb3R0 bGVyLmNwcCAqLywKIAkJCQk4NkU2N0EyMTE5MEY0MTE4MDAwMDRBQjcgLyogUHJvY2Vzc1Rocm90 dGxlci5oICovLAogCQkJCTgzMDQ4QUU1MUFDQTQ1REMwMDgyQzgzMiAvKiBQcm9jZXNzVGhyb3R0 bGVyQ2xpZW50LmggKi8sCisJCQkJNDY4MzU2OUIyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lv bmFsUGFnZVByb3h5LmNwcCAqLywKKwkJCQk0NjgzNTY5QTIxRTgxQ0M3MDA2RTI3QTMgLyogUHJv dmlzaW9uYWxQYWdlUHJveHkuaCAqLywKIAkJCQlBNTVCQTgxQjFCQTI1QjFFMDA3Q0QzM0QgLyog UmVtb3RlV2ViSW5zcGVjdG9yUHJveHkuY3BwICovLAogCQkJCUE1NUJBODE5MUJBMjVCMUUwMDdD RDMzRCAvKiBSZW1vdGVXZWJJbnNwZWN0b3JQcm94eS5oICovLAogCQkJCUE1NUJBODFBMUJBMjVC MUUwMDdDRDMzRCAvKiBSZW1vdGVXZWJJbnNwZWN0b3JQcm94eS5tZXNzYWdlcy5pbiAqLywKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcCBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcAppbmRleCAwMDc0 OWI0NzdhMi4uZmZlZDAwYzgyMDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYkZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJGcmFtZS5jcHAKQEAgLTI2Myw4ICsyNjMsNiBAQCBzdGF0aWMgV2ViQ29yZTo6UG9s aWN5QWN0aW9uIHRvUG9saWN5QWN0aW9uKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24pCiAg ICAgICAgIHJldHVybiBXZWJDb3JlOjpQb2xpY3lBY3Rpb246Oklnbm9yZTsKICAgICBjYXNlIFdl YlBvbGljeUFjdGlvbjo6RG93bmxvYWQ6CiAgICAgICAgIHJldHVybiBXZWJDb3JlOjpQb2xpY3lB Y3Rpb246OkRvd25sb2FkOwotICAgIGNhc2UgV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kOgotICAg ICAgICBicmVhazsKICAgICB9CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgcmV0dXJu IFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6SWdub3JlOwpAQCAtMjcyLDExICsyNzAsOCBAQCBzdGF0 aWMgV2ViQ29yZTo6UG9saWN5QWN0aW9uIHRvUG9saWN5QWN0aW9uKFdlYlBvbGljeUFjdGlvbiBw b2xpY3lBY3Rpb24pCiAKIHZvaWQgV2ViRnJhbWU6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1 aW50NjRfdCBsaXN0ZW5lcklELCBXZWJQb2xpY3lBY3Rpb24gYWN0aW9uLCB1aW50NjRfdCBuYXZp Z2F0aW9uSUQsIERvd25sb2FkSUQgZG93bmxvYWRJRCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVz RGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCiB7Ci0gICAgaWYgKCFtX2NvcmVGcmFtZSB8fCAhbV9w b2xpY3lMaXN0ZW5lcklEIHx8IGxpc3RlbmVySUQgIT0gbV9wb2xpY3lMaXN0ZW5lcklEIHx8ICFt X3BvbGljeUZ1bmN0aW9uKSB7Ci0gICAgICAgIGlmIChhY3Rpb24gPT0gV2ViUG9saWN5QWN0aW9u OjpTdXNwZW5kKQotICAgICAgICAgICAgcGFnZSgpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6OkRpZEZhaWxUb1N1c3BlbmRBZnRlclByb2Nlc3NTd2FwKCkpOworICAgIGlmICghbV9jb3Jl RnJhbWUgfHwgIW1fcG9saWN5TGlzdGVuZXJJRCB8fCBsaXN0ZW5lcklEICE9IG1fcG9saWN5TGlz dGVuZXJJRCB8fCAhbV9wb2xpY3lGdW5jdGlvbikKICAgICAgICAgcmV0dXJuOwotICAgIH0KIAog ICAgIEZyYW1lUG9saWN5RnVuY3Rpb24gZnVuY3Rpb24gPSBXVEZNb3ZlKG1fcG9saWN5RnVuY3Rp b24pOwogICAgIGJvb2wgZm9yTmF2aWdhdGlvbkFjdGlvbiA9IG1fcG9saWN5RnVuY3Rpb25Gb3JO YXZpZ2F0aW9uQWN0aW9uID09IEZvck5hdmlnYXRpb25BY3Rpb246OlllczsKQEAgLTI5MiwxNiAr Mjg3LDcgQEAgdm9pZCBXZWJGcmFtZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKHVpbnQ2NF90 IGxpc3RlbmVySUQsIFdlYlBvbGljeUFjdGlvbiBhY3QKICAgICAgICAgICAgIGRvY3VtZW50TG9h ZGVyLT5zZXROYXZpZ2F0aW9uSUQobmF2aWdhdGlvbklEKTsKICAgICB9CiAKLSAgICBib29sIHNo b3VsZFN1c3BlbmQgPSBmYWxzZTsKLSAgICBpZiAoYWN0aW9uID09IFdlYlBvbGljeUFjdGlvbjo6 U3VzcGVuZCkgewotICAgICAgICBzaG91bGRTdXNwZW5kID0gdHJ1ZTsKLSAgICAgICAgYWN0aW9u ID0gV2ViUG9saWN5QWN0aW9uOjpJZ25vcmU7Ci0gICAgfQotCiAgICAgZnVuY3Rpb24odG9Qb2xp Y3lBY3Rpb24oYWN0aW9uKSk7Ci0KLSAgICBpZiAoc2hvdWxkU3VzcGVuZCkKLSAgICAgICAgcGFn ZSgpLT5zdXNwZW5kRm9yUHJvY2Vzc1N3YXAoKTsKIH0KIAogdm9pZCBXZWJGcmFtZTo6c3RhcnRE b3dubG9hZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFN0 cmluZyYgc3VnZ2VzdGVkTmFtZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5jcHAKaW5kZXggMjVkNmRmYjcxZDAuLmU0OTE4MjQ3YTY3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtNDAxLDcgKzQwMSw3IEBA IFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzJiYgcGFyYW1ldGVycykKICAgICAsIG1fb3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kg eyBwYXJhbWV0ZXJzLm92ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5IH0KICAgICAsIG1fY3B1 TGltaXQocGFyYW1ldGVycy5jcHVMaW1pdCkKICNpZiBQTEFURk9STShNQUMpCi0gICAgLCBtX3No b3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNpdGlvbihwYXJhbWV0ZXJzLmlzU3dhcEZy b21TdXNwZW5kZWQpCisgICAgLCBtX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNp dGlvbihwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXApCiAjZW5kaWYKIHsKICAgICBBU1NFUlQobV9w YWdlSUQpOwpAQCAtNDcxLDcgKzQ3MSw3IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFn ZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICBtX2RyYXdp bmdBcmVhLT5zZXRQYWludGluZ0VuYWJsZWQoZmFsc2UpOwogICAgIG1fZHJhd2luZ0FyZWEtPnNl dFNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQocGFyYW1ldGVycy5zaG91bGRTY2FsZVZpZXdU b0ZpdERvY3VtZW50KTsKIAotICAgIGlmIChwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQp CisgICAgaWYgKHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkKICAgICAgICAgZnJlZXplTGF5ZXJU cmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6U3dhcEZyb21TdXNwZW5kZWQpOwogCiAjaWYgRU5B QkxFKEFTWU5DX1NDUk9MTElORykKQEAgLTY5Niw3ICs2OTYsNyBAQCB2b2lkIFdlYlBhZ2U6OnJl aW5pdGlhbGl6ZVdlYlBhZ2UoV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMp CiAgICAgICAgIG1fZHJhd2luZ0FyZWEtPnVwZGF0ZVByZWZlcmVuY2VzKHBhcmFtZXRlcnMuc3Rv cmUpOwogICAgICAgICBtX2RyYXdpbmdBcmVhLT5zZXRQYWludGluZ0VuYWJsZWQodHJ1ZSk7CiAj aWYgUExBVEZPUk0oTUFDKQotICAgICAgICBtX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdl VHJhbnNpdGlvbiA9IHBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZDsKKyAgICAgICAgbV9z aG91bGRBdHRhY2hEcmF3aW5nQXJlYU9uUGFnZVRyYW5zaXRpb24gPSBwYXJhbWV0ZXJzLmlzUHJv Y2Vzc1N3YXA7CiAjZW5kaWYKICAgICAgICAgdW5mcmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJl ZXplUmVhc29uOjpQYWdlU3VzcGVuZGVkKTsKICAgICB9CkBAIC0zMDUzLDEyICszMDUzLDYgQEAg dm9pZCBXZWJQYWdlOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24odWludDY0X3QgZnJhbWVJRCwg dWludDY0X3QgbGlzdGVuZXJJRCwgV2UKICAgICBXZWJGcmFtZSogZnJhbWUgPSBXZWJQcm9jZXNz OjpzaW5nbGV0b24oKS53ZWJGcmFtZShmcmFtZUlEKTsKICAgICBpZiAoIWZyYW1lKQogICAgICAg ICByZXR1cm47Ci0gICAgaWYgKHBvbGljeUFjdGlvbiA9PSBXZWJQb2xpY3lBY3Rpb246OlN1c3Bl bmQpIHsKLSAgICAgICAgQVNTRVJUKGZyYW1lID09IG1fbWFpbkZyYW1lKTsKLSAgICAgICAgc2V0 SXNTdXNwZW5kZWQodHJ1ZSk7Ci0KLSAgICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuc2Vu ZFByZXdhcm1JbmZvcm1hdGlvbihtYWluV2ViRnJhbWUoKS0+dXJsKCkpOwotICAgIH0KICAgICBm cmFtZS0+ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGxpc3RlbmVySUQsIHBvbGljeUFjdGlvbiwg bmF2aWdhdGlvbklELCBkb3dubG9hZElELCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOwogfQog CkBAIC02MzEyLDYgKzYzMDYsMTAgQEAgdm9pZCBXZWJQYWdlOjpzZXRJc1N1c3BlbmRlZChib29s IHN1c3BlbmRlZCkKICAgICBpZiAobV9pc1N1c3BlbmRlZCkgewogICAgICAgICAvLyBVbmZyb3pl biBvbiBkcmF3aW5nIGFyZWEgcmVzZXQuCiAgICAgICAgIGZyZWV6ZUxheWVyVHJlZShMYXllclRy ZWVGcmVlemVSZWFzb246OlBhZ2VTdXNwZW5kZWQpOworCisgICAgICAgIFdlYlByb2Nlc3M6OnNp bmdsZXRvbigpLnNlbmRQcmV3YXJtSW5mb3JtYXRpb24obWFpbldlYkZyYW1lKCktPnVybCgpKTsK KworICAgICAgICBzdXNwZW5kRm9yUHJvY2Vzc1N3YXAoKTsKICAgICB9IGVsc2UKICAgICAgICAg bV9zaG91bGRSZXNldERyYXdpbmdBcmVhQWZ0ZXJTdXNwZW5kID0gdHJ1ZTsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYS5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9U aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQppbmRleCA5MWFkNzFhZGUxYi4uODNiNjU5 OTI3MGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9U aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KQEAgLTk3 LDcgKzk3LDcgQEAgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OlRpbGVkQ29yZUFuaW1h dGlvbkRyYXdpbmdBcmVhKFdlYlBhZ2UmIHdlYlBhZ2UsIGMKICAgICB1cGRhdGVMYXllckhvc3Rp bmdDb250ZXh0KCk7CiAgICAgc2V0Q29sb3JTcGFjZShwYXJhbWV0ZXJzLmNvbG9yU3BhY2UpOwog Ci0gICAgaWYgKCFwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQpCisgICAgaWYgKCFwYXJh bWV0ZXJzLmlzUHJvY2Vzc1N3YXApCiAgICAgICAgIGF0dGFjaCgpOwogfQogCmRpZmYgLS1naXQg YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZp Z2F0aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNz U3dhcE9uTmF2aWdhdGlvbi5tbQppbmRleCBmMzVkOGJhYTM1My4uNTBhNjYyOGM3ZGYgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBP bk5hdmlnYXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQpAQCAtMTQwNSw3ICsxNDA1LDcgQEAgVEVTVChQ cm9jZXNzU3dhcCwgU2VydmVyUmVkaXJlY3QpCiAKICAgICBFWFBFQ1RfRkFMU0Uoc2VydmVyUmVk aXJlY3RlZCk7CiAgICAgRVhQRUNUX0VRKDMsIG51bWJlck9mRGVjaWRlUG9saWN5Q2FsbHMpOwot ICAgIEVYUEVDVF9FUSgydSwgc2VlblBJRHMuc2l6ZSgpKTsKKyAgICBFWFBFQ1RfRVEoM3UsIHNl ZW5QSURzLnNpemUoKSk7CiB9CiAKIFRFU1QoUHJvY2Vzc1N3YXAsIFNlcnZlclJlZGlyZWN0MikK QEAgLTE0NjcsNiArMTQ2Nyw2NiBAQCBURVNUKFByb2Nlc3NTd2FwLCBTZXJ2ZXJSZWRpcmVjdDIp CiAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4xLmh0bWwi LCBbW3dlYlZpZXcgVVJMXSBhYnNvbHV0ZVN0cmluZ10pOwogfQogCitzdGF0aWMgY29uc3QgY2hh ciogbGlua1RvV2ViS2l0Qnl0ZXMgPSBSIlBTT05SRVNPVVJDRSgKKzxib2R5PgorICA8YSBpZD0i dGVzdExpbmsiIGhyZWY9InBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiPkxpbms8L2E+ Cis8L2JvZHk+CispUFNPTlJFU09VUkNFIjsKKworVEVTVChQcm9jZXNzU3dhcCwgUG9saWN5Q2Fu Y2VsQWZ0ZXJTZXJ2ZXJSZWRpcmVjdCkKK3sKKyAgICBhdXRvIHByb2Nlc3NQb29sQ29uZmlndXJh dGlvbiA9IGFkb3B0TlMoW1tfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRd KTsKKyAgICBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1N3YXBzT25OYXZp Z2F0aW9uID0gWUVTOworICAgIGF1dG8gcHJvY2Vzc1Bvb2wgPSBhZG9wdE5TKFtbV0tQcm9jZXNz UG9vbCBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZ3VyYXRp b24uZ2V0KCldKTsKKworICAgIGF1dG8gd2ViVmlld0NvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtb V0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3Q29uZmln dXJhdGlvbiBzZXRQcm9jZXNzUG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07CisgICAgYXV0byBoYW5k bGVyID0gYWRvcHROUyhbW1BTT05TY2hlbWUgYWxsb2NdIGluaXRdKTsKKyAgICBbaGFuZGxlciBh ZGRNYXBwaW5nRnJvbVVSTFN0cmluZzpAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwi IHRvRGF0YTpsaW5rVG9XZWJLaXRCeXRlc107CisgICAgW2hhbmRsZXIgYWRkUmVkaXJlY3RGcm9t VVJMU3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCIgdG9VUkxTdHJpbmc6 QCJwc29uOi8vd3d3LmFwcGxlLmNvbS9pZ25vcmUuaHRtbCJdOworICAgIFt3ZWJWaWV3Q29uZmln dXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAi cHNvbiJdOworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10g aW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndl YlZpZXdDb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUg PSBhZG9wdE5TKFtbUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3 ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCldOwor CisgICAgbmF2aWdhdGlvbkRlbGVnYXRlLT5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9u ID0gXihXS05hdmlnYXRpb25BY3Rpb24gKmFjdGlvbiwgdm9pZCAoXmRlY2lzaW9uSGFuZGxlciko V0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5KSkgeworICAgICAgICBpZiAoW2FjdGlvbi5yZXF1ZXN0 LlVSTC5hYnNvbHV0ZVN0cmluZyBoYXNTdWZmaXg6QCJpZ25vcmUuaHRtbCJdKSB7CisgICAgICAg ICAgICBkZWNpc2lvbkhhbmRsZXIoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5Q2FuY2VsKTsKKyAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBkZWNpc2lvbkhhbmRsZXIoV0tO YXZpZ2F0aW9uQWN0aW9uUG9saWN5QWxsb3cpOworICAgIH07CisKKyAgICBOU1VSTFJlcXVlc3Qg KnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3Ry aW5nOkAicHNvbjovL3d3dy5nb29nbGUuY29tL21haW4uaHRtbCJdXTsKKyAgICBbd2ViVmlldyBs b2FkUmVxdWVzdDpyZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9u ZSk7CisgICAgZG9uZSA9IGZhbHNlOworICAgIGF1dG8gcGlkQWZ0ZXJGaXJzdExvYWQgPSBbd2Vi VmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworCisgICAgRVhQRUNUX0VRKDEsIG51bWJlck9m RGVjaWRlUG9saWN5Q2FsbHMpOworCisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAi dGVzdExpbmsuY2xpY2soKSIgY29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKworICAgIFRlc3RXZWJL aXRBUEk6OlV0aWw6OnJ1bigmZmFpbGVkKTsKKyAgICBmYWlsZWQgPSBmYWxzZTsKKyAgICBkb25l ID0gZmFsc2U7CisKKyAgICBFWFBFQ1RfRVEoMywgbnVtYmVyT2ZEZWNpZGVQb2xpY3lDYWxscyk7 CisKKyAgICAvLyBXZSBzaG91bGQgc3RpbGwgYmUgb24gZ29vZ2xlLmNvbS4KKyAgICBFWFBFQ1Rf RVEocGlkQWZ0ZXJGaXJzdExvYWQsIFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0pOwor ICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiLCBb W3dlYlZpZXcgVVJMXSBhYnNvbHV0ZVN0cmluZ10pOworCisgICAgW3dlYlZpZXcgZXZhbHVhdGVK YXZhU2NyaXB0OkAidGVzdExpbmsuaW5uZXJUZXh0IiBjb21wbGV0aW9uSGFuZGxlcjogWyZdIChp ZCBpbm5lclRleHQsIE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShA IkxpbmsiLCBpbm5lclRleHQpOworICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKK30KKwog ZW51bSBjbGFzcyBTaG91bGRFbmFibGVQU09OIHsgTm8sIFllcyB9Owogc3RhdGljIHZvaWQgcnVu Q2xpZW50U2lkZVJlZGlyZWN0VGVzdChTaG91bGRFbmFibGVQU09OIHNob3VsZEVuYWJsZVBTT04p CiB7CkBAIC0yMjMyLDEyICsyMjkyLDI3IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIFBhZ2VTaG93SGlk ZSkKIAogICAgIEVYUEVDVF9FUSg3dSwgW3JlY2VpdmVkTWVzc2FnZXMgY291bnRdKTsKICAgICBF WFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZXNo b3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMF0pOwotICAgIEVYUEVD VF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBw ZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKLSAgICBFWFBFQ1RfV0tfU1RS RVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlc2hvdyBOT1QgcGVyc2lz dGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAi cHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVj ZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3 dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVz c2FnZXMuZ2V0KClbNF0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0 Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdl dCgpWzVdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWlu Lmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsK KyAgICBpZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0gaGFzUHJlZml4OkAicHNvbjovL3d3 dy53ZWJraXQub3JnL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBz b246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNl aXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjov L3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgTk9UIHBlcnNpc3RlZCIsIHJlY2Vp dmVkTWVzc2FnZXMuZ2V0KClbMl0pOworICAgIH0gZWxzZSB7CisgICAgICAgIEVYUEVDVF9XS19T VFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93IE5PVCBwZXJz aXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NU UkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3Rl ZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOworICAgIH0KKyAgICBpZiAoW3JlY2VpdmVk TWVzc2FnZXMuZ2V0KClbM10gaGFzUHJlZml4OkAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5o dG1sIl0pIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20v bWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsz XSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWlu Lmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsK KyAgICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtp dC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5n ZXQoKVszXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29t L21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClb NF0pOworICAgIH0KKyAgICBpZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0gaGFzUHJlZml4 OkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9X S19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJz aXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NU UkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVk IiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgRVhQ RUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cg cGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7CisgICAgICAgIEVYUEVDVF9X S19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJz aXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAgICB9CiB9CiAKIC8vIERpc2Fi bGluZyB0aGUgcGFnZSBjYWNoZSBleHBsaWNpdGx5IGlzIChmb3Igc29tZSByZWFzb24pIG5vdCBh dmFpbGFibGUgb24gaU9TLgo= 358961 2019-01-11 16:30:36 -0800 2019-01-14 09:54:49 -0800 Prototype (with test) 193361_pson_provisional_process_wip.patch text/plain 79048 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggOGU5NTllZGFm ZmQuLjlkOTBiZThiNDhlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVz dEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0 aW9ucwpAQCAtNzMzLDggKzczMyw4IEBAIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGlj cy9yZW1vdmUtYmxvY2tpbmctaW4tcmVkaXJlY3QuaHRtbCBbIFNraXAgXQogaHR0cC90ZXN0cy9y ZXNvdXJjZUxvYWRTdGF0aXN0aWNzL25vbi1wcmV2YWxlbnQtcmVzb3VyY2VzLWNhbi1hY2Nlc3Mt Y29va2llcy1pbi1hLXRoaXJkLXBhcnR5LWNvbnRleHQuaHRtbCBbIFNraXAgXQogaHR0cC90ZXN0 cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL2NhcC1jYWNoZS1tYXgtYWdlLWZvci1wcmV2YWxlbnQt cmVzb3VyY2UuaHRtbCBbIFNraXAgXQogCi0jIFByb2Nlc3Mgc3dhcHBpbmcgaXMgb25seSBpbXBs ZW1lbnRlZCBvbiBXZWJLaXQyLgotaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3Byb2Nlc3Mtc3dhcC13 aW5kb3ctb3Blbi5odG1sIFsgUGFzcyBdCisjIFRoaXMgZmVhdHVyZSBpcyBjdXJyZW50bHkgZGlz YWJsZWQgYnkgZGVmYXVsdCBhbmQgdW5maW5pc2hlZCA8cmRhcjovL3Byb2JsZW0vMzg5MjUwNzc+ LgoraHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3Byb2Nlc3Mtc3dhcC13aW5kb3ctb3Blbi5odG1sIFsg U2tpcCBdCiAKICMgQ3Jvc3MtT3JpZ2luLVJlc291cmNlLVBvbGljeSByZXNwb25zZSBoZWFkZXIg aXMgb25seSBpbXBsZW1lbnRlZCBpbiBXZWJLaXQyLgogaHR0cC93cHQvY3Jvc3Mtb3JpZ2luLXJl c291cmNlLXBvbGljeS8gWyBQYXNzIF0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw CmluZGV4IDRjMjZhNjk4MWI0Li5lYmY5NTBiYTZjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuY3BwCkBAIC0yMDMyLDExICsyMDMyLDExIEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNv bW1pdFByb3Zpc2lvbmFsTG9hZCgpCiAKICAgICAgICAgT3B0aW9uYWw8SGFzSW5zZWN1cmVDb250 ZW50PiBoYXNJbnNlY3VyZUNvbnRlbnQgPSBjYWNoZWRQYWdlLT5jYWNoZWRNYWluRnJhbWUoKS0+ aGFzSW5zZWN1cmVDb250ZW50KCk7CiAKKyAgICAgICAgZGlzcGF0Y2hEaWRDb21taXRMb2FkKGhh c0luc2VjdXJlQ29udGVudCk7CisKICAgICAgICAgLy8gRklYTUU6IFRoaXMgQVBJIHNob3VsZCBi ZSB0dXJuZWQgYXJvdW5kIHNvIHRoYXQgd2UgZ3JvdW5kIENhY2hlZFBhZ2UgaW50byB0aGUgUGFn ZS4KICAgICAgICAgY2FjaGVkUGFnZS0+cmVzdG9yZSgqbV9mcmFtZS5wYWdlKCkpOwogCi0gICAg ICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOwotCiAjaWYgUExB VEZPUk0oSU9TX0ZBTUlMWSkKICAgICAgICAgbV9mcmFtZS5wYWdlKCktPmNocm9tZSgpLnNldERp c3BhdGNoVmlld3BvcnREYXRhRGlkQ2hhbmdlU3VwcHJlc3NlZChmYWxzZSk7CiAgICAgICAgIG1f ZnJhbWUucGFnZSgpLT5jaHJvbWUoKS5kaXNwYXRjaFZpZXdwb3J0UHJvcGVydGllc0RpZENoYW5n ZShtX2ZyYW1lLnBhZ2UoKS0+dmlld3BvcnRBcmd1bWVudHMoKSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcCBiL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCmluZGV4IGNhMmRmNDBl ZTFkLi42ZDA3YzAzYWQ4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKQEAgLTczLDcgKzczLDcgQEAgdm9pZCBXZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzOjplbmNvZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAg IGVuY29kZXIuZW5jb2RlRW51bShsYXllckhvc3RpbmdNb2RlKTsKICAgICBlbmNvZGVyIDw8IG1p bWVUeXBlc1dpdGhDdXN0b21Db250ZW50UHJvdmlkZXJzOwogICAgIGVuY29kZXIgPDwgY29udHJv bGxlZEJ5QXV0b21hdGlvbjsKLSAgICBlbmNvZGVyIDw8IGlzU3dhcEZyb21TdXNwZW5kZWQ7Cisg ICAgZW5jb2RlciA8PCBpc1Byb2Nlc3NTd2FwOwogCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIGVu Y29kZXIgPDwgY29sb3JTcGFjZTsKQEAgLTIyNyw3ICsyMjcsNyBAQCBPcHRpb25hbDxXZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzPiBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoSVBD OjpEZWNvZAogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogICAgIGlmICghZGVjb2Rlci5k ZWNvZGUocGFyYW1ldGVycy5jb250cm9sbGVkQnlBdXRvbWF0aW9uKSkKICAgICAgICAgcmV0dXJu IFdURjo6bnVsbG9wdDsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuaXNTd2Fw RnJvbVN1c3BlbmRlZCkpCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmlzUHJv Y2Vzc1N3YXApKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAjaWYgUExBVEZPUk0o TUFDKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVycy5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVy cy5oCmluZGV4IGFlNDMyNWNiZDVmLi5iMzgyY2VlZGQ0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaApAQCAtMTI5LDcgKzEyOSw3IEBA IHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICAgICBWZWN0b3I8U3RyaW5nPiBt aW1lVHlwZXNXaXRoQ3VzdG9tQ29udGVudFByb3ZpZGVyczsKIAogICAgIGJvb2wgY29udHJvbGxl ZEJ5QXV0b21hdGlvbjsKLSAgICBib29sIGlzU3dhcEZyb21TdXNwZW5kZWQgeyBmYWxzZSB9Owor ICAgIGJvb2wgaXNQcm9jZXNzU3dhcCB7IGZhbHNlIH07CiAKICNpZiBQTEFURk9STShNQUMpCiAg ICAgQ29sb3JTcGFjZURhdGEgY29sb3JTcGFjZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv U2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5 QWN0aW9uLmgKaW5kZXggMTQyYTUxOGRmMDkuLjM5NzE3OTVjNDZhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQb2xpY3lBY3Rpb24uaApAQCAtMjksMTEgKzI5LDExIEBACiAKIG5hbWVzcGFjZSBX ZWJLaXQgewogCisvLyBGSVhNRTogUmVtb3ZlIHRoaXMgdHlwZSBhbmQgdXNlIFdlYkNvcmU6OlBv bGljeUFjdGlvbiBpbnN0ZWFkLgogZW51bSBjbGFzcyBXZWJQb2xpY3lBY3Rpb24gOiB1aW50OF90 IHsKICAgICBVc2UsCiAgICAgRG93bmxvYWQsCi0gICAgSWdub3JlLAotICAgIFN1c3BlbmQKKyAg ICBJZ25vcmUKIH07CiAKIH0KQEAgLTQ1LDggKzQ1LDcgQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgRW51 bVRyYWl0czxXZWJLaXQ6OldlYlBvbGljeUFjdGlvbj4gewogICAgICAgICBXZWJLaXQ6OldlYlBv bGljeUFjdGlvbiwKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OlVzZSwKICAgICAg ICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OkRvd25sb2FkLAotICAgICAgICBXZWJLaXQ6Oldl YlBvbGljeUFjdGlvbjo6SWdub3JlLAotICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6 U3VzcGVuZAorICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6SWdub3JlCiAgICAgPjsK IH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQgYi9Tb3VyY2UvV2Vi S2l0L1NvdXJjZXMudHh0CmluZGV4IGEwYjZmNzI4NDYwLi44YWVjYjg2NDcyNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9Tb3VyY2VzLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMu dHh0CkBAIC0yMzAsNiArMjMwLDcgQEAgVUlQcm9jZXNzL0luc3BlY3RvclRhcmdldFByb3h5LmNw cAogVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuY3BwCiBVSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlv bi5jcHAKIFVJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNwcAorVUlQcm9jZXNzL1Byb3Zpc2lv bmFsUGFnZVByb3h5LmNwcAogVUlQcm9jZXNzL1JlbW90ZVdlYkluc3BlY3RvclByb3h5LmNwcAog VUlQcm9jZXNzL1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwCiBVSVByb2Nlc3MvU2VydmljZVdvcmtl clByb2Nlc3NQcm94eS5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tCmluZGV4IGNmMTkxOWM5M2E3Li5jNzlmY2IyMTBiNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC00NCw2ICs0NCw3 IEBACiAjaW1wb3J0ICJOYXZpZ2F0aW9uU3RhdGUuaCIKICNpbXBvcnQgIk9iakNPYmplY3RHcmFw aC5oIgogI2ltcG9ydCAiUGFnZUNsaWVudC5oIgorI2ltcG9ydCAiUHJvdmlzaW9uYWxQYWdlUHJv eHkuaCIKICNpbXBvcnQgIlJlbW90ZUxheWVyVHJlZVNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YS5o IgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24uaCIKICNpbXBvcnQgIlJlbW90 ZU9iamVjdFJlZ2lzdHJ5LmgiCkBAIC00NjY0LDYgKzQ2NjUsMTEgQEAgLSAodm9pZClfa2lsbFdl YkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRTdGF0ZQogewogICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nl c3NQcm94eT4gcHJvdGVjdGVkUHJvY2Vzc1Byb3h5KF9wYWdlLT5wcm9jZXNzKCkpOwogICAgIHBy b3RlY3RlZFByb2Nlc3NQcm94eS0+cmVxdWVzdFRlcm1pbmF0aW9uKFdlYktpdDo6UHJvY2Vzc1Rl cm1pbmF0aW9uUmVhc29uOjpSZXF1ZXN0ZWRCeUNsaWVudCk7CisKKyAgICBpZiAoYXV0byogcHJv dmlzaW9uYWxQYWdlUHJveHkgPSBfcGFnZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKSkgeworICAg ICAgICBSZWY8V2ViS2l0OjpXZWJQcm9jZXNzUHJveHk+IHByb3RlY3RlZFByb2Nlc3NQcm94eShw cm92aXNpb25hbFBhZ2VQcm94eS0+cHJvY2VzcygpKTsKKyAgICAgICAgcHJvdGVjdGVkUHJvY2Vz c1Byb3h5LT5yZXF1ZXN0VGVybWluYXRpb24oV2ViS2l0OjpQcm9jZXNzVGVybWluYXRpb25SZWFz b246OlJlcXVlc3RlZEJ5Q2xpZW50KTsKKyAgICB9CiB9CiAKICNpZiBQTEFURk9STShNQUMpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmggYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKaW5kZXggMGI4NThjNDZlZTQuLjZmM2RmODQ1 MmIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCkBAIC00OCw2ICs0OCw3IEBA CiAKIE9CSkNfQ0xBU1MgQ0FMYXllcjsKIE9CSkNfQ0xBU1MgTlNGaWxlV3JhcHBlcjsKK09CSkNf Q0xBU1MgTlNNZW51OwogT0JKQ19DTEFTUyBOU1NldDsKIE9CSkNfQ0xBU1MgV0tEcmF3aW5nVmll dzsKIE9CSkNfQ0xBU1MgX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAuLmE2NjlmNDQwYjNlCi0tLSAvZGV2L251bGwKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCkBAIC0wLDAgKzEs Mjg4IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAq IDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUg Y29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZv cm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQor ICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGgg dGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQ UExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJF U1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywK KyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNT IEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5U IFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBB TlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgor ICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywg UFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0Yg VVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dF VkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAq IENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5D RSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0Yg VEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1ZGUgIlByb3Zp c2lvbmFsUGFnZVByb3h5LmgiCisKKyNpbmNsdWRlICJBUElOYXZpZ2F0aW9uLmgiCisjaW5jbHVk ZSAiRHJhd2luZ0FyZWFQcm94eS5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKKyNpbmNsdWRlICJQ YWdlQ2xpZW50LmgiCisjaW5jbHVkZSAiV2ViQmFja0ZvcndhcmRMaXN0LmgiCisjaW5jbHVkZSAi V2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oIgorI2luY2x1ZGUgIldlYkVycm9ycy5oIgorI2luY2x1 ZGUgIldlYk5hdmlnYXRpb25TdGF0ZS5oIgorI2luY2x1ZGUgIldlYlBhZ2VNZXNzYWdlcy5oIgor I2luY2x1ZGUgIldlYlBhZ2VQcm94eS5oIgorI2luY2x1ZGUgIldlYlBhZ2VQcm94eU1lc3NhZ2Vz LmgiCisjaW5jbHVkZSAiV2ViUHJvY2Vzc01lc3NhZ2VzLmgiCisjaW5jbHVkZSAiV2ViUHJvY2Vz c1Byb3h5LmgiCisjaW5jbHVkZSA8V2ViQ29yZS9TaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQu aD4KKworbmFtZXNwYWNlIFdlYktpdCB7CisKKyNkZWZpbmUgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RChjaGFubmVsLCBmbXQsIC4uLikgUkVMRUFTRV9MT0dfSUYobV9wYWdlLmlzQWx3YXlzT25Mb2dn aW5nQWxsb3dlZCgpLCBjaGFubmVsLCAiJXAgLSBQcm92aXNpb25hbFBhZ2VQcm94eTo6IiBmbXQs IHRoaXMsICMjX19WQV9BUkdTX18pCisKK1Byb3Zpc2lvbmFsUGFnZVByb3h5OjpQcm92aXNpb25h bFBhZ2VQcm94eShXZWJQYWdlUHJveHkmIHBhZ2UsIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJv Y2Vzcywgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4gc3VzcGVuZGVkUGFnZSwg dWludDY0X3QgbmF2aWdhdGlvbklELCBib29sIGlzU2VydmVyUmVkaXJlY3QsIGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVu dCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KQorICAgIDogbV9wYWdlKHBhZ2UpCisgICAg LCBtX3Byb2Nlc3MoV1RGTW92ZShwcm9jZXNzKSkKKyAgICAsIG1fbmF2aWdhdGlvbklEKG5hdmln YXRpb25JRCkKKyAgICAsIG1faXNTZXJ2ZXJSZWRpcmVjdChpc1NlcnZlclJlZGlyZWN0KQorICAg ICwgbV9yZXF1ZXN0KHJlcXVlc3QpCisgICAgLCBtX3Byb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGll bnQocHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCkKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZ KQorICAgICwgbV9zdXNwZW5zaW9uVG9rZW4obV9wcm9jZXNzLT50aHJvdHRsZXIoKS5iYWNrZ3Jv dW5kQWN0aXZpdHlUb2tlbigpKQorI2VuZGlmCit7CisgICAgbV9wcm9jZXNzLT5hZGRNZXNzYWdl UmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBt X3BhZ2UucGFnZUlEKCksICp0aGlzKTsKKyAgICBtX3Byb2Nlc3MtPmFkZFByb3Zpc2lvbmFsUGFn ZVByb3h5KCp0aGlzKTsKKworICAgIGluaXRpYWxpemVXZWJQYWdlKCk7CisKKyAgICAvLyBJZiB3 ZSBhcmUgcmVhdHRhY2hpbmcgdG8gYSBTdXNwZW5kZWRQYWdlLCB0aGVuIHRoZSBXZWJQcm9jZXNz JyBXZWJQYWdlIGFscmVhZHkgZXhpc3RzIGFuZAorICAgIC8vIFdlYlBhZ2VQcm94eTo6ZGlkQ3Jl YXRlTWFpbkZyYW1lKCkgd2lsbCBub3QgYmUgY2FsbGVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJh bWUuIEluIHN1Y2gKKyAgICAvLyBjYXNlLCB3ZSBuZWVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJh bWUgdG8gcmVmbGVjdCB0aGUgZmFjdCB0aGUgdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UKKyAgICAv LyBhbHJlYWR5IGV4aXN0cyBhbmQgYWxyZWFkeSBoYXMgYSBtYWluIGZyYW1lLgorICAgIGlmIChz dXNwZW5kZWRQYWdlKSB7CisgICAgICAgIEFTU0VSVCgmc3VzcGVuZGVkUGFnZS0+cHJvY2Vzcygp ID09IG1fcHJvY2Vzcy5wdHIoKSk7CisgICAgICAgIHN1c3BlbmRlZFBhZ2UtPnVuc3VzcGVuZCgp OworICAgICAgICBtX21haW5GcmFtZSA9IFdlYkZyYW1lUHJveHk6OmNyZWF0ZShtX3BhZ2UsIHN1 c3BlbmRlZFBhZ2UtPm1haW5GcmFtZUlEKCkpOworICAgICAgICBtX3Byb2Nlc3MtPmZyYW1lQ3Jl YXRlZChzdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpLCAqbV9tYWluRnJhbWUpOworICAgIH0K K30KKworUHJvdmlzaW9uYWxQYWdlUHJveHk6On5Qcm92aXNpb25hbFBhZ2VQcm94eSgpCit7Cisg ICAgbV9wcm9jZXNzLT5yZW1vdmVQcm92aXNpb25hbFBhZ2VQcm94eSgqdGhpcyk7CisKKyAgICBp ZiAobV93YXNDb21taXR0ZWQpCisgICAgICAgIHJldHVybjsKKworICAgIG1fcHJvY2Vzcy0+cmVt b3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZl ck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6 OldlYlBhZ2U6OkNsb3NlKCksIG1fcGFnZS5wYWdlSUQoKSk7CisKKyAgICBpZiAobV9kcmF3aW5n QXJlYSkgeworICAgICAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9y YXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICAgICAgbV9kcmF3aW5nQXJlYSA9 IG51bGxwdHI7CisgICAgfQorCisgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtwcm9jZXNz ID0gbV9wcm9jZXNzLmNvcHlSZWYoKV0geworICAgICAgICBwcm9jZXNzLT5tYXliZVNodXREb3du KCk7CisgICAgfSk7Cit9CisKK3N0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBQcm92 aXNpb25hbFBhZ2VQcm94eTo6dGFrZURyYXdpbmdBcmVhKCkKK3sKKyAgICByZXR1cm4gV1RGTW92 ZShtX2RyYXdpbmdBcmVhKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6Y2FuY2Vs KCkKK3sKKyAgICAvLyBJZiB0aGUgcHJvdmlzaW9uYWwgbG9hZCBzdGFydGVkLCB0aGVuIGluZGlj YXRlIHRoYXQgaXQgZmFpbGVkIGR1ZSB0byBjYW5jZWxsYXRpb24gYnkgY2FsbGluZyBkaWRGYWls UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoKS4KKyAgICBpZiAobV9wcm92aXNpb25hbExvYWRVUkwu aXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CisKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VE KFByb2Nlc3NTd2FwcGluZywgImNhbmNlbDogU2ltdWxhdGluZyBhIGRpZEZhaWxQcm92aXNpb25h bExvYWRGb3JGcmFtZSBmb3IgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCkpOwor ICAgIEFTU0VSVChtX21haW5GcmFtZSk7CisgICAgYXV0byBlcnJvciA9IFdlYktpdDo6Y2FuY2Vs bGVkRXJyb3IobV9yZXF1ZXN0KTsKKyAgICBlcnJvci5zZXRUeXBlKFdlYkNvcmU6OlJlc291cmNl RXJyb3I6OlR5cGU6OkNhbmNlbGxhdGlvbik7CisgICAgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lKG1fbWFpbkZyYW1lLT5mcmFtZUlEKCksIHsgfSwgbV9uYXZpZ2F0aW9uSUQsIG1fcHJv dmlzaW9uYWxMb2FkVVJMLCBlcnJvciwgVXNlckRhdGEgeyB9KTsgLy8gV2lsbCBkZWxldGUgfHRo aXN8LgorfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSgp Cit7CisgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3Zl cnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgbV9kcmF3aW5nQXJlYSA9IG1fcGFnZS5wYWdl Q2xpZW50KCkuY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpOworCisgICAgYXV0byBwYXJhbWV0ZXJz ID0gbV9wYWdlLmNyZWF0aW9uUGFyYW1ldGVycygpOworICAgIHBhcmFtZXRlcnMuaXNQcm9jZXNz U3dhcCA9IHRydWU7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpD cmVhdGVXZWJQYWdlKG1fcGFnZS5wYWdlSUQoKSwgcGFyYW1ldGVycyksIDApOworfQorCit2b2lk IFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdh dGlvbiYgbmF2aWdhdGlvbiwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBkYXRhLCBjb25zdCBT dHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcmIGJh c2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0 YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit7CisgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0g bV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgbV9wYWdl LmxvYWREYXRhV2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgZGF0YSwgTUlNRVR5cGUsIGVuY29k aW5nLCBiYXNlVVJMLCB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdM b2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9u YWxQYWdlUHJveHk6OmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBu YXZpZ2F0aW9uLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBXZWJDb3JlOjpT aG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5IHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ks IEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3 ZWJzaXRlUG9saWNpZXMpCit7CisgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdl LnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgbV9wYWdlLmxvYWRS ZXF1ZXN0V2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgV1RGTW92ZShyZXF1ZXN0KSwgc2hvdWxk T3BlbkV4dGVybmFsVVJMc1BvbGljeSwgdXNlckRhdGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXND b250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOworfQorCit2b2lk IFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpnb1RvQmFja0ZvcndhcmRJdGVtKEFQSTo6TmF2aWdhdGlv biYgbmF2aWdhdGlvbiwgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYgaXRlbSwgT3B0aW9uYWw8V2Vi c2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit7CisgICAgYXV0byBpdGVtU3Rh dGVzID0gbV9wYWdlLmJhY2tGb3J3YXJkTGlzdCgpLmZpbHRlcmVkSXRlbVN0YXRlcyhbdGhpcywg dGFyZ2V0SXRlbSA9ICZpdGVtXShhdXRvJiBpdGVtKSB7CisgICAgICAgIGlmIChhdXRvKiBwYWdl ID0gaXRlbS5zdXNwZW5kZWRQYWdlKCkpIHsKKyAgICAgICAgICAgIGlmICgmcGFnZS0+cHJvY2Vz cygpID09IG1fcHJvY2Vzcy5wdHIoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgICAgIH0KKyAgICAgICAgcmV0dXJuICZpdGVtICE9IHRhcmdldEl0ZW07CisgICAgfSk7Cisg ICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpVcGRhdGVCYWNrRm9yd2FyZExp c3RGb3JSZWF0dGFjaChXVEZNb3ZlKGl0ZW1TdGF0ZXMpKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKyAg ICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0o bmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgaXRlbS5pdGVtSUQoKSwgKm5hdmlnYXRpb24uYmFj a0ZvcndhcmRGcmFtZUxvYWRUeXBlKCksIFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5n TG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpLCBtX3BhZ2UucGFnZUlEKCkpOwor ICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7Cit9CisKK3ZvaWQg UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZENyZWF0ZU1haW5GcmFtZSh1aW50NjRfdCBmcmFtZUlE KQoreworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiZGlkQ3Jl YXRlTWFpbkZyYW1lOiBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCwg bV9wYWdlLnBhZ2VJRCgpLCBmcmFtZUlEKTsKKyAgICBBU1NFUlQoIW1fbWFpbkZyYW1lKTsKKwor ICAgIG1fbWFpbkZyYW1lID0gV2ViRnJhbWVQcm94eTo6Y3JlYXRlKG1fcGFnZSwgZnJhbWVJRCk7 CisKKyAgICAvLyBBZGQgdGhlIGZyYW1lIHRvIHRoZSBwcm9jZXNzIHdpZGUgbWFwLgorICAgIG1f cHJvY2Vzcy0+ZnJhbWVDcmVhdGVkKGZyYW1lSUQsICptX21haW5GcmFtZSk7CisKKyAgICAvLyBU aGlzIG5hdmlnYXRpb24gd2FzIGRlc3Ryb3llZCBzbyBubyBuZWVkIHRvIG5vdGlmeSBvZiByZWRp cmVjdC4KKyAgICBpZiAoIW1fcGFnZS5uYXZpZ2F0aW9uU3RhdGUoKS5oYXNOYXZpZ2F0aW9uKG1f bmF2aWdhdGlvbklEKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gUmVzdG9yZSB0aGUgbWFp biBmcmFtZSdzIGNvbW1pdHRlZCBVUkwgYXMgc29tZSBjbGllbnRzIG1heSByZWx5IG9uIGl0IHVu dGlsIHRoZSBuZXh0IGxvYWQgaXMgY29tbWl0dGVkLgorICAgIGlmIChhdXRvKiBtYWluRnJhbWUg PSBtX3BhZ2UubWFpbkZyYW1lKCkpCisgICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0 ZSgpLnNldFVSTChtYWluRnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkudXJsKCkpOworCisgICAgLy8g Tm9ybWFsbHksIG5vdGlmaWNhdGlvbiBvZiBhIHNlcnZlciByZWRpcmVjdCBjb21lcyBmcm9tIHRo ZSBXZWJDb250ZW50IHByb2Nlc3MuCisgICAgLy8gSWYgd2UgYXJlIHByb2Nlc3Mgc3dhcHBpbmcg aW4gcmVzcG9uc2UgdG8gYSBzZXJ2ZXIgcmVkaXJlY3QgdGhlbiB0aGF0IG5vdGlmaWNhdGlvbiB3 aWxsIG5vdCBjb21lIGZyb20gdGhlIG5ldyBXZWJDb250ZW50IHByb2Nlc3MuCisgICAgLy8gSW4g dGhpcyBjYXNlIHdlIGhhdmUgdGhlIFVJUHJvY2VzcyBzeW50aGVzaXplIHRoZSByZWRpcmVjdCBu b3RpZmljYXRpb24gYXQgdGhlIGFwcHJvcHJpYXRlIHRpbWUuCisgICAgaWYgKG1faXNTZXJ2ZXJS ZWRpcmVjdCkgeworICAgICAgICBtX21haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5kaWRTdGFy dFByb3Zpc2lvbmFsTG9hZChtX3JlcXVlc3QudXJsKCkpOworCisgICAgICAgIGF1dG8gcGFnZVBy b2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nl c3MpOworICAgICAgICBtX3BhZ2UuZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9u YWxMb2FkRm9yRnJhbWUobV9tYWluRnJhbWUtPmZyYW1lSUQoKSwgbV9uYXZpZ2F0aW9uSUQsIFdU Rk1vdmUobV9yZXF1ZXN0KSwgeyB9KTsKKyAgICB9Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdl UHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwg dWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiB1cmwsIFVSTCYmIHVucmVhY2hhYmxlVVJMLCBj b25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCit7CisgICAgLy8gSWYgdGhlIHByZXZpb3VzIHByb3Zp c2lvbmFsIGxvYWQgdXNlZCB0aGUgc2FtZSBwcm9jZXNzLCB3ZSBtYXkgcmVjZWl2ZSBJUEMgZm9y IHRoaXMgcHJldmlvdXMgcHJvdmlzaW9uYWwncyBtYWluIGZyYW1lIHRoYXQgd2UgbmVlZCB0byBp Z25vcmUuCisgICAgaWYgKCFtX21haW5GcmFtZSB8fCBtX21haW5GcmFtZS0+ZnJhbWVJRCgpICE9 IGZyYW1lSUQpCisgICAgICAgIHJldHVybjsKKworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQo UHJvY2Vzc1N3YXBwaW5nLCAiZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTogcGFnZUlE ID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEID0gJSIg UFJJdTY0LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCk7CisgICAgQVNT RVJUKG1fcHJvdmlzaW9uYWxMb2FkVVJMLmlzTnVsbCgpKTsKKyAgICBtX3Byb3Zpc2lvbmFsTG9h ZFVSTCA9IHVybDsKKworICAgIC8vIE1lcmVseSBmb2xsb3dpbmcgYSBzZXJ2ZXIgc2lkZSByZWRp cmVjdCBzbyB0aGVyZSBpcyBubyBuZWVkIHRvIHNlbmQgYSBkaWRTdGFydFByb3Zpc2lvbmFsTG9h ZCBhZ2Fpbi4KKyAgICBpZiAobV9pc1NlcnZlclJlZGlyZWN0KQorICAgICAgICByZXR1cm47CisK KyAgICAvLyBDbGllbnRzIGV4cGVjdCB0aGUgUGFnZSdzIG1haW4gZnJhbWUncyBleHBlY3RlZFVS TCB0byBiZSB0aGUgcHJvdmlzaW9uYWwgb25lIHdoZW4gYSBwcm92aXNpb25hbCBsb2FkIGlzIHN0 YXJ0ZWQuCisgICAgaWYgKGF1dG8qIHBhZ2VNYWluRnJhbWUgPSBtX3BhZ2UubWFpbkZyYW1lKCkp CisgICAgICAgIHBhZ2VNYWluRnJhbWUtPmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKHVybCk7CisK KyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlk ZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBtX3BhZ2UuZGlkU3RhcnRQcm92aXNpb25hbExvYWRG b3JGcmFtZShmcmFtZUlELCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUodXJsKSwgV1RGTW92ZSh1bnJl YWNoYWJsZVVSTCksIHVzZXJEYXRhKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6 ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdl YkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3Qg bmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJMLCBjb25zdCBXZWJDb3Jl OjpSZXNvdXJjZUVycm9yJiBlcnJvciwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAg IGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJv Y2VzcyhtX3Byb2Nlc3MpOworCisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dh cHBpbmcsICJkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6IHBhZ2VJRCA9ICUiIFBSSXU2 NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIG5hdmlnYXRpb25JRCA9ICUiIFBSSXU2NCwgbV9w YWdlLnBhZ2VJRCgpLCBmcmFtZUlELCBuYXZpZ2F0aW9uSUQpOworICAgIG1fcHJvdmlzaW9uYWxM b2FkVVJMID0geyB9OworCisgICAgLy8gTWFrZSBzdXJlIHRoZSBQYWdlJ3MgbWFpbiBmcmFtZSdz IGV4cGVjdGVkVVJMIGdldHMgY2xlYXJlZCBzaW5jZSB3ZSB1cGRhdGVkIGl0IGluIGRpZFN0YXJ0 UHJvdmlzaW9uYWxMb2FkLgorICAgIGlmIChhdXRvKiBwYWdlTWFpbkZyYW1lID0gbV9wYWdlLm1h aW5GcmFtZSgpKQorICAgICAgICBwYWdlTWFpbkZyYW1lLT5kaWRGYWlsUHJvdmlzaW9uYWxMb2Fk KCk7CisKKyAgICBtX3BhZ2UuZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKGZyYW1lSUQs IGZyYW1lU2VjdXJpdHlPcmlnaW4sIG5hdmlnYXRpb25JRCwgcHJvdmlzaW9uYWxVUkwsIGVycm9y LCB1c2VyRGF0YSk7IC8vIFdpbGwgZGVsZXRlIHx0aGlzfC4KK30KKwordm9pZCBQcm92aXNpb25h bFBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2 NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1 c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29y ZTo6Q2VydGlmaWNhdGVJbmZvJiBjZXJ0aWZpY2F0ZUluZm8sIGJvb2wgY29udGFpbnNQbHVnaW5E b2N1bWVudCwgT3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJ bnNlY3VyZUNvbnRlbnQsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICAvLyBJZiB0 aGUgcHJldmlvdXMgcHJvdmlzaW9uYWwgbG9hZCB1c2VkIHRoZSBzYW1lIHByb2Nlc3MsIHdlIG1h eSByZWNlaXZlIElQQyBmb3IgdGhpcyBwcmV2aW91cyBwcm92aXNpb25hbCdzIG1haW4gZnJhbWUg dGhhdCB3ZSBuZWVkIHRvIGlnbm9yZS4KKyAgICBpZiAoIW1fbWFpbkZyYW1lIHx8IG1fbWFpbkZy YW1lLT5mcmFtZUlEKCkgIT0gZnJhbWVJRCkKKyAgICAgICAgcmV0dXJuOworCisgICAgUkVMRUFT RV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJkaWRDb21taXRMb2FkRm9yRnJhbWU6 IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIG5hdmlnYXRpb25J RCA9ICUiIFBSSXU2NCwgbV9wYWdlLnBhZ2VJRCgpLCBmcmFtZUlELCBuYXZpZ2F0aW9uSUQpOwor ICAgIG1fcHJvdmlzaW9uYWxMb2FkVVJMID0geyB9OworICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVz c2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUo KSwgbV9wYWdlLnBhZ2VJRCgpKTsKKworICAgIG1fd2FzQ29tbWl0dGVkID0gdHJ1ZTsKKyAgICBt X3BhZ2UuY29tbWl0UHJvdmlzaW9uYWxQYWdlKGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgbWltZVR5 cGUsIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCBmcmFtZUxvYWRUeXBlLCBjZXJ0aWZp Y2F0ZUluZm8sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIGZvcmNlZEhhc0luc2VjdXJlQ29udGVu dCwgdXNlckRhdGEpOyAvLyBXaWxsIGRlbGV0ZSB8dGhpc3wuCit9CisKK3ZvaWQgUHJvdmlzaW9u YWxQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlv biwgSVBDOjpEZWNvZGVyJiBkZWNvZGVyKQoreworICAgIEFTU0VSVChkZWNvZGVyLm1lc3NhZ2VS ZWNlaXZlck5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJO YW1lKCkpOworCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjpEaWRTdGFydFByb2dyZXNzOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5t ZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENoYW5nZVByb2dyZXNz OjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OkJhY2tGb3J3YXJkQWRkSXRlbTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29k ZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpMb2dEaWFnbm9zdGlj TWVzc2FnZTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpMb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhFbmhhbmNlZFByaXZh Y3k6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6U2V0TmV0d29ya1JlcXVlc3RzSW5Qcm9ncmVzczo6bmFtZSgpCisjaWYg UExBVEZPUk0oQ09DT0EpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpSZWdpc3RlcldlYlByb2Nlc3NBY2Nlc3NpYmlsaXR5VG9rZW46 Om5hbWUoKQorI2VuZGlmCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmM6 Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6U3RhcnRVUkxTY2hlbWVUYXNrOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rl ci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRlY2lkZVBvbGljeUZv clJlc3BvbnNlOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdDo6bmFtZSgpCisg ICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjpEaWRDaGFuZ2VQcm92aXNpb25hbFVSTEZvckZyYW1lOjpuYW1lKCkKKyAgICAgICAgfHwgZGVj b2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZE5hdmlnYXRl V2l0aE5hdmlnYXRpb25EYXRhOjpuYW1lKCkpCisgICAgeworICAgICAgICBhdXRvIHBhZ2VQcm9j ZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNz KTsKKyAgICAgICAgbV9wYWdlLmRpZFJlY2VpdmVNZXNzYWdlKGNvbm5lY3Rpb24sIGRlY29kZXIp OworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUo KSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDcmVhdGVNYWluRnJhbWU6Om5hbWUoKSkg eworICAgICAgICBJUEM6OmhhbmRsZU1lc3NhZ2U8TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlk Q3JlYXRlTWFpbkZyYW1lPihkZWNvZGVyLCB0aGlzLCAmUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRp ZENyZWF0ZU1haW5GcmFtZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVj b2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yRnJhbWU6Om5hbWUoKSkgeworICAgICAgICBJUEM6OmhhbmRsZU1lc3Nh Z2U8TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFt ZT4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lv bmFsTG9hZEZvckZyYW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkZWNv ZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkRmFpbFByb3Zp c2lvbmFsTG9hZEZvckZyYW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdl PE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZT4o ZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxM b2FkRm9yRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIu bWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDb21taXRMb2FkRm9y RnJhbWU6Om5hbWUoKSkgeworICAgICAgICBJUEM6OmhhbmRsZU1lc3NhZ2U8TWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6RGlkQ29tbWl0TG9hZEZvckZyYW1lPihkZWNvZGVyLCB0aGlzLCAmUHJvdmlz aW9uYWxQYWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZSk7CisgICAgICAgIHJldHVybjsK KyAgICB9CisKKyAgICBMT0coUHJvY2Vzc1N3YXBwaW5nLCAiVW5oYW5kbGVkIG1lc3NhZ2UgJXM6 OiVzIGZyb20gcHJvdmlzaW9uYWwgcHJvY2VzcyIsIGRlY29kZXIubWVzc2FnZVJlY2VpdmVyTmFt ZSgpLnRvU3RyaW5nKCkuZGF0YSgpLCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkudG9TdHJpbmcoKS5k YXRhKCkpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlU3luY01l c3NhZ2UoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBJUEM6OkRlY29kZXImIGRlY29kZXIs IHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+JiBlbmNvZGVyKQoreworICAgIGlmIChkZWNv ZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6QmFja0ZvcndhcmRJ dGVtQXRJbmRleDo6bmFtZSgpIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpCYWNrRm9yd2FyZEdvVG9JdGVtOjpuYW1lKCkpIHsKKyAgICAgICAgYXV0 byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNz KG1fcHJvY2Vzcyk7CisgICAgICAgIG1fcGFnZS5kaWRSZWNlaXZlU3luY01lc3NhZ2UoY29ubmVj dGlvbiwgZGVjb2RlciwgZW5jb2Rlcik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBM T0coUHJvY2Vzc1N3YXBwaW5nLCAiVW5oYW5kbGVkIHN5bmMgbWVzc2FnZSAlczo6JXMgZnJvbSBw cm92aXNpb25hbCBwcm9jZXNzIiwgZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkudG9TdHJp bmcoKS5kYXRhKCksIGRlY29kZXIubWVzc2FnZU5hbWUoKS50b1N0cmluZygpLmRhdGEoKSk7Cit9 CisKK30gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1By b3Zpc2lvbmFsUGFnZVByb3h5LmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAuLmVkYzE0MTU1NDliCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuaApAQCAtMCwwICsxLDg5IEBACisvKgorICogQ29weXJp Z2h0IChDKSAyMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBv ZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIu CisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhl IGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBh bmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAq CisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05U UklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5U SUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJB TlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAq IFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1Ig SVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwg SU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1B R0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNV QlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRT OyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5Z IFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElB QklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBB UklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKwor I3ByYWdtYSBvbmNlCisKKyNpbmNsdWRlICJNZXNzYWdlUmVjZWl2ZXIuaCIKKworbmFtZXNwYWNl IFdlYkNvcmUgeworY2xhc3MgUmVzb3VyY2VSZXF1ZXN0OworfQorCituYW1lc3BhY2UgV2ViS2l0 IHsKKworY2xhc3MgRHJhd2luZ0FyZWFQcm94eTsKK2NsYXNzIFN1c3BlbmRlZFBhZ2VQcm94eTsK K2NsYXNzIFdlYkZyYW1lUHJveHk7CitjbGFzcyBXZWJQYWdlUHJveHk7CitjbGFzcyBXZWJQcm9j ZXNzUHJveHk7CisKK2NsYXNzIFByb3Zpc2lvbmFsUGFnZVByb3h5IDogcHVibGljIElQQzo6TWVz c2FnZVJlY2VpdmVyIHsKKyAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKK3B1YmxpYzoKKyAg ICBQcm92aXNpb25hbFBhZ2VQcm94eShXZWJQYWdlUHJveHkmLCBSZWY8V2ViUHJvY2Vzc1Byb3h5 PiYmLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiwgdWludDY0X3QgbmF2aWdh dGlvbklELCBib29sIGlzU2VydmVyUmVkaXJlY3QsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdCYsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpOworICAgIH5Qcm92aXNpb25hbFBh Z2VQcm94eSgpOworCisgICAgV2ViUGFnZVByb3h5JiBwYWdlKCkgeyByZXR1cm4gbV9wYWdlOyB9 CisgICAgV2ViRnJhbWVQcm94eSogbWFpbkZyYW1lKCkgY29uc3QgeyByZXR1cm4gbV9tYWluRnJh bWUuZ2V0KCk7IH0KKyAgICBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MoKSB7IHJldHVybiBtX3By b2Nlc3MuZ2V0KCk7IH0KKyAgICBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NT d2FwUmVxdWVzdGVkQnlDbGllbnQoKSBjb25zdCB7IHJldHVybiBtX3Byb2Nlc3NTd2FwUmVxdWVz dGVkQnlDbGllbnQ7IH0KKyAgICB1aW50NjRfdCBuYXZpZ2F0aW9uSUQoKSBjb25zdCB7IHJldHVy biBtX25hdmlnYXRpb25JRDsgfQorCisgICAgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJv eHk+IHRha2VEcmF3aW5nQXJlYSgpOworCisgICAgdm9pZCBsb2FkRGF0YVdpdGhOYXZpZ2F0aW9u KEFQSTo6TmF2aWdhdGlvbiYsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYsIGNvbnN0IFN0cmlu ZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVS TCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYm ID0gV1RGOjpudWxsb3B0KTsKKyAgICB2b2lkIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oQVBJ OjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlNob3Vs ZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0aW9uYWw8 V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7CisgICAgdm9pZCBnb1RvQmFj a0ZvcndhcmRJdGVtKEFQSTo6TmF2aWdhdGlvbiYsIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mLCBP cHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmKTsKKyAgICB2b2lkIGNhbmNlbCgpOworCitw cml2YXRlOgorICAgIC8vIElQQzo6TWVzc2FnZVJlY2VpdmVyCisgICAgdm9pZCBkaWRSZWNlaXZl TWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImKSBmaW5hbDsKKyAgICB2b2lk IGRpZFJlY2VpdmVTeW5jTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImLCBz dGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVyPiYpIGZpbmFsOworCisgICAgdm9pZCBkaWRDcmVh dGVNYWluRnJhbWUodWludDY0X3QgZnJhbWVJRCk7CisgICAgdm9pZCBkaWRTdGFydFByb3Zpc2lv bmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwg VVJMJiYsIFVSTCYmIHVucmVhY2hhYmxlVVJMLCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQg ZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRp b25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQ cm92aWRlciwgdWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNh dGVJbmZvJiwgYm9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpI YXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRh dGEmKTsKKyAgICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBm cmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlP cmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVS TCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIGNvbnN0IFVzZXJEYXRhJik7CisKKyAg ICB2b2lkIGluaXRpYWxpemVXZWJQYWdlKCk7CisKKyAgICBXZWJQYWdlUHJveHkmIG1fcGFnZTsK KyAgICBSZWY8V2ViUHJvY2Vzc1Byb3h5PiBtX3Byb2Nlc3M7CisgICAgc3RkOjp1bmlxdWVfcHRy PERyYXdpbmdBcmVhUHJveHk+IG1fZHJhd2luZ0FyZWE7CisgICAgUmVmUHRyPFdlYkZyYW1lUHJv eHk+IG1fbWFpbkZyYW1lOworICAgIHVpbnQ2NF90IG1fbmF2aWdhdGlvbklEOworICAgIGJvb2wg bV9pc1NlcnZlclJlZGlyZWN0OworICAgIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCBtX3JlcXVl c3Q7CisgICAgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBtX3Byb2Nlc3NTd2FwUmVxdWVz dGVkQnlDbGllbnQ7CisgICAgYm9vbCBtX3dhc0NvbW1pdHRlZCB7IGZhbHNlIH07CisgICAgVVJM IG1fcHJvdmlzaW9uYWxMb2FkVVJMOworCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAgICBQ cm9jZXNzVGhyb3R0bGVyOjpCYWNrZ3JvdW5kQWN0aXZpdHlUb2tlbiBtX3N1c3BlbnNpb25Ub2tl bjsKKyNlbmRpZgorfTsKKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcAppbmRleCBmMTk4YTgxNTMzZi4uZmY3 NmQ5ZjdmOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBh Z2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVBy b3h5LmNwcApAQCAtMTAwLDcgKzEwMCw5IEBAIFN1c3BlbmRlZFBhZ2VQcm94eTo6flN1c3BlbmRl ZFBhZ2VQcm94eSgpCiAgICAgLy8gSWYgdGhlIHN1c3BlbmRlZCBwYWdlIHdhcyBub3QgY29uc3Vt ZWQgYmVmb3JlIGdldHRpbmcgZGVzdHJveWVkLCB0aGVuIGNsb3NlIHRoZSBjb3JyZXNwb25kaW5n IHBhZ2UKICAgICAvLyBvbiB0aGUgV2ViUHJvY2VzcyBzaWRlLgogICAgIG1fcHJvY2Vzcy0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKLSAgICBtX3By b2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNz YWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisKKyAgICBpZiAobV9zdXNwZW5z aW9uU3RhdGUgPT0gU3VzcGVuc2lvblN0YXRlOjpTdXNwZW5kaW5nKQorICAgICAgICBtX3Byb2Nl c3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdl UmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CiAKICAgICAvLyBXZSBjYWxsIG1heWJl U2h1dERvd24oKSBhc3luY2hyb25vdXNseSBzaW5jZSB0aGUgU3VzcGVuZGVkUGFnZSBpcyBjdXJy ZW50bHkgYmVpbmcgcmVtb3ZlZCBmcm9tIHRoZSBXZWJQcm9jZXNzUG9vbAogICAgIC8vIGFuZCB3 ZSB3YW50IHRvIGF2b2lkIHJlLWVudGVyaW5nIFdlYlByb2Nlc3NQb29sIG1ldGhvZHMuCkBAIC0x MzQsNyArMTM2LDYgQEAgdm9pZCBTdXNwZW5kZWRQYWdlUHJveHk6OnVuc3VzcGVuZCgpCiAgICAg QVNTRVJUKG1fc3VzcGVuc2lvblN0YXRlID09IFN1c3BlbnNpb25TdGF0ZTo6U3VzcGVuZGVkKTsK IAogICAgIG1fc3VzcGVuc2lvblN0YXRlID0gU3VzcGVuc2lvblN0YXRlOjpSZXN1bWVkOwotICAg IG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKICAgICBtX3Byb2Nlc3Mt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldElzU3VzcGVuZGVkKGZhbHNlKSwgbV9wYWdlLnBh Z2VJRCgpKTsKIH0KIApAQCAtMTUxLDYgKzE1Miw4IEBAIHZvaWQgU3VzcGVuZGVkUGFnZVByb3h5 OjpkaWRQcm9jZXNzUmVxdWVzdFRvU3VzcGVuZChTdXNwZW5zaW9uU3RhdGUgbmV3U3VzcGVuc2lv CiAgICAgbV9zdXNwZW5zaW9uVG9rZW4gPSBudWxscHRyOwogI2VuZGlmCiAKKyAgICBtX3Byb2Nl c3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdl UmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisKICAgICBpZiAobV9yZWFkeVRvVW5z dXNwZW5kSGFuZGxlcikKICAgICAgICAgbV9yZWFkeVRvVW5zdXNwZW5kSGFuZGxlcih0aGlzKTsK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3Bw IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKaW5kZXggYzc3YTI2 Yjc0MjcuLjUzYzcxOTZjMmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJGcmFtZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVBy b3h5LmNwcApAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUgIldlYkZyYW1lUHJveHkuaCIKIAog I2luY2x1ZGUgIkFQSU5hdmlnYXRpb24uaCIKKyNpbmNsdWRlICJQcm92aXNpb25hbFBhZ2VQcm94 eS5oIgogI2luY2x1ZGUgIldlYkNlcnRpZmljYXRlSW5mby5oIgogI2luY2x1ZGUgIldlYkZyYW1l UG9saWN5TGlzdGVuZXJQcm94eS5oIgogI2luY2x1ZGUgIldlYlBhZ2VNZXNzYWdlcy5oIgpAQCAt NzQsNyArNzUsNyBAQCBib29sIFdlYkZyYW1lUHJveHk6OmlzTWFpbkZyYW1lKCkgY29uc3QKICAg ICBpZiAoIW1fcGFnZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgcmV0dXJuIHRoaXMg PT0gbV9wYWdlLT5tYWluRnJhbWUoKTsKKyAgICByZXR1cm4gdGhpcyA9PSBtX3BhZ2UtPm1haW5G cmFtZSgpIHx8IChtX3BhZ2UtPnByb3Zpc2lvbmFsUGFnZVByb3h5KCkgJiYgdGhpcyA9PSBtX3Bh Z2UtPnByb3Zpc2lvbmFsUGFnZVByb3h5KCktPm1haW5GcmFtZSgpKTsKIH0KIAogdm9pZCBXZWJG cmFtZVByb3h5Ojpsb2FkVVJMKGNvbnN0IFVSTCYgdXJsKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMzkyNzQzYmQ1NjcuLjc3YWQ2MGMyYWQ3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTc3LDYgKzc3LDcgQEAKICNp bmNsdWRlICJQbHVnaW5JbmZvcm1hdGlvbi5oIgogI2luY2x1ZGUgIlBsdWdpblByb2Nlc3NNYW5h Z2VyLmgiCiAjaW5jbHVkZSAiUHJpbnRJbmZvLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdl UHJveHkuaCIKICNpbmNsdWRlICJTYWZlQnJvd3NpbmdXYXJuaW5nLmgiCiAjaW5jbHVkZSAiU2hh cmVTaGVldENhbGxiYWNrSUQuaCIKICNpbmNsdWRlICJTaGFyZWRCdWZmZXJEYXRhUmVmZXJlbmNl LmgiCkBAIC03NjgsMzggKzc2OSwyNSBAQCBib29sIFdlYlBhZ2VQcm94eTo6c3VzcGVuZEN1cnJl bnRQYWdlSWZQb3NzaWJsZShBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIE9wdAogICAgIHJl dHVybiB0cnVlOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6c3dhcFRvV2ViUHJvY2VzcyhSZWY8 V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdl UHJveHk+JiYgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLCBJc1N3YXBGcm9tU3VzcGVuZGVkIGlz U3dhcEZyb21TdXNwZW5kZWQpCit2b2lkIFdlYlBhZ2VQcm94eTo6c3dhcFRvV2ViUHJvY2VzcyhS ZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJl YVByb3h5PiYmIGRyYXdpbmdBcmVhLCBSZWZQdHI8V2ViRnJhbWVQcm94eT4mJiBtYWluRnJhbWUp CiB7CiAgICAgQVNTRVJUKCFtX2lzQ2xvc2VkKTsKICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VE KExvYWRpbmcsICJzd2FwVG9XZWJQcm9jZXNzOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJ dTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKIAogICAgIG1f cHJvY2VzcyA9IFdURk1vdmUocHJvY2Vzcyk7CisgICAgQVNTRVJUKCFtX2RyYXdpbmdBcmVhKTsK KyAgICBtX2RyYXdpbmdBcmVhID0gV1RGTW92ZShkcmF3aW5nQXJlYSk7CisgICAgQVNTRVJUKCFt X21haW5GcmFtZSk7CisgICAgbV9tYWluRnJhbWUgPSBXVEZNb3ZlKG1haW5GcmFtZSk7CiAgICAg bV9pc1ZhbGlkID0gdHJ1ZTsKIAotICAgIC8vIElmIHdlIGFyZSByZWF0dGFjaGluZyB0byBhIFN1 c3BlbmRlZFBhZ2UsIHRoZW4gdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UgYWxyZWFkeSBleGlzdHMg YW5kCi0gICAgLy8gV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUoKSB3aWxsIG5vdCBi ZSBjYWxsZWQgdG8gaW5pdGlhbGl6ZSBtX21haW5GcmFtZS4gSW4gc3VjaAotICAgIC8vIGNhc2Us IHdlIG5lZWQgdG8gaW5pdGlhbGl6ZSBtX21haW5GcmFtZSB0byByZWZsZWN0IHRoZSBmYWN0IHRo ZSB0aGUgV2ViUHJvY2VzcycgV2ViUGFnZQotICAgIC8vIGFscmVhZHkgZXhpc3RzIGFuZCBhbHJl YWR5IGhhcyBhIG1haW4gZnJhbWUuCi0gICAgaWYgKGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSkg ewotICAgICAgICBpZiAoIWRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZS0+ZmFpbGVkVG9TdXNwZW5k KCkpIHsKLSAgICAgICAgICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOwotICAgICAgICAgICAgQVNT RVJUKCZkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRy KCkpOwotICAgICAgICAgICAgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT51bnN1c3BlbmQoKTsK LSAgICAgICAgICAgIG1fbWFpbkZyYW1lID0gV2ViRnJhbWVQcm94eTo6Y3JlYXRlKCp0aGlzLCBk ZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPm1haW5GcmFtZUlEKCkpOwotICAgICAgICAgICAgbV9w cm9jZXNzLT5mcmFtZUNyZWF0ZWQoZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJ RCgpLCAqbV9tYWluRnJhbWUpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgLy8gV2Ug ZmFpbGVkIHRvIHN1c3BlbmQgdGhlIHBhZ2Ugc28gZGVzdHJveSBpdCBub3cgYW5kIG1lcmVseSBy ZXVzZSBpdHMgV2ViQ29udGVudCBwcm9jZXNzLgotICAgICAgICAgICAgZGVzdGluYXRpb25TdXNw ZW5kZWRQYWdlID0gbnVsbHB0cjsKLSAgICAgICAgfQotICAgIH0KLQogICAgIG1fcHJvY2Vzcy0+ YWRkRXhpc3RpbmdXZWJQYWdlKCp0aGlzLCBtX3BhZ2VJRCwgV2ViUHJvY2Vzc1Byb3h5OjpCZWdp bnNVc2luZ0RhdGFTdG9yZTo6Tm8pOwogICAgIG1fcHJvY2Vzcy0+YWRkTWVzc2FnZVJlY2VpdmVy KE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlSUQs ICp0aGlzKTsKIAotICAgIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2Vzcyhpc1N3YXBGcm9tU3Vz cGVuZGVkKTsKKyAgICBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoKTsKIH0KIAotdm9pZCBX ZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhJc1N3YXBGcm9tU3VzcGVu ZGVkIGlzU3dhcEZyb21TdXNwZW5kZWQpCit2b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNo aW5nVG9XZWJQcm9jZXNzKCkKIHsKICAgICBBU1NFUlQobV9wcm9jZXNzLT5zdGF0ZSgpICE9IENo aWxkUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6VGVybWluYXRlZCk7CiAKQEAgLTgzNSw3ICs4MjMsNyBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKElzU3dhcEZy b21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1cwogICAgIG1fZWRpdGFibGVJbWFnZUNvbnRyb2xsZXIg PSBzdGQ6Om1ha2VfdW5pcXVlPEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyPigqdGhpcyk7CiAjZW5k aWYKIAotICAgIGluaXRpYWxpemVXZWJQYWdlKGlzU3dhcEZyb21TdXNwZW5kZWQpOworICAgIGlu aXRpYWxpemVXZWJQYWdlKCk7CiAKICAgICBtX2luc3BlY3Rvci0+dXBkYXRlRm9yTmV3UGFnZVBy b2Nlc3ModGhpcyk7CiAKQEAgLTkwMCwxMiArODg4LDE0IEBAIFJlZlB0cjxBUEk6Ok5hdmlnYXRp b24+IFdlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRlbShXZWJCYWNrRm9y d2FyCiAgICAgcmV0dXJuIFdURk1vdmUobmF2aWdhdGlvbik7CiB9CiAKLXZvaWQgV2ViUGFnZVBy b3h5Ojppbml0aWFsaXplV2ViUGFnZShJc1N3YXBGcm9tU3VzcGVuZGVkIGlzU3dhcEZyb21TdXNw ZW5kZWQpCit2b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoKQogewogICAgIEFT U0VSVChpc1ZhbGlkKCkpOwogCi0gICAgbV9kcmF3aW5nQXJlYSA9IHBhZ2VDbGllbnQoKS5jcmVh dGVEcmF3aW5nQXJlYVByb3h5KCk7Ci0gICAgQVNTRVJUKG1fZHJhd2luZ0FyZWEpOworICAgIGlm ICghbV9kcmF3aW5nQXJlYSkgeworICAgICAgICBtX2RyYXdpbmdBcmVhID0gcGFnZUNsaWVudCgp LmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKKyAgICAgICAgQVNTRVJUKG1fZHJhd2luZ0FyZWEp OworICAgIH0KIAogI2lmIEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpICYmIFBMQVRGT1JNKENPQ09B KQogICAgIGlmIChtX2RyYXdpbmdBcmVhLT50eXBlKCkgPT0gRHJhd2luZ0FyZWFUeXBlUmVtb3Rl TGF5ZXJUcmVlKSB7CkBAIC05MTcsMTQgKzkwNyw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojppbml0 aWFsaXplV2ViUGFnZShJc1N3YXBGcm9tU3VzcGVuZGVkIGlzU3dhcEZyb21TdXNwZW5kZWQpCiAg ICAgfQogI2VuZGlmCiAKLSAgICBhdXRvIHBhcmFtZXRlcnMgPSBjcmVhdGlvblBhcmFtZXRlcnMo KTsKLSAgICBwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQgPSBpc1N3YXBGcm9tU3VzcGVu ZGVkID09IElzU3dhcEZyb21TdXNwZW5kZWQ6OlllczsKLQotI2lmIEVOQUJMRShTRVJWSUNFX1dP UktFUikKLSAgICBwYXJhbWV0ZXJzLmhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyA9IHByb2Nl c3MoKS5wcm9jZXNzUG9vbCgpLm1heUhhdmVSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMobV93ZWJz aXRlRGF0YVN0b3JlKTsKLSNlbmRpZgotCi0gICAgcHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6Oldl YlByb2Nlc3M6OkNyZWF0ZVdlYlBhZ2UobV9wYWdlSUQsIHBhcmFtZXRlcnMpLCAwKTsKKyAgICBw cm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6Q3JlYXRlV2ViUGFnZShtX3BhZ2VJ RCwgY3JlYXRpb25QYXJhbWV0ZXJzKCkpLCAwKTsKIAogICAgIG1fbmVlZHNUb0ZpbmlzaEluaXRp YWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2ggPSB0cnVlOwogICAgIGZpbmlzaEluaXRp YWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2goKTsKQEAgLTEwNzYsNyArMTA1OSw4IEBA IHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdh dGlvbiYgbmF2aWdhdGlvbiwgUmVzb3VyCiAgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFnZUxv YWRTdGF0ZS50cmFuc2FjdGlvbigpOwogCiAgICAgYXV0byB1cmwgPSByZXF1ZXN0LnVybCgpOwot ICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFuc2FjdGlvbiwg dXJsKTsKKyAgICBpZiAoc2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkICE9IFNob3VsZFRyZWF0 QXNDb250aW51aW5nTG9hZDo6WWVzKQorICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0UGVuZGlu Z0FQSVJlcXVlc3RVUkwodHJhbnNhY3Rpb24sIHVybCk7CiAKICAgICBpZiAoIWlzVmFsaWQoKSkK ICAgICAgICAgcmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsKQEAgLTI2OTcsNyArMjY4MSw3IEBAIHZv aWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbihXZWJQb2xp Y3lBY3Rpb24gcG9saWN5QWN0aW9uCiAgICAgICAgIH0KIAogICAgICAgICBpZiAocHJvY2Vzc0Zv ck5hdmlnYXRpb24ucHRyKCkgIT0gJnByb2Nlc3MoKSkgewotICAgICAgICAgICAgcG9saWN5QWN0 aW9uID0gaXNQYWdlT3BlbmVkQnlET01TaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSA/IFdl YlBvbGljeUFjdGlvbjo6SWdub3JlIDogV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kOworICAgICAg ICAgICAgcG9saWN5QWN0aW9uID0gV2ViUG9saWN5QWN0aW9uOjpJZ25vcmU7CiAgICAgICAgICAg ICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25BY3Rpb24sIHN3YXBwaW5nIHByb2Nlc3MgJWkgd2l0aCBwcm9jZXNzICVpIGZv ciBuYXZpZ2F0aW9uLCByZWFzb246ICV7cHVibGljfXMiLCBwcm9jZXNzSWRlbnRpZmllcigpLCBw cm9jZXNzRm9yTmF2aWdhdGlvbi0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgcmVhc29uLnV0ZjgoKS5k YXRhKCkpOwogICAgICAgICAgICAgTE9HKFByb2Nlc3NTd2FwcGluZywgIihQcm9jZXNzU3dhcHBp bmcpIFN3aXRjaGluZyBmcm9tIHByb2Nlc3MgJWkgdG8gbmV3IHByb2Nlc3MgKCVpKSBmb3IgbmF2 aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMnIiwgcHJvY2Vzc0lkZW50aWZpZXIoKSwgcHJvY2Vzc0Zv ck5hdmlnYXRpb24tPnByb2Nlc3NJZGVudGlmaWVyKCksIG5hdmlnYXRpb24tPm5hdmlnYXRpb25J RCgpLCBuYXZpZ2F0aW9uLT5sb2dnaW5nU3RyaW5nKCkpOwogICAgICAgICB9IGVsc2UKQEAgLTI3 MDYsOCArMjY5MCwxNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVjZWl2ZWROYXZpZ2F0aW9uUG9s aWN5RGVjaXNpb24oV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbgogICAgICAgICBib29sIHNo b3VsZFByb2Nlc3NTd2FwID0gcHJvY2Vzc0Zvck5hdmlnYXRpb24ucHRyKCkgIT0gJnByb2Nlc3Mo KTsKICAgICAgICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24sIG5hdmlnYXRp b24ucHRyKCksIHNob3VsZFByb2Nlc3NTd2FwID8gV1RGOjpudWxsb3B0IDogV1RGTW92ZShkYXRh KSwgV1RGTW92ZShzZW5kZXIpKTsKIAotICAgICAgICBpZiAoc2hvdWxkUHJvY2Vzc1N3YXApCi0g ICAgICAgICAgICBjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MobmF2aWdhdGlvbiwgZGVz dGluYXRpb25TdXNwZW5kZWRQYWdlID8gcHJvY2VzcygpLnByb2Nlc3NQb29sKCkudGFrZVN1c3Bl bmRlZFBhZ2UoKmRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSkgOiBudWxscHRyLCBXVEZNb3ZlKHBy b2Nlc3NGb3JOYXZpZ2F0aW9uKSwgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgV1RGTW92 ZShkYXRhKSk7CisgICAgICAgIGlmICghc2hvdWxkUHJvY2Vzc1N3YXApCisgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgYXV0byBzdXNwZW5kZWRQYWdlID0gZGVzdGluYXRpb25TdXNwZW5k ZWRQYWdlID8gcHJvY2VzcygpLnByb2Nlc3NQb29sKCkudGFrZVN1c3BlbmRlZFBhZ2UoKmRlc3Rp bmF0aW9uU3VzcGVuZGVkUGFnZSkgOiBudWxscHRyOworICAgICAgICBpZiAoc3VzcGVuZGVkUGFn ZSAmJiBzdXNwZW5kZWRQYWdlLT5mYWlsZWRUb1N1c3BlbmQoKSkKKyAgICAgICAgICAgIHN1c3Bl bmRlZFBhZ2UgPSBudWxscHRyOworCisgICAgICAgIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJv Y2VzcyhuYXZpZ2F0aW9uLCBXVEZNb3ZlKHN1c3BlbmRlZFBhZ2UpLCBXVEZNb3ZlKHByb2Nlc3NG b3JOYXZpZ2F0aW9uKSwgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgV1RGTW92ZShkYXRh KSk7CiAgICAgfSk7CiB9CiAKQEAgLTI3NDMsMjQgKzI3MzMsNDUgQEAgdm9pZCBXZWJQYWdlUHJv eHk6OnJlY2VpdmVkUG9saWN5RGVjaXNpb24oV2ViUG9saWN5QWN0aW9uIGFjdGlvbiwgQVBJOjpO YXZpZ2F0aW8KICAgICBzZW5kZXItPnNlbmQoYWN0aW9uLCBuYXZpZ2F0aW9uID8gbmF2aWdhdGlv bi0+bmF2aWdhdGlvbklEKCkgOiAwLCBkb3dubG9hZElELCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2ll cykpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9j ZXNzKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRl ZFBhZ2VQcm94eT4mJiBzdXNwZW5kZWRQYWdlUHJveHksIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYg cHJvY2VzcywgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50LCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2ll cykKK3ZvaWQgV2ViUGFnZVByb3h5Ojpjb21taXRQcm92aXNpb25hbFBhZ2UodWludDY0X3QgZnJh bWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29s IGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBj b25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5mbywgYm9vbCBjb250 YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+ IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQogewot ICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImNvbnRpbnVlTmF2aWdhdGlvbklu TmV3UHJvY2Vzczogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5w cm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCk7Ci0gICAgTE9HKExvYWRpbmcsICJDb250aW51 aW5nIG5hdmlnYXRpb24gJSIgUFJJdTY0ICIgJyVzJyBpbiBhIG5ldyB3ZWIgcHJvY2VzcyIsIG5h dmlnYXRpb24ubmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24ubG9nZ2luZ1N0cmluZygpKTsKKyAg ICBBU1NFUlQobV9wcm92aXNpb25hbFBhZ2UpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQo TG9hZGluZywgImNvbW1pdFByb3Zpc2lvbmFsUGFnZTogcHJldmlvdXNQSUQgPSAlaSwgbmV3UElE ID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigp LCBtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2VzcygpLnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFn ZUlEKTsKIAotICAgIFJlZjxXZWJQcm9jZXNzUHJveHk+IHByZXZpb3VzUHJvY2VzcyA9IG1fcHJv Y2Vzcy5jb3B5UmVmKCk7CiAgICAgT3B0aW9uYWw8dWludDY0X3Q+IG1haW5GcmFtZUlESW5QcmV2 aW91c1Byb2Nlc3MgPSBtX21haW5GcmFtZSA/IG1ha2VPcHRpb25hbChtX21haW5GcmFtZS0+ZnJh bWVJRCgpKSA6IFdURjo6bnVsbG9wdDsKLSAgICBhdXRvIG1haW5GcmFtZVVSTCA9IG1fbWFpbkZy YW1lID8gbV9tYWluRnJhbWUtPnVybCgpIDogVVJMKCk7CiAKLSAgICBBU1NFUlQobV9wcm9jZXNz LnB0cigpICE9IHByb2Nlc3MucHRyKCkpOworICAgIEFTU0VSVChtX3Byb2Nlc3MucHRyKCkgIT0g Jm1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCkpOwogCiAgICAgcHJvY2Vzc0RpZFRlcm1pbmF0 ZShQcm9jZXNzVGVybWluYXRpb25SZWFzb246Ok5hdmlnYXRpb25Td2FwKTsKIAogICAgIG1fcHJv Y2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3Nh Z2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlSUQpOwotICAgIGJvb2wgZGlkU3VzcGVuZFByZXZpb3Vz UGFnZSA9IHN1c3BlbmRDdXJyZW50UGFnZUlmUG9zc2libGUobmF2aWdhdGlvbiwgbWFpbkZyYW1l SURJblByZXZpb3VzUHJvY2VzcywgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCk7CisgICAg YXV0byogbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRpb24obV9wcm92aXNp b25hbFBhZ2UtPm5hdmlnYXRpb25JRCgpKTsKKyAgICBib29sIGRpZFN1c3BlbmRQcmV2aW91c1Bh Z2UgPSBuYXZpZ2F0aW9uID8gc3VzcGVuZEN1cnJlbnRQYWdlSWZQb3NzaWJsZSgqbmF2aWdhdGlv biwgbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcywgbV9wcm92aXNpb25hbFBhZ2UtPnByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQoKSkgOiBmYWxzZTsKICAgICBtX3Byb2Nlc3MtPnJlbW92 ZVdlYlBhZ2UoKnRoaXMsIG1fcGFnZUlELCBXZWJQcm9jZXNzUHJveHk6OkVuZHNVc2luZ0RhdGFT dG9yZTo6Tm8pOwogCi0gICAgc3dhcFRvV2ViUHJvY2VzcyhXVEZNb3ZlKHByb2Nlc3MpLCBXVEZN b3ZlKHN1c3BlbmRlZFBhZ2VQcm94eSksIGRpZFN1c3BlbmRQcmV2aW91c1BhZ2UgPyBJc1N3YXBG cm9tU3VzcGVuZGVkOjpZZXMgOiBJc1N3YXBGcm9tU3VzcGVuZGVkOjpObyk7CisgICAgLy8gVGhl cmUgaXMgbm8gd2F5IHdlJ2xsIGJlIGFibGUgdG8gcmV0dXJuIHRvIHRoZSBwYWdlIGluIHRoZSBw cmV2aW91cyBwYWdlIHNvIGNsb3NlIGl0LgorICAgIGlmICghZGlkU3VzcGVuZFByZXZpb3VzUGFn ZSkKKyAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpDbG9zZSgpLCBw YWdlSUQoKSk7CisKKyAgICBzd2FwVG9XZWJQcm9jZXNzKG1fcHJvdmlzaW9uYWxQYWdlLT5wcm9j ZXNzKCksIG1fcHJvdmlzaW9uYWxQYWdlLT50YWtlRHJhd2luZ0FyZWEoKSwgbV9wcm92aXNpb25h bFBhZ2UtPm1haW5GcmFtZSgpKTsKKworICAgIGRpZENvbW1pdExvYWRGb3JGcmFtZShmcmFtZUlE LCBuYXZpZ2F0aW9uSUQsIG1pbWVUeXBlLCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwg ZnJhbWVMb2FkVHlwZSwgY2VydGlmaWNhdGVJbmZvLCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBm b3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIHVzZXJEYXRhKTsKKworICAgIG1fcHJvdmlzaW9uYWxQ YWdlID0gbnVsbHB0cjsKK30KKwordm9pZCBXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlv bkluTmV3UHJvY2VzcyhBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIHN0ZDo6dW5pcXVlX3B0 cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYgc3VzcGVuZGVkUGFnZVByb3h5LCBSZWY8V2ViUHJvY2Vz c1Byb3h5PiYmIG5ld1Byb2Nlc3MsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vz c1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3 ZWJzaXRlUG9saWNpZXMpCit7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAi Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIg UFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKKyAgICBM T0coTG9hZGluZywgIkNvbnRpbnVpbmcgbmF2aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMnIGluIGEg bmV3IHdlYiBwcm9jZXNzIiwgbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi5s b2dnaW5nU3RyaW5nKCkpOworCisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlKSB7CisgICAgICAg IGlmIChtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkgIT0gbmF2aWdhdGlvbi5uYXZp Z2F0aW9uSUQoKSkKKyAgICAgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5jYW5jZWwoKTsKKyAg ICAgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBudWxscHRyOworICAgIH0KKworICAgIG1fcHJvdmlz aW9uYWxQYWdlID0gc3RkOjptYWtlX3VuaXF1ZTxQcm92aXNpb25hbFBhZ2VQcm94eT4oKnRoaXMs IG5ld1Byb2Nlc3MuY29weVJlZigpLCBXVEZNb3ZlKHN1c3BlbmRlZFBhZ2VQcm94eSksIG5hdmln YXRpb24ubmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3RJc1JlZGlyZWN0 KCksIG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKSwgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNs aWVudCk7CiAKICAgICBpZiAoYXV0byogaXRlbSA9IG5hdmlnYXRpb24udGFyZ2V0SXRlbSgpKSB7 CiAgICAgICAgIExPRyhMb2FkaW5nLCAiV2ViUGFnZVByb3h5ICVwIGNvbnRpbnVlTmF2aWdhdGlv bkluTmV3UHJvY2VzcyB0byBiYWNrIGl0ZW0gVVJMICVzIiwgdGhpcywgaXRlbS0+dXJsKCkudXRm OCgpLmRhdGEoKSk7CkBAIC0yNzY4LDY3ICsyNzc5LDIyIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpj b250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9u LCBzCiAgICAgICAgIGF1dG8gdHJhbnNhY3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rp b24oKTsKICAgICAgICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKHRy YW5zYWN0aW9uLCBpdGVtLT51cmwoKSk7CiAKLSAgICAgICAgYXV0byBpdGVtU3RhdGVzID0gbV9i YWNrRm9yd2FyZExpc3QtPmZpbHRlcmVkSXRlbVN0YXRlcyhbdGhpcywgdGFyZ2V0SXRlbSA9IGl0 ZW1dKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mIGl0ZW0pIHsKLSAgICAgICAgICAgIGlmIChhdXRv KiBwYWdlID0gaXRlbS5zdXNwZW5kZWRQYWdlKCkpIHsKLSAgICAgICAgICAgICAgICBpZiAoJnBh Z2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpCi0gICAgICAgICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybiAmaXRlbSAhPSB0 YXJnZXRJdGVtOwotICAgICAgICB9KTsKLSAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlOjpVcGRhdGVCYWNrRm9yd2FyZExpc3RGb3JSZWF0dGFjaChXVEZNb3ZlKGl0ZW1T dGF0ZXMpKSwgbV9wYWdlSUQpOwotICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6Oldl YlBhZ2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0obmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgaXRl bS0+aXRlbUlEKCksICpuYXZpZ2F0aW9uLmJhY2tGb3J3YXJkRnJhbWVMb2FkVHlwZSgpLCBTaG91 bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKSwg bV9wYWdlSUQpOwotICAgICAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS5zdGFy dCgpOwotCisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5nb1RvQmFja0ZvcndhcmRJdGVtKG5h dmlnYXRpb24sICppdGVtLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOwogICAgICAgICByZXR1 cm47CiAgICAgfQogCiAgICAgaWYgKG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50SXRlbSgpICYm IChuYXZpZ2F0aW9uLmxvY2tCYWNrRm9yd2FyZExpc3QoKSA9PSBMb2NrQmFja0ZvcndhcmRMaXN0 OjpZZXMgfHwgbmF2aWdhdGlvbi5sb2NrSGlzdG9yeSgpID09IExvY2tIaXN0b3J5OjpZZXMpKSB7 CiAgICAgICAgIC8vIElmIFdlYkNvcmUgaXMgc3VwcG9zZWQgdG8gbG9jayB0aGUgaGlzdG9yeSBm b3IgdGhpcyBsb2FkLCB0aGVuIHRoZSBuZXcgcHJvY2VzcyBuZWVkcyB0byBrbm93IGFib3V0IHRo ZSBjdXJyZW50IGhpc3RvcnkgaXRlbSBzbyBpdCBjYW4gdXBkYXRlCiAgICAgICAgIC8vIGl0IGlu c3RlYWQgb2YgY3JlYXRpbmcgYSBuZXcgb25lLgotICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OlNldEN1cnJlbnRIaXN0b3J5SXRlbUZvclJlYXR0YWNoKG1fYmFja0Zv cndhcmRMaXN0LT5jdXJyZW50SXRlbSgpLT5pdGVtU3RhdGUoKSksIG1fcGFnZUlEKTsKKyAgICAg ICAgbmV3UHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0Q3VycmVudEhpc3RvcnlJ dGVtRm9yUmVhdHRhY2gobV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCktPml0ZW1TdGF0 ZSgpKSwgbV9wYWdlSUQpOwogICAgIH0KIAogICAgIC8vIEZJWE1FOiBXb3JrIG91dCB0aW1pbmcg b2YgcmVzcG9uZGluZyB3aXRoIHRoZSBsYXN0IHBvbGljeSBkZWxlZ2F0ZSwgZXRjCiAgICAgQVNT RVJUKCFuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCkuaXNFbXB0eSgpKTsKICAgICBpZiAoYXV0 byYgc3Vic3RpdHV0ZURhdGEgPSBuYXZpZ2F0aW9uLnN1YnN0aXR1dGVEYXRhKCkpCi0gICAgICAg IGxvYWREYXRhV2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgeyBzdWJzdGl0dXRlRGF0YS0+Y29u dGVudC5kYXRhKCksIHN1YnN0aXR1dGVEYXRhLT5jb250ZW50LnNpemUoKSB9LCBzdWJzdGl0dXRl RGF0YS0+TUlNRVR5cGUsIHN1YnN0aXR1dGVEYXRhLT5lbmNvZGluZywgc3Vic3RpdHV0ZURhdGEt PmJhc2VVUkwsIHN1YnN0aXR1dGVEYXRhLT51c2VyRGF0YS5nZXQoKSwgU2hvdWxkVHJlYXRBc0Nv bnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CisgICAgICAgIG1f cHJvdmlzaW9uYWxQYWdlLT5sb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIHsgc3Vi c3RpdHV0ZURhdGEtPmNvbnRlbnQuZGF0YSgpLCBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5zaXpl KCkgfSwgc3Vic3RpdHV0ZURhdGEtPk1JTUVUeXBlLCBzdWJzdGl0dXRlRGF0YS0+ZW5jb2Rpbmcs IHN1YnN0aXR1dGVEYXRhLT5iYXNlVVJMLCBzdWJzdGl0dXRlRGF0YS0+dXNlckRhdGEuZ2V0KCks IFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiAgICAgZWxzZQotICAgICAgICBsb2FkUmVxdWVz dFdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIFJlc291cmNlUmVxdWVzdCB7IG5hdmlnYXRpb24u Y3VycmVudFJlcXVlc3QoKSB9LCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5 OjpTaG91bGRBbGxvd0V4dGVybmFsU2NoZW1lcywgbnVsbHB0ciwgU2hvdWxkVHJlYXRBc0NvbnRp bnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Ci0KLSAgICBBU1NFUlQo IW1fbWFpbkZyYW1lKTsKLSAgICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlciA9IFt0aGlzLCB3 ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKSwgbmF2aWdhdGlvbklEID0gbmF2aWdhdGlvbi5u YXZpZ2F0aW9uSUQoKSwgcmVxdWVzdCA9ICBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCksIG1h aW5GcmFtZVVSTCwgaXNTZXJ2ZXJSZWRpcmVjdCA9IG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3RJ c1JlZGlyZWN0KCldKCkgbXV0YWJsZSB7Ci0gICAgICAgIGlmICghd2Vha1RoaXMpCi0gICAgICAg ICAgICByZXR1cm47Ci0KLSAgICAgICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKLSAgICAgICAgLy8g VGhpcyBuYXZpZ2F0aW9uIHdhcyBkZXN0cm95ZWQgc28gbm8gbmVlZCB0byBub3RpZnkgb2YgcmVk aXJlY3QuCi0gICAgICAgIGlmICghbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlvbihuYXZpZ2F0 aW9uSUQpKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIC8vIFJlc3RvcmUgdGhlIG1h aW4gZnJhbWUncyBjb21taXR0ZWQgVVJMIGFzIHNvbWUgY2xpZW50cyBtYXkgcmVseSBvbiBpdCB1 bnRpbCB0aGUgbmV4dCBsb2FkIGlzIGNvbW1pdHRlZC4KLSAgICAgICAgbV9tYWluRnJhbWUtPmZy YW1lTG9hZFN0YXRlKCkuc2V0VVJMKG1haW5GcmFtZVVSTCk7Ci0KLSAgICAgICAgLy8gTm9ybWFs bHksIG5vdGlmaWNhdGlvbiBvZiBhIHNlcnZlciByZWRpcmVjdCBjb21lcyBmcm9tIHRoZSBXZWJD b250ZW50IHByb2Nlc3MuCi0gICAgICAgIC8vIElmIHdlIGFyZSBwcm9jZXNzIHN3YXBwaW5nIGlu IHJlc3BvbnNlIHRvIGEgc2VydmVyIHJlZGlyZWN0IHRoZW4gdGhhdCBub3RpZmljYXRpb24gd2ls bCBub3QgY29tZSBmcm9tIHRoZSBuZXcgV2ViQ29udGVudCBwcm9jZXNzLgotICAgICAgICAvLyBJ biB0aGlzIGNhc2Ugd2UgaGF2ZSB0aGUgVUlQcm9jZXNzIHN5bnRoZXNpemUgdGhlIHJlZGlyZWN0 IG5vdGlmaWNhdGlvbiBhdCB0aGUgYXBwcm9wcmlhdGUgdGltZS4KLSAgICAgICAgaWYgKGlzU2Vy dmVyUmVkaXJlY3QpIHsKLSAgICAgICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgp LmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKHJlcXVlc3QudXJsKCkpOwotICAgICAgICAgICAgZGlk UmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUobV9tYWluRnJh bWUtPmZyYW1lSUQoKSwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKHJlcXVlc3QpLCB7IH0pOwotICAg ICAgICB9Ci0gICAgfTsKLQotICAgIGlmICghbV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgpLmNvbmZp Z3VyYXRpb24oKS5wcm9jZXNzU3dhcHNPbldpbmRvd09wZW5XaXRoT3BlbmVyKCkgfHwgIWlzUGFn ZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgfHwgIW1haW5GcmFtZUlE SW5QcmV2aW91c1Byb2Nlc3MpIHsKLSAgICAgICAgLy8gVGhlcmUgaXMgbm8gd2F5IHdlJ2xsIGJl IGFibGUgdG8gcmV0dXJuIHRvIHRoZSBwYWdlIGluIHRoZSBwcmV2aW91cyBwYWdlIHNvIGNsb3Nl IGl0LgotICAgICAgICBpZiAoIWRpZFN1c3BlbmRQcmV2aW91c1BhZ2UpCi0gICAgICAgICAgICBw cmV2aW91c1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNsb3NlKCksIG1fcGFnZUlE KTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIG1fbWFpbkZyYW1lV2luZG93Q3JlYXRp b25IYW5kbGVyID0gW3RoaXMsIHByZXZpb3VzUHJvY2VzcyA9IFdURk1vdmUocHJldmlvdXNQcm9j ZXNzKSwgbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcyA9ICptYWluRnJhbWVJREluUHJldmlv dXNQcm9jZXNzXShjb25zdCBHbG9iYWxXaW5kb3dJZGVudGlmaWVyJiB3aW5kb3dJZGVudGlmaWVy KSB7Ci0gICAgICAgIEFTU0VSVChtX21haW5GcmFtZSk7Ci0gICAgICAgIEdsb2JhbEZyYW1lSWRl bnRpZmllciBuYXZpZ2F0ZWRGcmFtZUlkZW50aWZpZXJJbk5ld1Byb2Nlc3MgeyBwYWdlSUQoKSwg bV9tYWluRnJhbWUtPmZyYW1lSUQoKSB9OwotICAgICAgICBwcmV2aW91c1Byb2Nlc3MtPnNlbmQo TWVzc2FnZXM6OldlYlBhZ2U6OkZyYW1lQmVjYW1lUmVtb3RlKG1haW5GcmFtZUlESW5QcmV2aW91 c1Byb2Nlc3MsIG5hdmlnYXRlZEZyYW1lSWRlbnRpZmllckluTmV3UHJvY2Vzcywgd2luZG93SWRl bnRpZmllciksIHBhZ2VJRCgpKTsKLSAgICB9OworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZS0+ bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCBSZXNvdXJjZVJlcXVlc3QgeyBu YXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCkgfSwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFs VVJMc1BvbGljeTo6U2hvdWxkQWxsb3dFeHRlcm5hbFNjaGVtZXMsIG51bGxwdHIsIFdURk1vdmUo d2Vic2l0ZVBvbGljaWVzKSk7CiB9CiAKIGJvb2wgV2ViUGFnZVByb3h5Ojppc1BhZ2VPcGVuZWRC eURPTVNob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpIGNvbnN0CkBAIC0zNjkzLDExICszNjU5 LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZU1haW5GcmFtZSh1aW50NjRfdCBmcmFt ZUlEKQogCiAgICAgLy8gQWRkIHRoZSBmcmFtZSB0byB0aGUgcHJvY2VzcyB3aWRlIG1hcC4KICAg ICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChmcmFtZUlELCAqbV9tYWluRnJhbWUpOwotCi0gICAg aWYgKG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyKSB7Ci0gICAgICAgIG1fbWFpbkZyYW1lQ3Jl YXRpb25IYW5kbGVyKCk7Ci0gICAgICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyID0gbnVs bHB0cjsKLSAgICB9CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVTdWJmcmFtZSh1 aW50NjRfdCBmcmFtZUlEKQpAQCAtMzcyMiwxMCArMzY4Myw2IEBAIHZvaWQgV2ViUGFnZVByb3h5 OjpkaWRDcmVhdGVTdWJmcmFtZSh1aW50NjRfdCBmcmFtZUlEKQogCiB2b2lkIFdlYlBhZ2VQcm94 eTo6ZGlkQ3JlYXRlV2luZG93KHVpbnQ2NF90IGZyYW1lSUQsIEdsb2JhbFdpbmRvd0lkZW50aWZp ZXImJiB3aW5kb3dJZGVudGlmaWVyKQogewotICAgIGlmIChtX21haW5GcmFtZSAmJiBtX21haW5G cmFtZS0+ZnJhbWVJRCgpID09IGZyYW1lSUQpIHsKLSAgICAgICAgaWYgKGF1dG8gbWFpbkZyYW1l V2luZG93Q3JlYXRpb25IYW5kbGVyID0gV1RGTW92ZShtX21haW5GcmFtZVdpbmRvd0NyZWF0aW9u SGFuZGxlcikpCi0gICAgICAgICAgICBtYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIod2lu ZG93SWRlbnRpZmllcik7Ci0gICAgfQogfQogCiBkb3VibGUgV2ViUGFnZVByb3h5Ojplc3RpbWF0 ZWRQcm9ncmVzcygpIGNvbnN0CkBAIC0zNzc4LDYgKzM3MzUsMTAgQEAgdm9pZCBXZWJQYWdlUHJv eHk6OmRpZERlc3Ryb3lOYXZpZ2F0aW9uKHVpbnQ2NF90IG5hdmlnYXRpb25JRCkKIHsKICAgICBQ YWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCisgICAgLy8gT24g cHJvY2Vzcy1zd2FwLCB0aGUgcHJldmlvdXMgcHJvY2VzcyB0cmllcyB0byBkZXN0cm95IHRoZSBu YXZpZ2F0aW9uIGJ1dCB0aGUgcHJvdmlzaW9uYWwgcHJvY2VzcyBpcyBhY3R1YWxseSB0YWtpbmcg b3ZlciB0aGUgbmF2aWdhdGlvbi4KKyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UgJiYgbV9wcm92 aXNpb25hbFBhZ2UtPm5hdmlnYXRpb25JRCgpID09IG5hdmlnYXRpb25JRCkKKyAgICAgICAgcmV0 dXJuOworCiAgICAgLy8gRklYTUU6IE1lc3NhZ2UgY2hlY2sgdGhlIG5hdmlnYXRpb25JRC4KICAg ICBtX25hdmlnYXRpb25TdGF0ZS0+ZGlkRGVzdHJveU5hdmlnYXRpb24obmF2aWdhdGlvbklEKTsK IH0KQEAgLTM3OTUsMTQgKzM3NTYsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92 aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYQogICAgIGlm IChmcmFtZS0+aXNNYWluRnJhbWUoKSAmJiBuYXZpZ2F0aW9uSUQpCiAgICAgICAgIG5hdmlnYXRp b24gPSBuYXZpZ2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCk7CiAKLSAgICAv LyBJZiB0aGlzIHNlZW1pbmdseSBuZXcgbG9hZCBpcyBhY3R1YWxseSBjb250aW51aW5nIGEgc2Vy dmVyIHJlZGlyZWN0IGZvciBhIHByZXZpb3VzIG5hdmlnYXRpb24gaW4gYSBuZXcgcHJvY2VzcywK LSAgICAvLyB0aGVuIHdlIGlnbm9yZSB0aGlzIG5vdGlmaWNhdGlvbi4KLSAgICBpZiAobmF2aWdh dGlvbiAmJiBuYXZpZ2F0aW9uLT5jdXJyZW50UmVxdWVzdElzUmVkaXJlY3QoKSkgewotICAgICAg ICBhdXRvIG5hdmlnYXRpb25Qcm9jZXNzSWRlbnRpZmllciA9IG5hdmlnYXRpb24tPmN1cnJlbnRS ZXF1ZXN0UHJvY2Vzc0lkZW50aWZpZXIoKTsKLSAgICAgICAgaWYgKG5hdmlnYXRpb25Qcm9jZXNz SWRlbnRpZmllciAmJiAqbmF2aWdhdGlvblByb2Nlc3NJZGVudGlmaWVyICE9IG1fcHJvY2Vzcy0+ Y29yZVByb2Nlc3NJZGVudGlmaWVyKCkpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgfQotCiAg ICAgTE9HKExvYWRpbmcsICJXZWJQYWdlUHJveHkgJSIgUFJJdTY0ICIgaW4gcHJvY2VzcyBwaWQg JWkgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSB0byBmcmFtZUlEICUiIFBSSXU2NCAi LCBuYXZpZ2F0aW9uSUQgJSIgUFJJdTY0ICIsIHVybCAlcyIsIG1fcGFnZUlELCBtX3Byb2Nlc3Mt PnByb2Nlc3NJZGVudGlmaWVyKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgdXJsLnN0cmluZygp LnV0ZjgoKS5kYXRhKCkpOwogICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImRp ZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQ Ukl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmll cigpLCBtX3BhZ2VJRCwgZnJhbWVJRCk7CiAKQEAgLTM5MTAsNiArMzg2MywxMSBAQCB2b2lkIFdl YlBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1l SUQsIGNvbnN0IFNlY3VyaQogCiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90ZWN0b3IocGFn ZUNsaWVudCgpKTsKIAorICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZSAmJiBtX3Byb3Zpc2lvbmFs UGFnZS0+bmF2aWdhdGlvbklEKCkgPT0gbmF2aWdhdGlvbklEICYmICZtX3Byb3Zpc2lvbmFsUGFn ZS0+cHJvY2VzcygpICE9IG1fcHJvY2Vzcy5wdHIoKSkgeworICAgICAgICAvLyBUaGUgbG9hZCBk aWQgbm90IGZhaWwsIGl0IG1lcmVseSBoYXBwZW5pbmcgaW4gYSBuZXcgcHJvdmlzaW9uYWwgcHJv Y2Vzcy4KKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1l ID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKICAgICBNRVNTQUdFX0NIRUNLKGZyYW1l KTsKIApAQCAtMzk0OCw2ICszOTA2LDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGYWlsUHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2VjdXJpCiAgICAg fQogCiAgICAgbV9mYWlsaW5nUHJvdmlzaW9uYWxMb2FkVVJMID0geyB9OworCisgICAgLy8gSWYg dGhlIHByb3Zpc2lvbmFsIHBhZ2UncyBsb2FkIGZhaWxzIHRoZW4gd2UgZGVzdHJveSB0aGUgcHJv dmlzaW9uYWwgcGFnZS4KKyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UgJiYgbV9wcm92aXNpb25h bFBhZ2UtPm1haW5GcmFtZSgpID09IGZyYW1lKQorICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9 IG51bGxwdHI7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpjbGVhckxvYWREZXBlbmRlbnRDYWxs YmFja3MoKQpAQCAtNDMzOSw4ICs0MzAxLDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBv bGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYyh1aW50NjRfdCBmcmFtZUlELCBXZWJDb3IKICAg ICBhdXRvKiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7CiAgICAgTUVTU0FH RV9DSEVDSyhmcmFtZSk7CiAKLSAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKCpm cmFtZSwgV1RGTW92ZShmcmFtZVNlY3VyaXR5T3JpZ2luKSwgbmF2aWdhdGlvbklELCBXVEZNb3Zl KG5hdmlnYXRpb25BY3Rpb25EYXRhKSwgV1RGTW92ZShmcmFtZUluZm9EYXRhKSwgb3JpZ2luYXRp bmdQYWdlSUQsIG9yaWdpbmFsUmVxdWVzdCwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShyZXF1 ZXN0Qm9keSksIFdURk1vdmUocmVkaXJlY3RSZXNwb25zZSksIHVzZXJEYXRhLCBQb2xpY3lEZWNp c2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyks IGZyYW1lSUQsIGxpc3RlbmVySURdIChhdXRvLi4uIGFyZ3MpIHsKLSAgICAgICAgbV9wcm9jZXNz LT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRSZWNlaXZlUG9saWN5RGVjaXNpb24oZnJhbWVJ RCwgbGlzdGVuZXJJRCwgYXJncy4uLiksIG1fcGFnZUlEKTsKKyAgICBkZWNpZGVQb2xpY3lGb3JO YXZpZ2F0aW9uQWN0aW9uKCpmcmFtZSwgV1RGTW92ZShmcmFtZVNlY3VyaXR5T3JpZ2luKSwgbmF2 aWdhdGlvbklELCBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb25EYXRhKSwgV1RGTW92ZShmcmFtZUlu Zm9EYXRhKSwgb3JpZ2luYXRpbmdQYWdlSUQsIG9yaWdpbmFsUmVxdWVzdCwgV1RGTW92ZShyZXF1 ZXN0KSwgV1RGTW92ZShyZXF1ZXN0Qm9keSksIFdURk1vdmUocmVkaXJlY3RSZXNwb25zZSksIHVz ZXJEYXRhLCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlz ID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIHByb2Nlc3MgPSBtX3Byb2Nl c3MuY29weVJlZigpXSAoYXV0by4uLiBhcmdzKSB7CisgICAgICAgIHByb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5l cklELCBhcmdzLi4uKSwgbV9wYWdlSUQpOwogICAgIH0pKTsKIH0KIApAQCAtNDU3NCwxMiArNDUz NiwxMiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UodWludDY0 X3QgZnJhbWVJRCwgY29uc3QgU2VjdXJpdHlPcmlnaQogICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHJl c3BvbnNlLnVybCgpKTsKIAogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IG5hdmlnYXRpb24g PSBuYXZpZ2F0aW9uSUQgPyBtX25hdmlnYXRpb25TdGF0ZS0+bmF2aWdhdGlvbihuYXZpZ2F0aW9u SUQpIDogbnVsbHB0cjsKLSAgICBhdXRvIGxpc3RlbmVyID0gbWFrZVJlZihmcmFtZS0+c2V0VXBQ b2xpY3lMaXN0ZW5lclByb3h5KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyks IGZyYW1lSUQsIGxpc3RlbmVySUQsIG5hdmlnYXRpb24gPSBXVEZNb3ZlKG5hdmlnYXRpb24pXSAo V2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbiwgQVBJOjpXZWJzaXRlUG9saWNpZXMqLCBQcm9j ZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFJl ZlB0cjxTYWZlQnJvd3NpbmdXYXJuaW5nPiYmIHNhZmVCcm93c2luZ1dhcm5pbmcpIG11dGFibGUg eworICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtlUmVmKGZyYW1lLT5zZXRVcFBvbGljeUxpc3RlbmVy UHJveHkoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlz dGVuZXJJRCwgbmF2aWdhdGlvbiA9IFdURk1vdmUobmF2aWdhdGlvbiksIHByb2Nlc3MgPSBtX3By b2Nlc3MuY29weVJlZigpXSAoV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbiwgQVBJOjpXZWJz aXRlUG9saWNpZXMqLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVx dWVzdGVkQnlDbGllbnQsIFJlZlB0cjxTYWZlQnJvd3NpbmdXYXJuaW5nPiYmIHNhZmVCcm93c2lu Z1dhcm5pbmcpIG11dGFibGUgewogICAgICAgICAvLyBGSVhNRTogQXNzZXJ0IHRoZSBBUEk6Oldl YnNpdGVQb2xpY2llcyogaXMgbnVsbHB0ciBoZXJlIG9uY2UgY2xpZW50cyBvZiBXS0ZyYW1lUG9s aWN5TGlzdGVuZXJVc2VXaXRoUG9saWNpZXMgZ28gYXdheS4KICAgICAgICAgUkVMRUFTRV9BU1NF UlQocHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCA9PSBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5 Q2xpZW50OjpObyk7CiAgICAgICAgIEFTU0VSVF9VTlVTRUQoc2FmZUJyb3dzaW5nV2FybmluZywg IXNhZmVCcm93c2luZ1dhcm5pbmcpOwotICAgICAgICByZWNlaXZlZFBvbGljeURlY2lzaW9uKHBv bGljeUFjdGlvbiwgbmF2aWdhdGlvbi5nZXQoKSwgV1RGOjpudWxsb3B0LCBQb2xpY3lEZWNpc2lv blNlbmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRU aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRF0gKGF1dG8uLi4gYXJncykgewotICAgICAgICAgICAg bV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRSZWNlaXZlUG9saWN5RGVjaXNp b24oZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJncy4uLiksIG1fcGFnZUlEKTsKKyAgICAgICAgcmVj ZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24sIG5hdmlnYXRpb24uZ2V0KCksIFdURjo6 bnVsbG9wdCwgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShbdGhpcywgcHJvdGVjdGVkVGhp cyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIHByb2Nlc3Mg PSBXVEZNb3ZlKHByb2Nlc3MpXSAoYXV0by4uLiBhcmdzKSB7CisgICAgICAgICAgICBwcm9jZXNz LT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRSZWNlaXZlUG9saWN5RGVjaXNpb24oZnJhbWVJ RCwgbGlzdGVuZXJJRCwgYXJncy4uLiksIG1fcGFnZUlEKTsKICAgICAgICAgfSkpOwogICAgIH0s IFNob3VsZEV4cGVjdFNhZmVCcm93c2luZ1Jlc3VsdDo6Tm8pKTsKIApAQCAtNjQ4Niw4ICs2NDQ4 LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnByb2Nlc3NXaWxsQmVjb21lRm9yZWdyb3VuZCgpCiB2 b2lkIFdlYlBhZ2VQcm94eTo6cmVzZXRTdGF0ZShSZXNldFN0YXRlUmVhc29uIHJlc2V0U3RhdGVS ZWFzb24pCiB7CiAgICAgbV9tYWluRnJhbWUgPSBudWxscHRyOwotICAgIG1fbWFpbkZyYW1lQ3Jl YXRpb25IYW5kbGVyID0gbnVsbHB0cjsKLSAgICBtX21haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFu ZGxlciA9IG51bGxwdHI7CiAKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBtX3Njcm9sbGluZ1Bl cmZvcm1hbmNlRGF0YSA9IG51bGxwdHI7CkBAIC02Nzc4LDYgKzY3MzgsMTAgQEAgV2ViUGFnZUNy ZWF0aW9uUGFyYW1ldGVycyBXZWJQYWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycygpCiAgICAg cGFyYW1ldGVycy5hcHBsaWNhdGlvbk1hbmlmZXN0ID0gbV9jb25maWd1cmF0aW9uLT5hcHBsaWNh dGlvbk1hbmlmZXN0KCkgPyBPcHRpb25hbDxXZWJDb3JlOjpBcHBsaWNhdGlvbk1hbmlmZXN0Piht X2NvbmZpZ3VyYXRpb24tPmFwcGxpY2F0aW9uTWFuaWZlc3QoKS0+YXBwbGljYXRpb25NYW5pZmVz dCgpKSA6IFdURjo6bnVsbG9wdDsKICNlbmRpZgogCisjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VS KQorICAgIHBhcmFtZXRlcnMuaGFzUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXJzID0gcHJvY2Vzcygp LnByb2Nlc3NQb29sKCkubWF5SGF2ZVJlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyhtX3dlYnNpdGVE YXRhU3RvcmUpOworI2VuZGlmCisKICAgICBwYXJhbWV0ZXJzLm5lZWRzRm9udEF0dHJpYnV0ZXMg PSBtX25lZWRzRm9udEF0dHJpYnV0ZXM7CiAKICAgICBtX3Byb2Nlc3MtPmFkZFdlYlVzZXJDb250 ZW50Q29udHJvbGxlclByb3h5KG1fdXNlckNvbnRlbnRDb250cm9sbGVyLCBwYXJhbWV0ZXJzKTsK QEAgLTg1MzksNiArODUwMywyMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2ltdWxhdGVEZXZpY2VP cmllbnRhdGlvbkNoYW5nZShkb3VibGUgYWxwaGEsIGRvdWJsZSBiZXRhLCBkbwogICAgIG1fcHJv Y2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2ltdWxhdGVEZXZpY2VPcmllbnRhdGlvbkNo YW5nZShhbHBoYSwgYmV0YSwgZ2FtbWEpLCBtX3BhZ2VJRCk7CiB9CiAKK1dlYlBhZ2VQcm94eTo6 UGFnZVByb2Nlc3NPdmVycmlkZTo6UGFnZVByb2Nlc3NPdmVycmlkZShXZWJQYWdlUHJveHkmIHBh Z2UsIFdlYlByb2Nlc3NQcm94eSYgbmV3UHJvY2VzcykKKyAgICA6IG1fcGFnZSgmcGFnZSkKKyAg ICAsIG1fcHJldmlvdXNQcm9jZXNzKHBhZ2UucHJvY2VzcygpKQoreworICAgIHBhZ2UubV9wcm9j ZXNzID0gbmV3UHJvY2VzczsKK30KKworV2ViUGFnZVByb3h5OjpQYWdlUHJvY2Vzc092ZXJyaWRl OjpQYWdlUHJvY2Vzc092ZXJyaWRlKFBhZ2VQcm9jZXNzT3ZlcnJpZGUmJikgPSBkZWZhdWx0Owor CitXZWJQYWdlUHJveHk6OlBhZ2VQcm9jZXNzT3ZlcnJpZGU6On5QYWdlUHJvY2Vzc092ZXJyaWRl KCkKK3sKKyAgICBpZiAobV9wYWdlKQorICAgICAgICBtX3BhZ2UtPm1fcHJvY2VzcyA9IFdURk1v dmUobV9wcmV2aW91c1Byb2Nlc3MpOworfQorCiAjaWYgRU5BQkxFKERBVEFfREVURUNUSU9OKQog CiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGV0ZWN0RGF0YUluQWxsRnJhbWVzKFdlYkNvcmU6OkRhdGFE ZXRlY3RvclR5cGVzIHR5cGVzLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IERhdGFEZXRl Y3Rpb25SZXN1bHQmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmgKaW5kZXggY2Q4MDFiODA4YzQuLmM2NjZmZGI2ZmIwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMjI1LDYgKzIyNSw3IEBAIGNsYXNzIE5h dGl2ZVdlYktleWJvYXJkRXZlbnQ7CiBjbGFzcyBOYXRpdmVXZWJNb3VzZUV2ZW50OwogY2xhc3Mg TmF0aXZlV2ViV2hlZWxFdmVudDsKIGNsYXNzIFBhZ2VDbGllbnQ7CitjbGFzcyBQcm92aXNpb25h bFBhZ2VQcm94eTsKIGNsYXNzIFJlbW90ZUxheWVyVHJlZUhvc3Q7CiBjbGFzcyBSZW1vdGVMYXll clRyZWVTY3JvbGxpbmdQZXJmb3JtYW5jZURhdGE7CiBjbGFzcyBSZW1vdGVMYXllclRyZWVUcmFu c2FjdGlvbjsKQEAgLTQ1OCw4ICs0NTksNyBAQCBwdWJsaWM6CiAgICAgQVBJOjpJY29uTG9hZGlu Z0NsaWVudCYgaWNvbkxvYWRpbmdDbGllbnQoKSB7IHJldHVybiAqbV9pY29uTG9hZGluZ0NsaWVu dDsgfQogICAgIHZvaWQgc2V0SWNvbkxvYWRpbmdDbGllbnQoc3RkOjp1bmlxdWVfcHRyPEFQSTo6 SWNvbkxvYWRpbmdDbGllbnQ+JiYpOwogCi0gICAgZW51bSBjbGFzcyBJc1N3YXBGcm9tU3VzcGVu ZGVkIHsgTm8sIFllcyB9OwotICAgIHZvaWQgaW5pdGlhbGl6ZVdlYlBhZ2UoSXNTd2FwRnJvbVN1 c3BlbmRlZCA9IElzU3dhcEZyb21TdXNwZW5kZWQ6Ok5vKTsKKyAgICB2b2lkIGluaXRpYWxpemVX ZWJQYWdlKCk7CiAKICAgICBXZWFrUHRyPFNlY0tleVByb3h5U3RvcmU+IHNlY0tleVByb3h5U3Rv cmUoY29uc3QgV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2UmKTsKICAgICAgICAgCkBA IC0xMDI1LDYgKzEwMjUsMTkgQEAgcHVibGljOgogICAgIFdlYlByb2Nlc3NQcm94eSYgcHJvY2Vz cygpIHsgcmV0dXJuIG1fcHJvY2VzczsgfQogICAgIFByb2Nlc3NJRCBwcm9jZXNzSWRlbnRpZmll cigpIGNvbnN0OwogCisgICAgY2xhc3MgUGFnZVByb2Nlc3NPdmVycmlkZSB7CisgICAgcHVibGlj OgorICAgICAgICBQYWdlUHJvY2Vzc092ZXJyaWRlKFdlYlBhZ2VQcm94eSYsIFdlYlByb2Nlc3NQ cm94eSYgbmV3UHJvY2Vzcyk7CisgICAgICAgIFBhZ2VQcm9jZXNzT3ZlcnJpZGUoUGFnZVByb2Nl c3NPdmVycmlkZSYmKTsKKyAgICAgICAgflBhZ2VQcm9jZXNzT3ZlcnJpZGUoKTsKKworICAgIHBy aXZhdGU6CisgICAgICAgIFJlZlB0cjxXZWJQYWdlUHJveHk+IG1fcGFnZTsKKyAgICAgICAgUmVm PFdlYlByb2Nlc3NQcm94eT4gbV9wcmV2aW91c1Byb2Nlc3M7CisgICAgfTsKKworICAgIFBhZ2VQ cm9jZXNzT3ZlcnJpZGUgdGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MoV2ViUHJvY2Vzc1Byb3h5 JiBuZXdQcm9jZXNzKSB7IHJldHVybiBQYWdlUHJvY2Vzc092ZXJyaWRlKCp0aGlzLCBuZXdQcm9j ZXNzKTsgfQorCiAgICAgV2ViUHJlZmVyZW5jZXMmIHByZWZlcmVuY2VzKCkgeyByZXR1cm4gbV9w cmVmZXJlbmNlczsgfQogICAgIHZvaWQgc2V0UHJlZmVyZW5jZXMoV2ViUHJlZmVyZW5jZXMmKTsK IApAQCAtMTQxNCw2ICsxNDI3LDIxIEBAIHB1YmxpYzoKICAgICBFZGl0YWJsZUltYWdlQ29udHJv bGxlciYgZWRpdGFibGVJbWFnZUNvbnRyb2xsZXIoKSB7IHJldHVybiAqbV9lZGl0YWJsZUltYWdl Q29udHJvbGxlcjsgfQogI2VuZGlmCiAKKyAgICBQcm92aXNpb25hbFBhZ2VQcm94eSogcHJvdmlz aW9uYWxQYWdlUHJveHkoKSBjb25zdCB7IHJldHVybiBtX3Byb3Zpc2lvbmFsUGFnZS5nZXQoKTsg fQorICAgIHZvaWQgY29tbWl0UHJvdmlzaW9uYWxQYWdlKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2 NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1 c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29y ZTo6Q2VydGlmaWNhdGVJbmZvJiwgYm9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25h bDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwg Y29uc3QgVXNlckRhdGEmKTsKKworICAgIHZvaWQgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JG cmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmLCBVUkwm JiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2b2lkIGRpZEZhaWxQcm92 aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1 cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25J RCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VF cnJvciYsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRSZWNlaXZlU2VydmVyUmVkaXJl Y3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBu YXZpZ2F0aW9uSUQsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBjb25zdCBVc2VyRGF0YSYp OworCisgICAgdm9pZCBsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYsIGNv bnN0IElQQzo6RGF0YVJlZmVyZW5jZSYsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0 cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJE YXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIE9wdGlvbmFsPFdlYnNp dGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOworICAgIHZvaWQgbG9hZFJlcXVlc3RX aXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Qm JiwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgQVBJOjpPYmplY3QqIHVz ZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIE9wdGlvbmFsPFdl YnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOworCisgICAgLy8gSVBDOjpNZXNz YWdlUmVjZWl2ZXIKKyAgICAvLyBJbXBsZW1lbnRlZCBpbiBnZW5lcmF0ZWQgV2ViUGFnZVByb3h5 TWVzc2FnZVJlY2VpdmVyLmNwcAorICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25u ZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgb3ZlcnJpZGU7CisgICAgdm9pZCBkaWRSZWNlaXZlU3lu Y01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJiwgc3RkOjp1bmlxdWVfcHRy PElQQzo6RW5jb2Rlcj4mKSBvdmVycmlkZTsKKwogcHJpdmF0ZToKICAgICBXZWJQYWdlUHJveHko UGFnZUNsaWVudCYsIFdlYlByb2Nlc3NQcm94eSYsIHVpbnQ2NF90IHBhZ2VJRCwgUmVmPEFQSTo6 UGFnZUNvbmZpZ3VyYXRpb24+JiYpOwogICAgIHZvaWQgcGxhdGZvcm1Jbml0aWFsaXplKCk7CkBA IC0xNDM4LDEyICsxNDY2LDYgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgc2V0VXNlckFnZW50KFN0 cmluZyYmKTsKIAotICAgIC8vIElQQzo6TWVzc2FnZVJlY2VpdmVyCi0gICAgLy8gSW1wbGVtZW50 ZWQgaW4gZ2VuZXJhdGVkIFdlYlBhZ2VQcm94eU1lc3NhZ2VSZWNlaXZlci5jcHAKLSAgICB2b2lk IGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIG92ZXJy aWRlOwotICAgIHZvaWQgZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQ Qzo6RGVjb2RlciYsIHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+Jikgb3ZlcnJpZGU7Ci0K LQogICAgIC8vIElQQzo6TWVzc2FnZVNlbmRlcgogICAgIGJvb2wgc2VuZE1lc3NhZ2Uoc3RkOjp1 bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4sIE9wdGlvblNldDxJUEM6OlNlbmRPcHRpb24+KSBvdmVy cmlkZTsKICAgICBJUEM6OkNvbm5lY3Rpb24qIG1lc3NhZ2VTZW5kZXJDb25uZWN0aW9uKCkgb3Zl cnJpZGU7CkBAIC0xNDY1LDEyICsxNDg3LDkgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZENyZWF0 ZVN1YmZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpOwogICAgIHZvaWQgZGlkQ3JlYXRlV2luZG93KHVp bnQ2NF90IGZyYW1lSUQsIFdlYkNvcmU6Okdsb2JhbFdpbmRvd0lkZW50aWZpZXImJik7CiAKLSAg ICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwg dWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiwgVVJMJiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0 IFVzZXJEYXRhJik7Ci0gICAgdm9pZCBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNp b25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQs IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQg d2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0 IFN0cmluZyYgdXJsLCBkb3VibGUgZGVsYXksIFdlYkNvcmU6OkxvY2tCYWNrRm9yd2FyZExpc3Qp OwogICAgIHZvaWQgZGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3RGb3JGcmFtZSh1aW50NjRfdCBmcmFt ZUlEKTsKICAgICB2b2lkIGRpZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWUodWludDY0X3Qg ZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJik7Ci0gICAgdm9pZCBkaWRGYWls UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6 U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0 aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNvcmU6OlJlc291 cmNlRXJyb3ImLCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkQ29tbWl0TG9hZEZvckZy YW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5n JiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3Qg ZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiwgYm9vbCBjb250 YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+ IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2b2lkIGRp ZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5h dmlnYXRpb25JRCwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2b2lkIGRpZEZpbmlzaExvYWRGb3JG cmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFVzZXJE YXRhJik7CkBAIC0xNTc0LDE4ICsxNTkzLDE1IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRDYW5T aG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMoYm9vbCBjYW5TaG9ydENpcmN1aXRIb3Jp em9udGFsV2hlZWxFdmVudHMpIHsgbV9jYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVu dHMgPSBjYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHM7IH0KIAogICAgIHZvaWQg cmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsKLSAgICB2b2lkIHN3YXBUb1dlYlByb2Nlc3MoUmVmPFdl YlByb2Nlc3NQcm94eT4mJiwgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiwg SXNTd2FwRnJvbVN1c3BlbmRlZCk7CisgICAgdm9pZCBzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQ cm9jZXNzUHJveHk+JiYsIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmLCBSZWZQ dHI8V2ViRnJhbWVQcm94eT4mJiBtYWluRnJhbWUpOwogICAgIHZvaWQgZGlkRmFpbFRvU3VzcGVu ZEFmdGVyUHJvY2Vzc1N3YXAoKTsKICAgICB2b2lkIGRpZFN1c3BlbmRBZnRlclByb2Nlc3NTd2Fw KCk7CiAKLSAgICB2b2lkIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhJc1N3YXBGcm9tU3Vz cGVuZGVkID0gSXNTd2FwRnJvbVN1c3BlbmRlZDo6Tm8pOworICAgIHZvaWQgZmluaXNoQXR0YWNo aW5nVG9XZWJQcm9jZXNzKCk7CiAKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiByZWF0dGFj aFRvV2ViUHJvY2Vzc0ZvclJlbG9hZCgpOwogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IHJl YXR0YWNoVG9XZWJQcm9jZXNzV2l0aEl0ZW0oV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYpOwogCi0g ICAgdm9pZCBsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYsIGNvbnN0IElQ Qzo6RGF0YVJlZmVyZW5jZSYsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYg ZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBX ZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIE9wdGlvbmFsPFdlYnNpdGVQb2xp Y2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOwotICAgIHZvaWQgbG9hZFJlcXVlc3RXaXRoTmF2 aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgV2Vi Q29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgQVBJOjpPYmplY3QqIHVzZXJEYXRh LCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIE9wdGlvbmFsPFdlYnNpdGVQ b2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOwotCiAgICAgdm9pZCByZXF1ZXN0Tm90aWZp Y2F0aW9uUGVybWlzc2lvbih1aW50NjRfdCBub3RpZmljYXRpb25JRCwgY29uc3QgU3RyaW5nJiBv cmlnaW5TdHJpbmcpOwogICAgIHZvaWQgc2hvd05vdGlmaWNhdGlvbihjb25zdCBTdHJpbmcmIHRp dGxlLCBjb25zdCBTdHJpbmcmIGJvZHksIGNvbnN0IFN0cmluZyYgaWNvblVSTCwgY29uc3QgU3Ry aW5nJiB0YWcsIGNvbnN0IFN0cmluZyYgbGFuZywgV2ViQ29yZTo6Tm90aWZpY2F0aW9uRGlyZWN0 aW9uLCBjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZywgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQp OwogICAgIHZvaWQgY2FuY2VsTm90aWZpY2F0aW9uKHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsK QEAgLTE5NTEsOCArMTk2Nyw2IEBAIHByaXZhdGU6CiAgICAgUmVmPFdlYnNpdGVEYXRhU3RvcmU+ IG1fd2Vic2l0ZURhdGFTdG9yZTsKIAogICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5PiBtX21haW5G cmFtZTsKLSAgICBGdW5jdGlvbjx2b2lkKCk+IG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyOwot ICAgIEZ1bmN0aW9uPHZvaWQoY29uc3QgV2ViQ29yZTo6R2xvYmFsV2luZG93SWRlbnRpZmllciYp PiBtX21haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlcjsKIAogICAgIFJlZlB0cjxXZWJGcmFt ZVByb3h5PiBtX2ZvY3VzZWRGcmFtZTsKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9mcmFt ZVNldExhcmdlc3RGcmFtZTsKQEAgLTIzMjIsNiArMjMzNiw4IEBAIHByaXZhdGU6CiAgICAgYm9v bCBtX25lZWRzRm9udEF0dHJpYnV0ZXMgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9tYXlIYXZlVW5p dmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5zaW9uIHsgZmFsc2UgfTsKIAorICAgIHN0ZDo6dW5p cXVlX3B0cjxQcm92aXNpb25hbFBhZ2VQcm94eT4gbV9wcm92aXNpb25hbFBhZ2U7CisKICNpZiBI QVZFKFBFTkNJTEtJVCkKICAgICBzdGQ6OnVuaXF1ZV9wdHI8RWRpdGFibGVJbWFnZUNvbnRyb2xs ZXI+IG1fZWRpdGFibGVJbWFnZUNvbnRyb2xsZXI7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCmluZGV4IGRiMWZkNThiOTNkLi5mN2RmYWU4NjI2 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCkBAIC0z NCw2ICszNCw3IEBACiAjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIlBsdWdpbkluZm9T dG9yZS5oIgogI2luY2x1ZGUgIlBsdWdpblByb2Nlc3NNYW5hZ2VyLmgiCisjaW5jbHVkZSAiUHJv dmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbmNsdWRlICJUZXh0Q2hlY2tlci5oIgogI2luY2x1ZGUg IlRleHRDaGVja2VyU3RhdGUuaCIKICNpbmNsdWRlICJVSU1lc3NhZ2VQb3J0Q2hhbm5lbFByb3Zp ZGVyLmgiCkBAIC00MzYsNyArNDM3LDcgQEAgUmVmPFdlYlBhZ2VQcm94eT4gV2ViUHJvY2Vzc1By b3h5OjpjcmVhdGVXZWJQYWdlKFBhZ2VDbGllbnQmIHBhZ2VDbGllbnQsIFJlZjxBUEkKIHZvaWQg V2ViUHJvY2Vzc1Byb3h5OjphZGRFeGlzdGluZ1dlYlBhZ2UoV2ViUGFnZVByb3h5JiB3ZWJQYWdl LCB1aW50NjRfdCBwYWdlSUQsIEJlZ2luc1VzaW5nRGF0YVN0b3JlIGJlZ2luc1VzaW5nRGF0YVN0 b3JlKQogewogICAgIEFTU0VSVCghbV9wYWdlTWFwLmNvbnRhaW5zKHBhZ2VJRCkpOwotICAgIEFT U0VSVCghZ2xvYmFsUGFnZU1hcCgpLmNvbnRhaW5zKHBhZ2VJRCkpOworICAgIEFTU0VSVCghZ2xv YmFsUGFnZU1hcCgpLmNvbnRhaW5zKHBhZ2VJRCkgfHwgZ2xvYmFsUGFnZU1hcCgpLmdldChwYWdl SUQpID09ICZ3ZWJQYWdlKTsKIAogICAgIGlmIChiZWdpbnNVc2luZ0RhdGFTdG9yZSA9PSBCZWdp bnNVc2luZ0RhdGFTdG9yZTo6WWVzKQogICAgICAgICBtX3Byb2Nlc3NQb29sLT5wYWdlQmVnaW5V c2luZ1dlYnNpdGVEYXRhU3RvcmUod2ViUGFnZSk7CkBAIC01ODQsNiArNTg1LDE1IEBAIGJvb2wg V2ViUHJvY2Vzc1Byb3h5OjpmdWxsS2V5Ym9hcmRBY2Nlc3NFbmFibGVkKCkKIH0KICNlbmRpZgog Citib29sIFdlYlByb2Nlc3NQcm94eTo6aGFzUHJvdmlzaW9uYWxQYWdlV2l0aElEKHVpbnQ2NF90 IHBhZ2VJRCkgY29uc3QKK3sKKyAgICBmb3IgKGF1dG8qIHByb3Zpc2lvbmFsUGFnZSA6IG1fcHJv dmlzaW9uYWxQYWdlcykgeworICAgICAgICBpZiAocHJvdmlzaW9uYWxQYWdlLT5wYWdlKCkucGFn ZUlEKCkgPT0gcGFnZUlEKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJl dHVybiBmYWxzZTsKK30KKwogdm9pZCBXZWJQcm9jZXNzUHJveHk6OnVwZGF0ZUJhY2tGb3J3YXJk SXRlbShjb25zdCBCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUmIGl0ZW1TdGF0ZSkKIHsKICAgICBp ZiAoYXV0byogaXRlbSA9IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW06Oml0ZW1Gb3JJRChpdGVtU3Rh dGUuaWRlbnRpZmllcikpIHsKQEAgLTU5MSw3ICs2MDEsNyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94 eTo6dXBkYXRlQmFja0ZvcndhcmRJdGVtKGNvbnN0IEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSYg aXRlbQogICAgICAgICAvLyB0aGUgYmFjay9mb3J3YXJkIGl0ZW1zIHBhZ2UuCiAgICAgICAgIC8v IGUuZy4gVGhlIG9sZCB3ZWIgcHJvY2VzcyBpcyBuYXZpZ2F0aW5nIHRvIGFib3V0OmJsYW5rIGZv ciBzdXNwZW5zaW9uLgogICAgICAgICAvLyBXZSBpZ25vcmUgdGhlc2UgdXBkYXRlcy4KLSAgICAg ICAgaWYgKG1fcGFnZU1hcC5jb250YWlucyhpdGVtLT5wYWdlSUQoKSkpCisgICAgICAgIGlmICht X3BhZ2VNYXAuY29udGFpbnMoaXRlbS0+cGFnZUlEKCkpIHx8IGhhc1Byb3Zpc2lvbmFsUGFnZVdp dGhJRChpdGVtLT5wYWdlSUQoKSkpCiAgICAgICAgICAgICBpdGVtLT5zZXRQYWdlU3RhdGUoaXRl bVN0YXRlLnBhZ2VTdGF0ZSk7CiAgICAgfQogfQpAQCAtODczLDcgKzg4Myw3IEBAIHZvaWQgV2Vi UHJvY2Vzc1Byb3h5OjptYXliZVNodXREb3duKCkKIAogYm9vbCBXZWJQcm9jZXNzUHJveHk6OmNh blRlcm1pbmF0ZUNoaWxkUHJvY2VzcygpCiB7Ci0gICAgaWYgKCFtX3BhZ2VNYXAuaXNFbXB0eSgp IHx8IG1fcHJvY2Vzc1Bvb2wtPmhhc1N1c3BlbmRlZFBhZ2VGb3IoKnRoaXMpKQorICAgIGlmICgh bV9wYWdlTWFwLmlzRW1wdHkoKSB8fCBtX3Byb2Nlc3NQb29sLT5oYXNTdXNwZW5kZWRQYWdlRm9y KCp0aGlzKSB8fCAhbV9wcm92aXNpb25hbFBhZ2VzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCiAgICAgaWYgKCFtX3Byb2Nlc3NQb29sLT5zaG91bGRUZXJtaW5hdGUodGhpcykp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCmluZGV4IDc1ZjY1YTdm N2ViLi41MDQyNjMwZGUzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Byb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1By b3h5LmgKQEAgLTcwLDYgKzcwLDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBjbGFzcyBOZXR3b3Jr UHJvY2Vzc1Byb3h5OwogY2xhc3MgT2JqQ09iamVjdEdyYXBoOwogY2xhc3MgUGFnZUNsaWVudDsK K2NsYXNzIFByb3Zpc2lvbmFsUGFnZVByb3h5OwogY2xhc3MgVXNlck1lZGlhQ2FwdHVyZU1hbmFn ZXJQcm94eTsKIGNsYXNzIFZpc2l0ZWRMaW5rU3RvcmU7CiBjbGFzcyBXZWJCYWNrRm9yd2FyZExp c3RJdGVtOwpAQCAtMTI0LDYgKzEyNSw5IEBAIHB1YmxpYzoKICAgICBlbnVtIGNsYXNzIEVuZHNV c2luZ0RhdGFTdG9yZSA6IGJvb2wgeyBObywgWWVzIH07CiAgICAgdm9pZCByZW1vdmVXZWJQYWdl KFdlYlBhZ2VQcm94eSYsIHVpbnQ2NF90IHBhZ2VJRCwgRW5kc1VzaW5nRGF0YVN0b3JlKTsKIAor ICAgIHZvaWQgYWRkUHJvdmlzaW9uYWxQYWdlUHJveHkoUHJvdmlzaW9uYWxQYWdlUHJveHkmIHBy b3Zpc2lvbmFsUGFnZSkgeyBBU1NFUlQoIW1fcHJvdmlzaW9uYWxQYWdlcy5jb250YWlucygmcHJv dmlzaW9uYWxQYWdlKSk7IG1fcHJvdmlzaW9uYWxQYWdlcy5hZGQoJnByb3Zpc2lvbmFsUGFnZSk7 IH0KKyAgICB2b2lkIHJlbW92ZVByb3Zpc2lvbmFsUGFnZVByb3h5KFByb3Zpc2lvbmFsUGFnZVBy b3h5JiBwcm92aXNpb25hbFBhZ2UpIHsgQVNTRVJUKG1fcHJvdmlzaW9uYWxQYWdlcy5jb250YWlu cygmcHJvdmlzaW9uYWxQYWdlKSk7IG1fcHJvdmlzaW9uYWxQYWdlcy5yZW1vdmUoJnByb3Zpc2lv bmFsUGFnZSk7IH0KKwogICAgIHR5cGVuYW1lIFdlYlBhZ2VQcm94eU1hcDo6VmFsdWVzQ29uc3RJ dGVyYXRvclJhbmdlIHBhZ2VzKCkgY29uc3QgeyByZXR1cm4gbV9wYWdlTWFwLnZhbHVlcygpOyB9 CiAgICAgdW5zaWduZWQgcGFnZUNvdW50KCkgY29uc3QgeyByZXR1cm4gbV9wYWdlTWFwLnNpemUo KTsgfQogICAgIHVuc2lnbmVkIHZpc2libGVQYWdlQ291bnQoKSBjb25zdCB7IHJldHVybiBtX3Zp c2libGVQYWdlQ291bnRlci52YWx1ZSgpOyB9CkBAIC0zMzAsNiArMzM0LDggQEAgcHJpdmF0ZToK IAogICAgIHZvaWQgbG9nRGlhZ25vc3RpY01lc3NhZ2VGb3JSZXNvdXJjZUxpbWl0VGVybWluYXRp b24oY29uc3QgU3RyaW5nJiBsaW1pdEtleSk7CiAKKyAgICBib29sIGhhc1Byb3Zpc2lvbmFsUGFn ZVdpdGhJRCh1aW50NjRfdCBwYWdlSUQpIGNvbnN0OworCiAgICAgZW51bSBjbGFzcyBJc1dlYWsg eyBObywgWWVzIH07CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gY2xhc3MgV2Vha09yU3Ryb25n UHRyIHsKICAgICBwdWJsaWM6CkBAIC0zNzMsNiArMzc5LDcgQEAgcHJpdmF0ZToKIAogICAgIFdl YlBhZ2VQcm94eU1hcCBtX3BhZ2VNYXA7CiAgICAgV2ViRnJhbWVQcm94eU1hcCBtX2ZyYW1lTWFw OworICAgIEhhc2hTZXQ8UHJvdmlzaW9uYWxQYWdlUHJveHkqPiBtX3Byb3Zpc2lvbmFsUGFnZXM7 CiAgICAgVXNlckluaXRpYXRlZEFjdGlvbk1hcCBtX3VzZXJJbml0aWF0ZWRBY3Rpb25NYXA7CiAK ICAgICBIYXNoU2V0PFZpc2l0ZWRMaW5rU3RvcmUqPiBtX3Zpc2l0ZWRMaW5rU3RvcmVzOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBi L1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggNTA3 ZWRiNzNlNzQuLjcwNzliMjY5ODg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYktpdC54 Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTMwOTUsNiArMzA5NSw4IEBACiAJCTQ2NkJDMDM4MUZB MjY2QzkwMDJGQTlDMSAvKiBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHAgKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVj dGlvbi5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ2NkJDMDM5MUZBMjY2Qzkw MDJGQTlDMSAvKiBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5oICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jLmg7IHBhdGggPSBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5oOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NjZCQzAzQTFGQTI2NkM5MDAyRkE5QzEgLyogV2Vi U1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24ubWVzc2FnZXMuaW4gKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0OyBw YXRoID0gV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24ubWVzc2FnZXMuaW47IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CisJCTQ2ODM1NjlBMjFFODFDQzcwMDZFMjdBMyAvKiBQcm92aXNp b25hbFBhZ2VQcm94eS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBQcm92aXNp b25hbFBhZ2VQcm94eS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk0NjgzNTY5QjIx RTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQk0NkEyQjYwNjFFNTY3NUEyMDBDM0RFREEgLyogQmFja2dy b3VuZFByb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Y3BwLmNwcDsgcGF0aCA9IEJhY2tncm91bmRQcm9jZXNzUmVzcG9uc2l2ZW5lc3NUaW1lci5jcHA7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ2QTJCNjA3MUU1Njc1QTIwMEMzREVEQSAv KiBCYWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVuZXNzVGltZXIuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gQmFja2dyb3VuZFByb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVyLmg7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ2REYwNjM5MUYzOTA1RTUwMDE5ODBCQiAv KiBOZXR3b3JrQ09SU1ByZWZsaWdodENoZWNrZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j cHAuY3BwOyBwYXRoID0gTmV0d29ya0NPUlNQcmVmbGlnaHRDaGVja2VyLmNwcDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTczNTAsNiArNzM1Miw4IEBACiAJCQkJODZFNjdBMjIxOTBG NDExODAwMDA0QUI3IC8qIFByb2Nlc3NUaHJvdHRsZXIuY3BwICovLAogCQkJCTg2RTY3QTIxMTkw RjQxMTgwMDAwNEFCNyAvKiBQcm9jZXNzVGhyb3R0bGVyLmggKi8sCiAJCQkJODMwNDhBRTUxQUNB NDVEQzAwODJDODMyIC8qIFByb2Nlc3NUaHJvdHRsZXJDbGllbnQuaCAqLywKKwkJCQk0NjgzNTY5 QjIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwICovLAorCQkJCTQ2 ODM1NjlBMjFFODFDQzcwMDZFMjdBMyAvKiBQcm92aXNpb25hbFBhZ2VQcm94eS5oICovLAogCQkJ CUE1NUJBODFCMUJBMjVCMUUwMDdDRDMzRCAvKiBSZW1vdGVXZWJJbnNwZWN0b3JQcm94eS5jcHAg Ki8sCiAJCQkJQTU1QkE4MTkxQkEyNUIxRTAwN0NEMzNEIC8qIFJlbW90ZVdlYkluc3BlY3RvclBy b3h5LmggKi8sCiAJCQkJQTU1QkE4MUExQkEyNUIxRTAwN0NEMzNEIC8qIFJlbW90ZVdlYkluc3Bl Y3RvclByb3h5Lm1lc3NhZ2VzLmluICovLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViRnJhbWUuY3BwCmluZGV4IDAwNzQ5YjQ3N2EyLi5mZmVkMDBjODIwNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcApAQCAtMjYzLDgg KzI2Myw2IEBAIHN0YXRpYyBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gdG9Qb2xpY3lBY3Rpb24oV2Vi UG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbikKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6OlBvbGlj eUFjdGlvbjo6SWdub3JlOwogICAgIGNhc2UgV2ViUG9saWN5QWN0aW9uOjpEb3dubG9hZDoKICAg ICAgICAgcmV0dXJuIFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6RG93bmxvYWQ7Ci0gICAgY2FzZSBX ZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQ6Ci0gICAgICAgIGJyZWFrOwogICAgIH0KICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKICAgICByZXR1cm4gV2ViQ29yZTo6UG9saWN5QWN0aW9uOjpJZ25v cmU7CkBAIC0yNzIsMTEgKzI3MCw4IEBAIHN0YXRpYyBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gdG9Q b2xpY3lBY3Rpb24oV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbikKIAogdm9pZCBXZWJGcmFt ZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKHVpbnQ2NF90IGxpc3RlbmVySUQsIFdlYlBvbGlj eUFjdGlvbiBhY3Rpb24sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgRG93bmxvYWRJRCBkb3dubG9h ZElELCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKIHsK LSAgICBpZiAoIW1fY29yZUZyYW1lIHx8ICFtX3BvbGljeUxpc3RlbmVySUQgfHwgbGlzdGVuZXJJ RCAhPSBtX3BvbGljeUxpc3RlbmVySUQgfHwgIW1fcG9saWN5RnVuY3Rpb24pIHsKLSAgICAgICAg aWYgKGFjdGlvbiA9PSBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQpCi0gICAgICAgICAgICBwYWdl KCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJv Y2Vzc1N3YXAoKSk7CisgICAgaWYgKCFtX2NvcmVGcmFtZSB8fCAhbV9wb2xpY3lMaXN0ZW5lcklE IHx8IGxpc3RlbmVySUQgIT0gbV9wb2xpY3lMaXN0ZW5lcklEIHx8ICFtX3BvbGljeUZ1bmN0aW9u KQogICAgICAgICByZXR1cm47Ci0gICAgfQogCiAgICAgRnJhbWVQb2xpY3lGdW5jdGlvbiBmdW5j dGlvbiA9IFdURk1vdmUobV9wb2xpY3lGdW5jdGlvbik7CiAgICAgYm9vbCBmb3JOYXZpZ2F0aW9u QWN0aW9uID0gbV9wb2xpY3lGdW5jdGlvbkZvck5hdmlnYXRpb25BY3Rpb24gPT0gRm9yTmF2aWdh dGlvbkFjdGlvbjo6WWVzOwpAQCAtMjkyLDE2ICsyODcsNyBAQCB2b2lkIFdlYkZyYW1lOjpkaWRS ZWNlaXZlUG9saWN5RGVjaXNpb24odWludDY0X3QgbGlzdGVuZXJJRCwgV2ViUG9saWN5QWN0aW9u IGFjdAogICAgICAgICAgICAgZG9jdW1lbnRMb2FkZXItPnNldE5hdmlnYXRpb25JRChuYXZpZ2F0 aW9uSUQpOwogICAgIH0KIAotICAgIGJvb2wgc2hvdWxkU3VzcGVuZCA9IGZhbHNlOwotICAgIGlm IChhY3Rpb24gPT0gV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kKSB7Ci0gICAgICAgIHNob3VsZFN1 c3BlbmQgPSB0cnVlOwotICAgICAgICBhY3Rpb24gPSBXZWJQb2xpY3lBY3Rpb246Oklnbm9yZTsK LSAgICB9Ci0KICAgICBmdW5jdGlvbih0b1BvbGljeUFjdGlvbihhY3Rpb24pKTsKLQotICAgIGlm IChzaG91bGRTdXNwZW5kKQotICAgICAgICBwYWdlKCktPnN1c3BlbmRGb3JQcm9jZXNzU3dhcCgp OwogfQogCiB2b2lkIFdlYkZyYW1lOjpzdGFydERvd25sb2FkKGNvbnN0IFdlYkNvcmU6OlJlc291 cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWROYW1lKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCAyNWQ2ZGZiNzFk MC4uZTQ5MTgyNDdhNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCkBAIC00MDEsNyArNDAxLDcgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBw YWdlSUQsIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQogICAgICwgbV9v dmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSB7IHBhcmFtZXRlcnMub3ZlcnJpZGVDb250ZW50 U2VjdXJpdHlQb2xpY3kgfQogICAgICwgbV9jcHVMaW1pdChwYXJhbWV0ZXJzLmNwdUxpbWl0KQog I2lmIFBMQVRGT1JNKE1BQykKLSAgICAsIG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VU cmFuc2l0aW9uKHBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCkKKyAgICAsIG1fc2hvdWxk QXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uKHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dh cCkKICNlbmRpZgogewogICAgIEFTU0VSVChtX3BhZ2VJRCk7CkBAIC00NzEsNyArNDcxLDcgQEAg V2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnMmJiBwYXJhbWV0ZXJzKQogICAgIG1fZHJhd2luZ0FyZWEtPnNldFBhaW50aW5nRW5hYmxlZChm YWxzZSk7CiAgICAgbV9kcmF3aW5nQXJlYS0+c2V0U2hvdWxkU2NhbGVWaWV3VG9GaXREb2N1bWVu dChwYXJhbWV0ZXJzLnNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQpOwogCi0gICAgaWYgKHBh cmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCkKKyAgICBpZiAocGFyYW1ldGVycy5pc1Byb2Nl c3NTd2FwKQogICAgICAgICBmcmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29uOjpT d2FwRnJvbVN1c3BlbmRlZCk7CiAKICNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKQpAQCAtNjk2 LDcgKzY5Niw3IEBAIHZvaWQgV2ViUGFnZTo6cmVpbml0aWFsaXplV2ViUGFnZShXZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICAgICAgbV9kcmF3aW5nQXJlYS0+dXBk YXRlUHJlZmVyZW5jZXMocGFyYW1ldGVycy5zdG9yZSk7CiAgICAgICAgIG1fZHJhd2luZ0FyZWEt PnNldFBhaW50aW5nRW5hYmxlZCh0cnVlKTsKICNpZiBQTEFURk9STShNQUMpCi0gICAgICAgIG1f c2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uID0gcGFyYW1ldGVycy5pc1N3 YXBGcm9tU3VzcGVuZGVkOworICAgICAgICBtX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdl VHJhbnNpdGlvbiA9IHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcDsKICNlbmRpZgogICAgICAgICB1 bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlBhZ2VTdXNwZW5kZWQpOwog ICAgIH0KQEAgLTMwNTMsMTIgKzMwNTMsNiBAQCB2b2lkIFdlYlBhZ2U6OmRpZFJlY2VpdmVQb2xp Y3lEZWNpc2lvbih1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBsaXN0ZW5lcklELCBXZQogICAg IFdlYkZyYW1lKiBmcmFtZSA9IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLndlYkZyYW1lKGZyYW1l SUQpOwogICAgIGlmICghZnJhbWUpCiAgICAgICAgIHJldHVybjsKLSAgICBpZiAocG9saWN5QWN0 aW9uID09IFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZCkgewotICAgICAgICBBU1NFUlQoZnJhbWUg PT0gbV9tYWluRnJhbWUpOwotICAgICAgICBzZXRJc1N1c3BlbmRlZCh0cnVlKTsKLQotICAgICAg ICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5zZW5kUHJld2FybUluZm9ybWF0aW9uKG1haW5XZWJG cmFtZSgpLT51cmwoKSk7Ci0gICAgfQogICAgIGZyYW1lLT5kaWRSZWNlaXZlUG9saWN5RGVjaXNp b24obGlzdGVuZXJJRCwgcG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uSUQsIGRvd25sb2FkSUQsIFdU Rk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiB9CiAKQEAgLTYzMTIsNiArNjMwNiwxMCBAQCB2b2lk IFdlYlBhZ2U6OnNldElzU3VzcGVuZGVkKGJvb2wgc3VzcGVuZGVkKQogICAgIGlmIChtX2lzU3Vz cGVuZGVkKSB7CiAgICAgICAgIC8vIFVuZnJvemVuIG9uIGRyYXdpbmcgYXJlYSByZXNldC4KICAg ICAgICAgZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6UGFnZVN1c3BlbmRl ZCk7CisKKyAgICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuc2VuZFByZXdhcm1JbmZvcm1h dGlvbihtYWluV2ViRnJhbWUoKS0+dXJsKCkpOworCisgICAgICAgIHN1c3BlbmRGb3JQcm9jZXNz U3dhcCgpOwogICAgIH0gZWxzZQogICAgICAgICBtX3Nob3VsZFJlc2V0RHJhd2luZ0FyZWFBZnRl clN1c3BlbmQgPSB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh Lm1tCmluZGV4IDkxYWQ3MWFkZTFiLi44M2I2NTk5MjcwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVB bmltYXRpb25EcmF3aW5nQXJlYS5tbQpAQCAtOTcsNyArOTcsNyBAQCBUaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYTo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEoV2ViUGFnZSYgd2Vi UGFnZSwgYwogICAgIHVwZGF0ZUxheWVySG9zdGluZ0NvbnRleHQoKTsKICAgICBzZXRDb2xvclNw YWNlKHBhcmFtZXRlcnMuY29sb3JTcGFjZSk7CiAKLSAgICBpZiAoIXBhcmFtZXRlcnMuaXNTd2Fw RnJvbVN1c3BlbmRlZCkKKyAgICBpZiAoIXBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkKICAgICAg ICAgYXR0YWNoKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCmluZGV4IGYz NWQ4YmFhMzUzLi41MGE2NjI4YzdkZiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQorKysgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1t CkBAIC0xNDA1LDcgKzE0MDUsNyBAQCBURVNUKFByb2Nlc3NTd2FwLCBTZXJ2ZXJSZWRpcmVjdCkK IAogICAgIEVYUEVDVF9GQUxTRShzZXJ2ZXJSZWRpcmVjdGVkKTsKICAgICBFWFBFQ1RfRVEoMywg bnVtYmVyT2ZEZWNpZGVQb2xpY3lDYWxscyk7Ci0gICAgRVhQRUNUX0VRKDJ1LCBzZWVuUElEcy5z aXplKCkpOworICAgIEVYUEVDVF9FUSgzdSwgc2VlblBJRHMuc2l6ZSgpKTsKIH0KIAogVEVTVChQ cm9jZXNzU3dhcCwgU2VydmVyUmVkaXJlY3QyKQpAQCAtMTQ2Nyw2ICsxNDY3LDY2IEBAIFRFU1Qo UHJvY2Vzc1N3YXAsIFNlcnZlclJlZGlyZWN0MikKICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29u Oi8vd3d3LndlYmtpdC5vcmcvbWFpbjEuaHRtbCIsIFtbd2ViVmlldyBVUkxdIGFic29sdXRlU3Ry aW5nXSk7CiB9CiAKK3N0YXRpYyBjb25zdCBjaGFyKiBsaW5rVG9XZWJLaXRCeXRlcyA9IFIiUFNP TlJFU09VUkNFKAorPGJvZHk+CisgIDxhIGlkPSJ0ZXN0TGluayIgaHJlZj0icHNvbjovL3d3dy53 ZWJraXQub3JnL21haW4uaHRtbCI+TGluazwvYT4KKzwvYm9keT4KKylQU09OUkVTT1VSQ0UiOwor CitURVNUKFByb2Nlc3NTd2FwLCBQb2xpY3lDYW5jZWxBZnRlclNlcnZlclJlZGlyZWN0KQorewor ICAgIGF1dG8gcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW19XS1Byb2Nlc3NQ b29sQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIHByb2Nlc3NQb29sQ29uZmlndXJh dGlvbi5nZXQoKS5wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb24gPSBZRVM7CisgICAgYXV0byBwcm9j ZXNzUG9vbCA9IGFkb3B0TlMoW1tXS1Byb2Nlc3NQb29sIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1 cmF0aW9uOnByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKV0pOworCisgICAgYXV0byB3ZWJW aWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9j XSBpbml0XSk7CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFByb2Nlc3NQb29sOnByb2Nl c3NQb29sLmdldCgpXTsKKyAgICBhdXRvIGhhbmRsZXIgPSBhZG9wdE5TKFtbUFNPTlNjaGVtZSBh bGxvY10gaW5pdF0pOworICAgIFtoYW5kbGVyIGFkZE1hcHBpbmdGcm9tVVJMU3RyaW5nOkAicHNv bjovL3d3dy5nb29nbGUuY29tL21haW4uaHRtbCIgdG9EYXRhOmxpbmtUb1dlYktpdEJ5dGVzXTsK KyAgICBbaGFuZGxlciBhZGRSZWRpcmVjdEZyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3LndlYmtp dC5vcmcvbWFpbi5odG1sIiB0b1VSTFN0cmluZzpAInBzb246Ly93d3cuYXBwbGUuY29tL2lnbm9y ZS5odG1sIl07CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6 aGFuZGxlci5nZXQoKSBmb3JVUkxTY2hlbWU6QCJwc29uIl07CisKKyAgICBhdXRvIHdlYlZpZXcg PSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwg MCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246d2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCldKTsK KyAgICBhdXRvIG5hdmlnYXRpb25EZWxlZ2F0ZSA9IGFkb3B0TlMoW1tQU09OTmF2aWdhdGlvbkRl bGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRl Om5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBuYXZpZ2F0aW9uRGVsZWdhdGUtPmRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24gPSBeKFdLTmF2aWdhdGlvbkFjdGlvbiAqYWN0 aW9uLCB2b2lkICheZGVjaXNpb25IYW5kbGVyKShXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3kpKSB7 CisgICAgICAgIGlmIChbYWN0aW9uLnJlcXVlc3QuVVJMLmFic29sdXRlU3RyaW5nIGhhc1N1ZmZp eDpAImlnbm9yZS5odG1sIl0pIHsKKyAgICAgICAgICAgIGRlY2lzaW9uSGFuZGxlcihXS05hdmln YXRpb25BY3Rpb25Qb2xpY3lDYW5jZWwpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9 CisgICAgICAgIGRlY2lzaW9uSGFuZGxlcihXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvdyk7 CisgICAgfTsKKworICAgIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVx dWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29uOi8vd3d3Lmdvb2dsZS5jb20v bWFpbi5odG1sIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworCisgICAg VGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisgICAg YXV0byBwaWRBZnRlckZpcnN0TG9hZCA9IFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl07 CisKKyAgICBFWFBFQ1RfRVEoMSwgbnVtYmVyT2ZEZWNpZGVQb2xpY3lDYWxscyk7CisKKyAgICBb d2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJ0ZXN0TGluay5jbGljaygpIiBjb21wbGV0aW9u SGFuZGxlcjpuaWxdOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZmYWlsZWQpOwor ICAgIGZhaWxlZCA9IGZhbHNlOworICAgIGRvbmUgPSBmYWxzZTsKKworICAgIEVYUEVDVF9FUSgz LCBudW1iZXJPZkRlY2lkZVBvbGljeUNhbGxzKTsKKworICAgIC8vIFdlIHNob3VsZCBzdGlsbCBi ZSBvbiBnb29nbGUuY29tLgorICAgIEVYUEVDVF9FUShwaWRBZnRlckZpcnN0TG9hZCwgW3dlYlZp ZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7CisgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjov L3d3dy5nb29nbGUuY29tL21haW4uaHRtbCIsIFtbd2ViVmlldyBVUkxdIGFic29sdXRlU3RyaW5n XSk7CisKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJ0ZXN0TGluay5pbm5lclRl eHQiIGNvbXBsZXRpb25IYW5kbGVyOiBbJl0gKGlkIGlubmVyVGV4dCwgTlNFcnJvciAqZXJyb3Ip IHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAiTGluayIsIGlubmVyVGV4dCk7CisgICAgICAg IGRvbmUgPSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9u ZSk7CisgICAgZG9uZSA9IGZhbHNlOworfQorCiBlbnVtIGNsYXNzIFNob3VsZEVuYWJsZVBTT04g eyBObywgWWVzIH07CiBzdGF0aWMgdm9pZCBydW5DbGllbnRTaWRlUmVkaXJlY3RUZXN0KFNob3Vs ZEVuYWJsZVBTT04gc2hvdWxkRW5hYmxlUFNPTikKIHsKQEAgLTIyMzIsMTIgKzIyOTIsMjcgQEAg VEVTVChQcm9jZXNzU3dhcCwgUGFnZVNob3dIaWRlKQogCiAgICAgRVhQRUNUX0VRKDd1LCBbcmVj ZWl2ZWRNZXNzYWdlcyBjb3VudF0pOwogICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cu d2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlc2hvdyBOT1QgcGVyc2lzdGVkIiwgcmVjZWl2ZWRN ZXNzYWdlcy5nZXQoKVswXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJr aXQub3JnL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMu Z2V0KClbMV0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21h aW4uaHRtbCAtIHBhZ2VzaG93IE5PVCBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgp WzJdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0 bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKLSAg ICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFn ZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs0XSk7Ci0gICAgRVhQRUNU X1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBl cnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0pOwotICAgIEVYUEVDVF9XS19TVFJF UShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIs IHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAgIGlmIChbcmVjZWl2ZWRNZXNzYWdlcy5n ZXQoKVsxXSBoYXNQcmVmaXg6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIl0pIHsK KyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRt bCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0pOworICAg ICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBw YWdlc2hvdyBOT1QgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7CisgICAg fSBlbHNlIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20v bWFpbi5odG1sIC0gcGFnZXNob3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0 KClbMV0pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcv bWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsy XSk7CisgICAgfQorICAgIGlmIChbcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSBoYXNQcmVmaXg6 QCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwiXSkgeworICAgICAgICBFWFBFQ1RfV0tf U1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0 ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVR KEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIs IHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNF0pOworICAgIH0gZWxzZSB7CisgICAgICAgIEVYUEVD VF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlc2hvdyBw ZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKKyAgICAgICAgRVhQRUNUX1dL X1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lz dGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs0XSk7CisgICAgfQorICAgIGlmIChbcmVjZWl2 ZWRNZXNzYWdlcy5nZXQoKVs1XSBoYXNQcmVmaXg6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFp bi5odG1sIl0pIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQu b3JnL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0 KClbNV0pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9t YWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZd KTsKKyAgICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFw cGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2Vz LmdldCgpWzVdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQu b3JnL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0 KClbNl0pOworICAgIH0KIH0KIAogLy8gRGlzYWJsaW5nIHRoZSBwYWdlIGNhY2hlIGV4cGxpY2l0 bHkgaXMgKGZvciBzb21lIHJlYXNvbikgbm90IGF2YWlsYWJsZSBvbiBpT1MuCg== 359047 2019-01-14 09:54:50 -0800 2019-01-14 13:10:30 -0800 Patch bug-193361-20190114095449.patch text/plain 97725 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5ODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Y4YjllNWYwMzU1YTQ0 MzU0Yjc4OTdlMTRhNjE0MDQwYzVmNWY0MC4uMzUwNjUyYjM0MzQ2YWUyYTU3MTkyODM2ZTZlMWI2 NGQ0MjI2MjhlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAxLTE0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBW aWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAg ICAgIFdoZW4gcmVzdG9yaW5nIGZyb20gUGFnZUNhY2hlLCBtYWtlIHN1cmUgd2Ugbm90aWZ5IHRo ZSBjbGllbnQgdGhhdCB0aGUgbG9hZCB3YXMgY29tbWl0dGVkCisgICAgICAgICpiZWZvcmUqIHdl IHRlbGwgaXQgdGhhdCB0aGUgbmF2aWdhdGlvbiBpcyBjb21wbGV0ZS4gVGhpcyB3b3VsZCBjb25m dXNlIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eQorICAgICAgICBsb2dpYyBpbiB0aGUgVUlQcm9j ZXNzLgorCiAyMDE5LTAxLTEwICBKdXN0aW4gRmFuICA8anVzdGluX2ZhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW1dlYkdQVV0gQWRkIEJpbmRHcm91cEJpbmRpbmcsIEJpbmRHcm91cERlc2NyaXB0 b3IsIGFuZCBCdWZmZXJCaW5kaW5nIGRpY3Rpb25hcmllcyBmcm9tIEFQSQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAw ZjAwYWJjZDhkYzUyZGViNmE3ZWViMTc2NmU4YjAxNjIxMDY1OGU2Li5jNzMwMWI0NWIxZmZjNzY2 OGMyZGViMjMxODdmYjZiNmRjODAxYjVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4OSBAQAorMjAx OS0wMS0xNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFJlZ3Jl c3Npb24oUFNPTikgVmlldyBiZWNvbWVzIGJsYW5rIGFmdGVyIGNsaWNrIGEgY3Jvc3Mtc2l0ZSBk b3dubG9hZCBsaW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTMzNjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBpc3N1ZSB0cmFja2Vk IGJ5IHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczIGlzIHRoYXQgYSBwcm92aXNpb25hbCBsb2FkIG1h eSBnZXQKKyAgICAgICAgY2FuY2VsZWQgKG9yIGNvbnZlcnRlZCBpbnRvIGEgZG93bmxvYWQpICph ZnRlciogd2UndmUgZGVjaWRlZCB0byBwcm9jZXNzLXN3YXAuCisgICAgICAgIEluIHN1Y2ggY2Fz ZXMsIHRoZSB2aWV3IHNob3VsZCBrZWVwIGRpc3BsYXlpbmcgdGhlIGN1cnJlbnQgc2l0ZSBhbmQg aXQgc2hvdWxkCisgICAgICAgIHN0aWxsIGJlIGludGVyYWN0aXZlLiBIb3dldmVyLCB3aXRoIHRo ZSBwcmV2aW91cyBQU09OIG1vZGVsLCB0aGUgdmlldyAocGFnZVByb3h5KQorICAgICAgICB3b3Vs ZCBoYXZlIGFscmVhZHkgc3dhcHBlZCB0byB0aGUgbmV3IHByb2Nlc3MgYW5kIHdvdWxkIGVuZCB1 cCBkaXNwbGF5aW5nIHRoZQorICAgICAgICBpbml0aWFsbHkgZW1wdHkgZG9jdW1lbnQuCisKKyAg ICAgICAgVG8gYWRkcmVzcyB0aGUgaXNzdWUsIHRoaXMgcGF0Y2ggaW50cm9kdWNlcyB0aGUgY29u Y2VwdCBvZiBhIHByb3Zpc2lvbmFsIGxvYWQKKyAgICAgICAgaW4gdGhlIFVJUHJvY2VzcywgaGFu ZGxlZCBieSBhIFByb3Zpc2lvbmFsUGFnZVByb3h5IHdoaWNoIGhhcyBpdHMgb3duIHByaXZpc2lv bmFsCisgICAgICAgIHByb2Nlc3MuIFRoZSBXZWJQYWdlUHJveHkgb3ducyB0aGUgUHJvdmlzaW9u YWxQYWdlUHJveHkgYnV0IHdlIGRvIG5vdCBjb21taXQgdGhlCisgICAgICAgIHByb3Zpc2lvbmFs IHBhZ2UgdW50aWwgYWZ0ZXIgdGhlIGxvYWQgd2FzIGNvbW1pdHRlZCBpbiB0aGUgbmV3IHByb2Nl c3MuIFRoaXMgbWVhbnMKKyAgICAgICAgdGhhdCB0aGUgdmlldyAvIFdlYlBhZ2VQcm94eSBrZWVw cyB1c2luZyB0aGUgb2xkIHByb2Nlc3MgYW5kIGRpc3BsYXlzIHRoZSBjdXJyZW50CisgICAgICAg IGNvbnRlbnQgdW50aWwgYSBsb2FkIGhhcyBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHBh Z2UuIElmIG5vIGxvYWQgY29tbWl0cworICAgICAgICBpbiB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vz cyAoZS5nLiBiZWNhdXNlIHRoZSBsb2FkIGlzIGNhbmNlbGxlZCBvciBjb252ZXJ0ZWQgaW50bwor ICAgICAgICBhIGRvd25sb2FkKSwgdGhlbiB3ZSBtZXJlbHkgZGVzdHJveSB0aGUgUHJvdmlzaW9u YWxQYWdlUHJveHkgYW5kIHRlcm1pbmF0ZSBpdHMKKyAgICAgICAgcHJvY2Vzcywgd2l0aG91dCBp bXBhY3RpbmcgdGhlIFdlYlBhZ2VQcm94eS4KKworICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVyczo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVycy5oOgorICAgICAgICBSZW5hbWUgaXNTd2FwRnJvbVN1c3BlbmRlZCB0byBpc1Byb2Nl c3NTd2FwIGZvciBjbGFyaXR5IGFzIHdlIGFsd2F5cyB3YW50IHRvCisgICAgICAgIGRlbGF5IGF0 dGFjaGluZyB0aGUgZHJhd2luZyBhcmVhIGluIGNhc2Ugb2YgYSBwcm9jZXNzLXN3YXAsIG5vIG1h dHRlciB3aGF0CisgICAgICAgIG5vdyB0aGF0IHRoZSBwcmV2aW91cyBwcm9jZXNzIGlzIGtlcHQg YWxpdmUgdW50aWwgdGhlIHByb3Zpc2lvbmFsIGxvYWQgaXMKKyAgICAgICAgY29tbWl0dGVkIGlu IHRoZSBuZXcgcHJvY2Vzcy4KKworICAgICAgICAqIFNoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaDoK KyAgICAgICAgRHJvcCBTdXNwZW5kIHBvbGljeSBhY3Rpb24uIEF0IGRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb24gdGltZSwgaW4gY2FzZSBvZgorICAgICAgICBwcm9jZXNzLXN3YXAsIHdl IG5vdyB0ZWxsIHRoZSBwcmV2aW91cyBwcm9jZXNzIHRvIHNpbXBseSBpZ25vcmUgdGhlIGxvYWQs IHdoaWxlCisgICAgICAgIHdlIGNyZWF0ZSBhIFByb3Zpc2lvbmFsUGFnZVByb3h5IHRvIGRvIHRo ZSBuZXcgbG9hZCBpbiBhIG5ldyBwcm9jZXNzLgorICAgICAgICBTdXNwZW5zaW9uIG9mIHRoZSBw cmV2aW91cyBwYWdlIGluIHRoZSBvbGQgcHJvY2VzcywgaGFwcGVucyBsYXRlciwgd2hlbiBhIGxv YWQKKyAgICAgICAgaXMgYWN0dWFsbHkgY29tbWl0dGVkIGluIHRoZSBuZXcgcHJvY2Vzcy4KKwor ICAgICAgICAqIFNvdXJjZXMudHh0OgorICAgICAgICBBZGQgbmV3IFByb3Zpc2lvbmFsUGFnZVBy b3h5IGZpbGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToK KyAgICAgICAgKC1bV0tXZWJWaWV3IF9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0YXRl XSk6CisgICAgICAgIFdoZW4gY2FsbGluZyBfa2lsbFdlYkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRT dGF0ZSBvbiBhIFdLV2ViVmlldywga2lsbCBib3RoIHRoZSBjdXJyZW50CisgICAgICAgIHByb2Nl c3MgYW5kIHRoZSBwcm92aXNpb25hbCBvbmUsIHRvIG1haW50YWluIHByZXZpb3VzIGJlaGF2aW9y IGluIG91ciBBUEkgdGVzdHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUNsaWVudC5oOgor ICAgICAgICBUaW55IGJ1aWxkIGZpeC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Qcm92aXNpb25h bFBhZ2VQcm94eS5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQ cm94eTo6UHJvdmlzaW9uYWxQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25h bFBhZ2VQcm94eTo6flByb3Zpc2lvbmFsUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OnRha2VEcmF3aW5nQXJlYSk6CisgICAgICAgIChXZWJLaXQ6OlBy b3Zpc2lvbmFsUGFnZVByb3h5OjpjYW5jZWwpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25h bFBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6bG9hZERhdGFXaXRoTmF2aWdhdGlvbik6CisgICAgICAgIChXZWJLaXQ6 OlByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKToKKyAgICAg ICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0pOgor ICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1l KToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlz aW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94 eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJL aXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2FnZSk6CisgICAgICAgIChX ZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlU3luY01lc3NhZ2UpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oOiBBZGRlZC4KKyAgICAgICAg KFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OnBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpQ cm92aXNpb25hbFBhZ2VQcm94eTo6bWFpbkZyYW1lIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6 UHJvdmlzaW9uYWxQYWdlUHJveHk6OnByb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBjb25zdCk6CisgICAg ICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpuYXZpZ2F0aW9uSUQgY29uc3QpOgor ICAgICAgICBBZGQgbmV3IFByb3Zpc2lvbmFsUGFnZVByb3h5IGNsYXNzIHRvIHdyYXAgdGhlIHBy b3Zpc2lvbmFsIGxvYWQgaW4gdGhlIG5ldyBwcm9jZXNzCisgICAgICAgIGFmdGVyIGEgc3dhcC4g VGhlIHByb3Zpc2lvbmFsIHBhZ2UgaXMgb3duZWQgYnkgdGhlIFdlYlBhZ2VQcm94eSBhbmQgd2Ug b25seSBjb21taXQKKyAgICAgICAgdGhlIHByb3Zpc2lvbmFsIHBhZ2Ugd2hlbiB0aGUgbG9hZCBp cyBjb21taXR0ZWQuIFVudGlsIHRoZW4sIHRoZSBXZWJQYWdlUHJveHkga2VlcHMKKyAgICAgICAg dXNpbmcgdGhlIG9sZCBwcm9jZXNzIGFuZCBkaXNwbGF5aW5nIHRoZSBjdXJyZW50IGNvbnRlbnQu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5Ojp+U3VzcGVuZGVkUGFnZVByb3h5KToKKyAgICAg ICAgKFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5Ojp1bnN1c3BlbmQpOgorICAgICAgICAoV2Vi S2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6OmRpZFByb2Nlc3NSZXF1ZXN0VG9TdXNwZW5kKToKKyAg ICAgICAgVW5yZWdpc3RlciB0aGUgU3VzcGVuZGVkUGFnZVByb3h5IGFzIGFuIElQQyBtZXNzYWdl IHJlY2VpdmVyIGEgbGl0dGxlIGJpdCBlYXJsaWVyCisgICAgICAgIHdoZW4gd2UncmUgZ29pbmcg dG8gdW5zdXNwZW5kIGl0LiBUaGlzIGF2b2lkcyBjb25mbGljdGluZyB3aXRoIHRoZSBQcm92aXNp b25hbFBhZ2VQcm94eQorICAgICAgICB3aGljaCB0cmllcyB0byByZWdpc3RlciBpdHNlbGYgYXMg YW4gSVBDIG1lc3NhZ2UgcmVjZWl2ZXIgZm9yIHRoZSBzYW1lIHBhZ2VJRCB3aGVuCisgICAgICAg IGEgcHJvY2Vzcy1zd2FwIG9jY3VycyBhbmQgd2UncmUgc3dpdGNoaW5nIHRvIGEgc3VzcGVuZGVk IHBhZ2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkZyYW1lUHJveHk6OmlzTWFpbkZyYW1lIGNvbnN0KToKKyAgICAgICAgV2Vi RnJhbWVQcm94eTo6aXNNYWluRnJhbWUoKSByZWxpZXMgb24gY2hlY2tpbmcgdGhhdCB0aGUgZnJh bWUgaXMgdGhlIFdlYlBhZ2VQcm94eSdzIG1fbWFpbkZyYW1lLgorICAgICAgICBOb3cgdGhhdCB0 aGUgV2ViUGFnZVByb3h5IGNhbiBoYXZlIGEgUHJvdmlzaW9uYWxQYWdlUHJveHksIGFsc28gY2hl Y2sgaWYgaXQgaXMgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5J3MKKyAgICAgICAgbV9tYWluRnJh bWUgdG8gbWFpbnRhaW4gcHJldmlvdXMgYmVoYXZpb3IuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpzd2FwVG9X ZWJQcm9jZXNzKToKKyAgICAgICAgc3dhcFRvV2ViUHJvY2VzcygpIG5vIGxvbmdlciB0YWtlcyBj YXJlIG9mIHVuc3VzcGVuZGluZyB0aGUgU3VzcGVuZGVkUGFnZSBiZWNhdXNlIHdlIG5vdyBjYWxs IHN3YXBUb1dlYlByb2Nlc3MoKQorICAgICAgICBsYXRlciwgd2hlbiBhIGxvYWQgaXMgYWN0dWFs bHkgY29tbWl0dGVkIGluIHRoZSBwcm92aXNpb25hbCBwYWdlIC8gcHJvY2Vzcy4gc3dhcFRvV2Vi UHJvY2VzcygpIG5vdyBhbHNvIG5lZWRzCisgICAgICAgIHRvIGluaXRpYWxpemUgc29tZSBkYXRh IG1lbWJlcnMgc3VjaCBhcyB0aGUgZHJhd2luZyBhcmVhIGFuZCB0aGUgbWFpbiBmcmFtZSBhcyBp dCBpcyB0cmFuc2ZlcnJpbmcgdGhlbSBvdmVyIGZyb20KKyAgICAgICAgdGhlIFByb3Zpc2lvbmFs UGFnZVByb3h5IHdoaWNoIHN0YXJ0ZWQgdGhlIHByb3Zpc2lvbmFsIGxvYWQuCisKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MpOgorICAg ICAgICBXZSBubyBsb25nZXIgbmVlZCBJc1N3YXBGcm9tU3VzcGVuZGVkIHBhcmFtZXRlciBhcyB0 aGlzIGlzIGNhbGxlZCBsYXRlciBub3csIGFmdGVyIGEgbG9hZCBoYXMgYWN0dWFsbHkgYmVlbgor ICAgICAgICBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHByb2Nlc3MuCisKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSk6CisgICAgICAgIC0gV2Ug bm8gbG9uZ2VyIG5lZWQgSXNTd2FwRnJvbVN1c3BlbmRlZCBwYXJhbWV0ZXIgYXMgdGhpcyBpcyBj YWxsZWQgbGF0ZXIgbm93LCBhZnRlciBhIGxvYWQgaGFzIGFjdHVhbGx5IGJlZW4KKyAgICAgICAg ICBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHByb2Nlc3MuCisgICAgICAgIC0gQWxzbyBk byBub3QgcmUtaW5pdGlhbGl6ZSBtX2RyYXdpbmdBcmVhIGlmIGl0IGlzIGFscmVhZHkgc2V0IGJl Y2F1c2Ugc3dhcFRvV2ViUHJvY2VzcygpIG5vdyB0cmFuc2ZlcnMgdGhlCisgICAgICAgICAgZHJh d2luZyBhcmVhIGZyb20gdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGJlZm9yZSBjYWxsaW5nIHRo aXMgbWV0aG9kLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3RX aXRoTmF2aWdhdGlvbik6CisgICAgICAgIE9ubHkgY2FsbCBzZXRQZW5kaW5nQVBJUmVxdWVzdFVS TCgpIGluIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oKSBvbmx5IGlmIFNob3VsZFRyZWF0QXND b250aW51aW5nTG9hZCBpcyBub3QKKyAgICAgICAgWWVzLiBUaGlzIGF2b2lkcyBoaXR0aW5nIHNv bWUgYXNzZXJ0aW9ucyBhcyB0aGlzIHdhcyBhbHJlYWR5IGNhbGxlZCBkdXJpbmcgdGhlIGZpcnN0 IEFQSSBjYWxsIGlmIG5lZWRlZC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJl Y2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uKToKKyAgICAgICAgSW4gY2FzZSBvZiBwcm9j ZXNzIHN3YXAsIHRlbGwgdGhlIHByZXZpb3VzIHByb2Nlc3MgdG8gaWdub3JlIHRoZSBsb2FkIGlu c3RlYWQgb2Ygc3VzcGVuZGluZyBpdCByaWdodCBhd2F5LgorICAgICAgICBTdXNwZW5zaW9uIG5v dyBoYXBwZW5zIGxhdGVyLCBvbmx5IGlmIHdlIGVuZCB1cCBjb21taXR0aW5nIHRoZSBwcm92aXNp b25hbCBsb2FkIGluIHRoZSBuZXcgcHJvY2Vzcy4KKyAgICAgICAgQWxzbyBkaXNjYXJkIHRoZSBT dXNwZW5kZWRQYWdlIGlmIGl0IGZhaWxlZCB0byBzdXNwZW5kICh3ZSBvbmx5IHJldXNlIGl0cyBw cm9jZXNzIGluIHRoaXMgY2FzZSkuIFRoaXMgdXNlZAorICAgICAgICB0byBoYXBwZW4gYSBiaXQg bGF0ZXIgYnV0IGl0IGlzIGNsZWFyZXIgaWYgd2UgZG8gdGhpcyBhcyBlYXJseSBhcyBwb3NzaWJs ZSBJIHRoaW5rLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y29tbWl0UHJvdmlz aW9uYWxQYWdlKToKKyAgICAgICAgV2hlbiB0aGUgbG9hZCBpcyBjb21taXR0ZWQgaW4gdGhlIG5l dyBwcm9jZXNzLCB3ZSBjYWxsIFdlYlBhZ2VQcm94eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKCku IEl0IHRha2VzIGNhcmUgb2Y6CisgICAgICAgIC0gQWN0dWFsbHkgc3dhcHBpbmcgdGhlIFdlYlBh Z2VQcm94eSB0byB0aGUgbmV3IHByb2Nlc3MgYnkgY2FsbGluZyBwcm9jZXNzRGlkVGVybWluYXRl KCkgLyBzd2FwVG9XZWJQcm9jZXNzKCkuCisgICAgICAgIC0gU3VzcGVuZGluZyB0aGUgY3VycmVu dCBwYWdlLgorICAgICAgICAtIExldHRpbmcgdGhlIGNsaWVudCBrbm93IHRoZSBsb2FkIGlzIGNv bWl0dGVkCisgICAgICAgIC0gRGVzdHJveSB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkuCisgICAg ICAgIFRoaXMgd29yayB1c2VkIHRvIGhhcHBlbiBlYXJsaWVyIGluIGNvbnRpbnVlTmF2aWdhdGlv bkluTmV3UHJvY2VzcygpLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y29udGlu dWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKToKKyAgICAgICAgTW92ZWQgc29tZSBvZiB0aGUgbG9n aWMgdG8gY29tbWl0UHJvdmlzaW9uYWxQYWdlKCkuIFdlIG5vdyBtZXJlbHkgc3RhcnQgdGhlIGxv YWQgaW4gYSBuZXcgUHJvdmlzaW9uYWxQYWdlUHJveHksCisgICAgICAgIHdpdGhvdXQgYWN0dWFs bHkgaGF2aW5nIHRoZSBXZWJQYWdlUHJveHkgc3dpdGNoIHRvIHRoZSBuZXcgcHJvY2VzcyB5ZXQu CisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVdpbmRvdyk6CisgICAgICAg IERyb3Agc29tZSBjb2RlIHRoYXQgaXMgbm8gbG9uZ2VyIG5lZWRlZCwgbm93IHRoYXQgdGhlIFBy b3Zpc2lvbmFsUGFnZVByb3h5IHRha2VzIGNhcmUgb2YgdGhpcy4KKworICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmRpZERlc3Ryb3lOYXZpZ2F0aW9uKToKKyAgICAgICAgT24gcHJvY2Vz cy1zd2FwLCB3aGVuIHRlbGxpbmcgdGhlIHByZXZpb3VzIHByb2Nlc3MgdG8gaWdub3JlIHRoZSBs b2FkIGFuZCBzdGFydGluZyB0aGUgbmV3IGxvYWQgaW4gYSBuZXcKKyAgICAgICAgUHJvdmlzaW9u YWxQYWdlUHJveHksIHRoZSBwcmV2aW91cyBXZWJQYWdlIGF0dGVtcHRzIHRvIGRlc3Ryb3kgdGhl IG5hdmlnYXRpb24uIEluIHRoaXMgY2FzZSwgd2UgaWdub3JlCisgICAgICAgIHRoZSBjYWxsIHNp bmNlIHRoZSBuYXZpZ2F0aW9uIGlzIG1lcmVseSB0YWtlbiBvdmVyIGJ5IHRoZSBQcm92aXNpb25h bFBhZ2VQcm94eS4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICBNb3ZlZCBzb21lIFBTT04gbG9naWMgdG8g dGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGluc3RlYWQuCisKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICBXaGVu IGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSgpIGlzIGNhbGxlZCBmb3IgYSBQcm92aXNp b25hbFBhZ2VQcm94eSwgZGVzdHJveSBpdC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYyk6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UpOgorICAgICAgICBDYXB0 dXJlIHRoZSBwcm9jZXNzIGluIHRoZSBsYW1iZGEsIHRvIG1ha2Ugc3VyZSB3ZSBzZW5kIHRoZSBw b2xpY3kgZGVjaXNpb24gdG8gdGhlIHNhbWUgcHJvY2VzcyB0aGF0CisgICAgICAgIGFza2VkIGZv ciBpdCwgc28gYXMgdG8gbm90IGdldCBjb25mdXNlZCBieSBwcm9jZXNzIHN3YXBzLgorCisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVzZXRTdGF0ZSk6CisgICAgICAgIERyb3Agc29t ZSBjb2RlIHRoYXQgaXMgbm8gbG9uZ2VyIG5lZWRlZC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycyk6CisgICAgICAgIE1vdmUgdGhlIGhhc1JlZ2lz dGVyZWRTZXJ2aWNlV29ya2VycyBmbGFnIGluaXRpYWxpemF0aW9uIGZyb20gdGhlIGNhbGwgc2l0 ZSB0byBoZXJlIG5vdyB0aGF0IHdlIGhhdmUKKyAgICAgICAgbW9yZSB0aGFuIG9uZSBjYWxsIHNp dGUuIFRoaXMgd2FzIGp1c3Qgc29tZSBiYWQgZmFjdG9yaW5nLgorCisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6UGFnZVByb2Nlc3NPdmVycmlkZSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6flBh Z2VQcm9jZXNzT3ZlcnJpZGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp0ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2Vz cyk6CisgICAgICAgIEFkZCB1dGlsaXR5IGNsYXNzIHRvIHRlbXBvcmFyaWx5IG92ZXJyaWRlIHRo ZSBXZWJQYWdlUHJveHkncyBtX3Byb2Nlc3Mgd2l0aCB0aGUgcHJvdmlzaW9uYWwgb25lIHdoZW4K KyAgICAgICAgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGludGVyYWN0cyB3aXRoIHRoZSBXZWJQ YWdlUHJveHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjphZGRFeGlzdGluZ1dlYlBhZ2UpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6Omhhc1Byb3Zpc2lvbmFsUGFnZVdpdGhJRCBj b25zdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6dXBkYXRlQmFja0Zvcndh cmRJdGVtKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpjYW5UZXJtaW5hdGVD aGlsZFByb2Nlc3MpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjphZGRQcm92aXNpb25hbFBhZ2VQcm94eSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6cmVtb3ZlUHJvdmlzaW9uYWxQYWdl UHJveHkpOgorICAgICAgICAqIFdlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OnRvUG9saWN5QWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWU6OmRpZFJlY2VpdmVQ b2xpY3lEZWNpc2lvbik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw OgorICAgICAgICAoV2ViS2l0OjptX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNp dGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJlaW5pdGlhbGl6ZVdlYlBhZ2UpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24pOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRJc1N1c3BlbmRlZCk6CisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbToKKyAgICAg ICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OlRpbGVkQ29yZUFuaW1h dGlvbkRyYXdpbmdBcmVhKToKKwogMjAxOS0wMS0xMCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJp c3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjIzOTgxNSkgaHR0cC90 ZXN0cy93b3JrZXJzL3NlcnZpY2Uvc2VydmljZXdvcmtlci1wcml2YXRlLWJyb3dzaW5nLmh0dHBz Lmh0bWwgdGVzdCB0aW1lcyBvdXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmlu ZGV4IDRjMjZhNjk4MWI0NjRkYTU5MTZmMDVlYjczNTk2NjkxNTdlZTlmZmUuLmViZjk1MGJhNmMy ZWQ5MWY2MjMyYmQyYjVlZmI5Zjc5NTU3YWI1OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmNwcApAQCAtMjAzMiwxMSArMjAzMiwxMSBAQCB2b2lkIEZyYW1lTG9hZGVyOjpjb21t aXRQcm92aXNpb25hbExvYWQoKQogCiAgICAgICAgIE9wdGlvbmFsPEhhc0luc2VjdXJlQ29udGVu dD4gaGFzSW5zZWN1cmVDb250ZW50ID0gY2FjaGVkUGFnZS0+Y2FjaGVkTWFpbkZyYW1lKCktPmhh c0luc2VjdXJlQ29udGVudCgpOwogCisgICAgICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJ bnNlY3VyZUNvbnRlbnQpOworCiAgICAgICAgIC8vIEZJWE1FOiBUaGlzIEFQSSBzaG91bGQgYmUg dHVybmVkIGFyb3VuZCBzbyB0aGF0IHdlIGdyb3VuZCBDYWNoZWRQYWdlIGludG8gdGhlIFBhZ2Uu CiAgICAgICAgIGNhY2hlZFBhZ2UtPnJlc3RvcmUoKm1fZnJhbWUucGFnZSgpKTsKIAotICAgICAg ICBkaXNwYXRjaERpZENvbW1pdExvYWQoaGFzSW5zZWN1cmVDb250ZW50KTsKLQogI2lmIFBMQVRG T1JNKElPU19GQU1JTFkpCiAgICAgICAgIG1fZnJhbWUucGFnZSgpLT5jaHJvbWUoKS5zZXREaXNw YXRjaFZpZXdwb3J0RGF0YURpZENoYW5nZVN1cHByZXNzZWQoZmFsc2UpOwogICAgICAgICBtX2Zy YW1lLnBhZ2UoKS0+Y2hyb21lKCkuZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2Uo bV9mcmFtZS5wYWdlKCktPnZpZXdwb3J0QXJndW1lbnRzKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAppbmRleCBjYTJkZjQwZWUx ZGQyY2EzNmYzYTQ4YTA0NzU3Zjk3YmRiYjYzNjQ3Li42ZDA3YzAzYWQ4YzkyN2U1NDUzYzVmZGE5 NTk2NzA5YTc3MjYxZTJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzLmNwcApAQCAtNzMsNyArNzMsNyBAQCB2b2lkIFdlYlBhZ2VDcmVh dGlvblBhcmFtZXRlcnM6OmVuY29kZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAg ZW5jb2Rlci5lbmNvZGVFbnVtKGxheWVySG9zdGluZ01vZGUpOwogICAgIGVuY29kZXIgPDwgbWlt ZVR5cGVzV2l0aEN1c3RvbUNvbnRlbnRQcm92aWRlcnM7CiAgICAgZW5jb2RlciA8PCBjb250cm9s bGVkQnlBdXRvbWF0aW9uOwotICAgIGVuY29kZXIgPDwgaXNTd2FwRnJvbVN1c3BlbmRlZDsKKyAg ICBlbmNvZGVyIDw8IGlzUHJvY2Vzc1N3YXA7CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgZW5j b2RlciA8PCBjb2xvclNwYWNlOwpAQCAtMjI3LDcgKzIyNyw3IEBAIE9wdGlvbmFsPFdlYlBhZ2VD cmVhdGlvblBhcmFtZXRlcnM+IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZShJUEM6 OkRlY29kCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAgICAgaWYgKCFkZWNvZGVyLmRl Y29kZShwYXJhbWV0ZXJzLmNvbnRyb2xsZWRCeUF1dG9tYXRpb24pKQogICAgICAgICByZXR1cm4g V1RGOjpudWxsb3B0OwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5pc1N3YXBG cm9tU3VzcGVuZGVkKSkKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuaXNQcm9j ZXNzU3dhcCkpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKICNpZiBQTEFURk9STShN QUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJh bWV0ZXJzLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz LmgKaW5kZXggYWU0MzI1Y2JkNWYxZTU2NzYxNjU4NmY1ZTlmYTczZWU1YjM1YjkzNy4uYjM4MmNl ZWRkNDQ5YThkOWEwZjg2OTQ3MzVmMjZjMDU5NWRkZWNkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaApAQCAtMTI5LDcgKzEyOSw3IEBA IHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICAgICBWZWN0b3I8U3RyaW5nPiBt aW1lVHlwZXNXaXRoQ3VzdG9tQ29udGVudFByb3ZpZGVyczsKIAogICAgIGJvb2wgY29udHJvbGxl ZEJ5QXV0b21hdGlvbjsKLSAgICBib29sIGlzU3dhcEZyb21TdXNwZW5kZWQgeyBmYWxzZSB9Owor ICAgIGJvb2wgaXNQcm9jZXNzU3dhcCB7IGZhbHNlIH07CiAKICNpZiBQTEFURk9STShNQUMpCiAg ICAgQ29sb3JTcGFjZURhdGEgY29sb3JTcGFjZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv U2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5 QWN0aW9uLmgKaW5kZXggMTQyYTUxOGRmMDk3ZTVlZjJmYTE4MDQ4NGUwOWQwMzMzYzEwNWI4MS4u Mzk3MTc5NWM0NmE1MWIzODgxOGM1NWI3NmQ2NTNhMzRiNTI4OWU5YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9T aGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKQEAgLTI5LDExICsyOSwxMSBAQAogCiBuYW1lc3BhY2Ug V2ViS2l0IHsKIAorLy8gRklYTUU6IFJlbW92ZSB0aGlzIHR5cGUgYW5kIHVzZSBXZWJDb3JlOjpQ b2xpY3lBY3Rpb24gaW5zdGVhZC4KIGVudW0gY2xhc3MgV2ViUG9saWN5QWN0aW9uIDogdWludDhf dCB7CiAgICAgVXNlLAogICAgIERvd25sb2FkLAotICAgIElnbm9yZSwKLSAgICBTdXNwZW5kCisg ICAgSWdub3JlCiB9OwogCiB9CkBAIC00NSw4ICs0NSw3IEBAIHRlbXBsYXRlPD4gc3RydWN0IEVu dW1UcmFpdHM8V2ViS2l0OjpXZWJQb2xpY3lBY3Rpb24+IHsKICAgICAgICAgV2ViS2l0OjpXZWJQ b2xpY3lBY3Rpb24sCiAgICAgICAgIFdlYktpdDo6V2ViUG9saWN5QWN0aW9uOjpVc2UsCiAgICAg ICAgIFdlYktpdDo6V2ViUG9saWN5QWN0aW9uOjpEb3dubG9hZCwKLSAgICAgICAgV2ViS2l0OjpX ZWJQb2xpY3lBY3Rpb246Oklnbm9yZSwKLSAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246 OlN1c3BlbmQKKyAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246Oklnbm9yZQogICAgID47 CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMudHh0IGIvU291cmNlL1dl YktpdC9Tb3VyY2VzLnR4dAppbmRleCBhMGI2ZjcyODQ2MDQxYzI2M2E1NDc2NzEwZWFjOTg3ZmVk MWQxNjA0Li44YWVjYjg2NDcyNTAyZDAyN2EzNGFmMzcxOWRkODI4YjAwN2RiMTE2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMudHh0CisrKyBiL1NvdXJjZS9XZWJLaXQvU291cmNl cy50eHQKQEAgLTIzMCw2ICsyMzAsNyBAQCBVSVByb2Nlc3MvSW5zcGVjdG9yVGFyZ2V0UHJveHku Y3BwCiBVSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5jcHAKIFVJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0 aW9uLmNwcAogVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuY3BwCitVSVByb2Nlc3MvUHJvdmlz aW9uYWxQYWdlUHJveHkuY3BwCiBVSVByb2Nlc3MvUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkuY3Bw CiBVSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NUaW1lci5jcHAKIFVJUHJvY2Vzcy9TZXJ2aWNlV29y a2VyUHJvY2Vzc1Byb3h5LmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXcubW0KaW5kZXggY2YxOTE5YzkzYTczODUzMDc1OWUzN2YzM2RiYjEwYjRjZDA0 NTg3OC4uYzc5ZmNiMjEwYjUxNTU1MDg4ZTFkZjg2ZmNhOTY1NTFjNjMyYThkNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC00NCw2ICs0 NCw3IEBACiAjaW1wb3J0ICJOYXZpZ2F0aW9uU3RhdGUuaCIKICNpbXBvcnQgIk9iakNPYmplY3RH cmFwaC5oIgogI2ltcG9ydCAiUGFnZUNsaWVudC5oIgorI2ltcG9ydCAiUHJvdmlzaW9uYWxQYWdl UHJveHkuaCIKICNpbXBvcnQgIlJlbW90ZUxheWVyVHJlZVNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0 YS5oIgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24uaCIKICNpbXBvcnQgIlJl bW90ZU9iamVjdFJlZ2lzdHJ5LmgiCkBAIC00NjY0LDYgKzQ2NjUsMTEgQEAgLSAodm9pZClfa2ls bFdlYkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRTdGF0ZQogewogICAgIFJlZjxXZWJLaXQ6OldlYlBy b2Nlc3NQcm94eT4gcHJvdGVjdGVkUHJvY2Vzc1Byb3h5KF9wYWdlLT5wcm9jZXNzKCkpOwogICAg IHByb3RlY3RlZFByb2Nlc3NQcm94eS0+cmVxdWVzdFRlcm1pbmF0aW9uKFdlYktpdDo6UHJvY2Vz c1Rlcm1pbmF0aW9uUmVhc29uOjpSZXF1ZXN0ZWRCeUNsaWVudCk7CisKKyAgICBpZiAoYXV0byog cHJvdmlzaW9uYWxQYWdlUHJveHkgPSBfcGFnZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKSkgewor ICAgICAgICBSZWY8V2ViS2l0OjpXZWJQcm9jZXNzUHJveHk+IHByb3RlY3RlZFByb2Nlc3NQcm94 eShwcm92aXNpb25hbFBhZ2VQcm94eS0+cHJvY2VzcygpKTsKKyAgICAgICAgcHJvdGVjdGVkUHJv Y2Vzc1Byb3h5LT5yZXF1ZXN0VGVybWluYXRpb24oV2ViS2l0OjpQcm9jZXNzVGVybWluYXRpb25S ZWFzb246OlJlcXVlc3RlZEJ5Q2xpZW50KTsKKyAgICB9CiB9CiAKICNpZiBQTEFURk9STShNQUMp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmggYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKaW5kZXggMGI4NThjNDZlZTQ3NGQ2OTZk ZGMzZDQzNWJkNTRjMTMyMzAwM2MyZC4uNmYzZGY4NDUyYjMxZTM0ZWI3ZmFmNGFjZDBmZDdlMDQ3 ZWU5ZjA3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFnZUNsaWVudC5o CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaApAQCAtNDgsNiArNDgs NyBAQAogCiBPQkpDX0NMQVNTIENBTGF5ZXI7CiBPQkpDX0NMQVNTIE5TRmlsZVdyYXBwZXI7CitP QkpDX0NMQVNTIE5TTWVudTsKIE9CSkNfQ0xBU1MgTlNTZXQ7CiBPQkpDX0NMQVNTIFdLRHJhd2lu Z1ZpZXc7CiBPQkpDX0NMQVNTIF9XS1JlbW90ZU9iamVjdFJlZ2lzdHJ5OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmE2 NjlmNDQwYjNlYmY0MjA3NzAyMDZmOGEyOWFmYmY0ZWMzYzQ1MmUKLS0tIC9kZXYvbnVsbAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAKQEAgLTAs MCArMSwyODggQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTkgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0 OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBh Ym92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5h cnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4g dGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQg d2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQg QlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkg RVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE IFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJ VE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8g RVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUg Rk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlks IE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE IFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9T UyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04p IEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJ TgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdM SUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT RSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAi UHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKKworI2luY2x1ZGUgIkFQSU5hdmlnYXRpb24uaCIKKyNp bmNsdWRlICJEcmF3aW5nQXJlYVByb3h5LmgiCisjaW5jbHVkZSAiTG9nZ2luZy5oIgorI2luY2x1 ZGUgIlBhZ2VDbGllbnQuaCIKKyNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3QuaCIKKyNpbmNs dWRlICJXZWJCYWNrRm9yd2FyZExpc3RJdGVtLmgiCisjaW5jbHVkZSAiV2ViRXJyb3JzLmgiCisj aW5jbHVkZSAiV2ViTmF2aWdhdGlvblN0YXRlLmgiCisjaW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2Vz LmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5TWVz c2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNzTWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQ cm9jZXNzUHJveHkuaCIKKyNpbmNsdWRlIDxXZWJDb3JlL1Nob3VsZFRyZWF0QXNDb250aW51aW5n TG9hZC5oPgorCituYW1lc3BhY2UgV2ViS2l0IHsKKworI2RlZmluZSBSRUxFQVNFX0xPR19JRl9B TExPV0VEKGNoYW5uZWwsIGZtdCwgLi4uKSBSRUxFQVNFX0xPR19JRihtX3BhZ2UuaXNBbHdheXNP bkxvZ2dpbmdBbGxvd2VkKCksIGNoYW5uZWwsICIlcCAtIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojoi IGZtdCwgdGhpcywgIyNfX1ZBX0FSR1NfXykKKworUHJvdmlzaW9uYWxQYWdlUHJveHk6OlByb3Zp c2lvbmFsUGFnZVByb3h5KFdlYlBhZ2VQcm94eSYgcGFnZSwgUmVmPFdlYlByb2Nlc3NQcm94eT4m JiBwcm9jZXNzLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiBzdXNwZW5kZWRQ YWdlLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGJvb2wgaXNTZXJ2ZXJSZWRpcmVjdCwgY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5 Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpCisgICAgOiBtX3BhZ2UocGFnZSkK KyAgICAsIG1fcHJvY2VzcyhXVEZNb3ZlKHByb2Nlc3MpKQorICAgICwgbV9uYXZpZ2F0aW9uSUQo bmF2aWdhdGlvbklEKQorICAgICwgbV9pc1NlcnZlclJlZGlyZWN0KGlzU2VydmVyUmVkaXJlY3Qp CisgICAgLCBtX3JlcXVlc3QocmVxdWVzdCkKKyAgICAsIG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRC eUNsaWVudChwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KQorI2lmIFBMQVRGT1JNKElPU19G QU1JTFkpCisgICAgLCBtX3N1c3BlbnNpb25Ub2tlbihtX3Byb2Nlc3MtPnRocm90dGxlcigpLmJh Y2tncm91bmRBY3Rpdml0eVRva2VuKCkpCisjZW5kaWYKK3sKKyAgICBtX3Byb2Nlc3MtPmFkZE1l c3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1l KCksIG1fcGFnZS5wYWdlSUQoKSwgKnRoaXMpOworICAgIG1fcHJvY2Vzcy0+YWRkUHJvdmlzaW9u YWxQYWdlUHJveHkoKnRoaXMpOworCisgICAgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsKKworICAgIC8v IElmIHdlIGFyZSByZWF0dGFjaGluZyB0byBhIFN1c3BlbmRlZFBhZ2UsIHRoZW4gdGhlIFdlYlBy b2Nlc3MnIFdlYlBhZ2UgYWxyZWFkeSBleGlzdHMgYW5kCisgICAgLy8gV2ViUGFnZVByb3h5Ojpk aWRDcmVhdGVNYWluRnJhbWUoKSB3aWxsIG5vdCBiZSBjYWxsZWQgdG8gaW5pdGlhbGl6ZSBtX21h aW5GcmFtZS4gSW4gc3VjaAorICAgIC8vIGNhc2UsIHdlIG5lZWQgdG8gaW5pdGlhbGl6ZSBtX21h aW5GcmFtZSB0byByZWZsZWN0IHRoZSBmYWN0IHRoZSB0aGUgV2ViUHJvY2VzcycgV2ViUGFnZQor ICAgIC8vIGFscmVhZHkgZXhpc3RzIGFuZCBhbHJlYWR5IGhhcyBhIG1haW4gZnJhbWUuCisgICAg aWYgKHN1c3BlbmRlZFBhZ2UpIHsKKyAgICAgICAgQVNTRVJUKCZzdXNwZW5kZWRQYWdlLT5wcm9j ZXNzKCkgPT0gbV9wcm9jZXNzLnB0cigpKTsKKyAgICAgICAgc3VzcGVuZGVkUGFnZS0+dW5zdXNw ZW5kKCk7CisgICAgICAgIG1fbWFpbkZyYW1lID0gV2ViRnJhbWVQcm94eTo6Y3JlYXRlKG1fcGFn ZSwgc3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSk7CisgICAgICAgIG1fcHJvY2Vzcy0+ZnJh bWVDcmVhdGVkKHN1c3BlbmRlZFBhZ2UtPm1haW5GcmFtZUlEKCksICptX21haW5GcmFtZSk7Cisg ICAgfQorfQorCitQcm92aXNpb25hbFBhZ2VQcm94eTo6flByb3Zpc2lvbmFsUGFnZVByb3h5KCkK K3sKKyAgICBtX3Byb2Nlc3MtPnJlbW92ZVByb3Zpc2lvbmFsUGFnZVByb3h5KCp0aGlzKTsKKwor ICAgIGlmIChtX3dhc0NvbW1pdHRlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9wcm9jZXNz LT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJl Y2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNz YWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKworICAgIGlmIChtX2Ry YXdpbmdBcmVhKSB7CisgICAgICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50 ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgICAgICBtX2RyYXdpbmdB cmVhID0gbnVsbHB0cjsKKyAgICB9CisKKyAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3By b2Nlc3MgPSBtX3Byb2Nlc3MuY29weVJlZigpXSB7CisgICAgICAgIHByb2Nlc3MtPm1heWJlU2h1 dERvd24oKTsKKyAgICB9KTsKK30KKworc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+ IFByb3Zpc2lvbmFsUGFnZVByb3h5Ojp0YWtlRHJhd2luZ0FyZWEoKQoreworICAgIHJldHVybiBX VEZNb3ZlKG1fZHJhd2luZ0FyZWEpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpj YW5jZWwoKQoreworICAgIC8vIElmIHRoZSBwcm92aXNpb25hbCBsb2FkIHN0YXJ0ZWQsIHRoZW4g aW5kaWNhdGUgdGhhdCBpdCBmYWlsZWQgZHVlIHRvIGNhbmNlbGxhdGlvbiBieSBjYWxsaW5nIGRp ZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSgpLgorICAgIGlmIChtX3Byb3Zpc2lvbmFsTG9h ZFVSTC5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKworICAgIFJFTEVBU0VfTE9HX0lGX0FM TE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiY2FuY2VsOiBTaW11bGF0aW5nIGEgZGlkRmFpbFByb3Zp c2lvbmFsTG9hZEZvckZyYW1lIGZvciBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQo KSk7CisgICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKKyAgICBhdXRvIGVycm9yID0gV2ViS2l0Ojpj YW5jZWxsZWRFcnJvcihtX3JlcXVlc3QpOworICAgIGVycm9yLnNldFR5cGUoV2ViQ29yZTo6UmVz b3VyY2VFcnJvcjo6VHlwZTo6Q2FuY2VsbGF0aW9uKTsKKyAgICBkaWRGYWlsUHJvdmlzaW9uYWxM b2FkRm9yRnJhbWUobV9tYWluRnJhbWUtPmZyYW1lSUQoKSwgeyB9LCBtX25hdmlnYXRpb25JRCwg bV9wcm92aXNpb25hbExvYWRVUkwsIGVycm9yLCBVc2VyRGF0YSB7IH0pOyAvLyBXaWxsIGRlbGV0 ZSB8dGhpc3wuCit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQ YWdlKCkKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJp bHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBtX2RyYXdpbmdBcmVhID0gbV9wYWdl LnBhZ2VDbGllbnQoKS5jcmVhdGVEcmF3aW5nQXJlYVByb3h5KCk7CisKKyAgICBhdXRvIHBhcmFt ZXRlcnMgPSBtX3BhZ2UuY3JlYXRpb25QYXJhbWV0ZXJzKCk7CisgICAgcGFyYW1ldGVycy5pc1By b2Nlc3NTd2FwID0gdHJ1ZTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlByb2Nl c3M6OkNyZWF0ZVdlYlBhZ2UobV9wYWdlLnBhZ2VJRCgpLCBwYXJhbWV0ZXJzKSwgMCk7Cit9CisK K3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpO YXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEsIGNv bnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmlu ZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNp ZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJp ZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBt X3BhZ2UubG9hZERhdGFXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCBkYXRhLCBNSU1FVHlwZSwg ZW5jb2RpbmcsIGJhc2VVUkwsIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGlu dWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKK30KKwordm9pZCBQcm92 aXNpb25hbFBhZ2VQcm94eTo6bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRp b24mIG5hdmlnYXRpb24sIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFdlYkNv cmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3kgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1Bv bGljeSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRh PiYmIHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBt X3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBtX3BhZ2Uu bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCBXVEZNb3ZlKHJlcXVlc3QpLCBz aG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJl YXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Cit9CisK K3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0oQVBJOjpOYXZp Z2F0aW9uJiBuYXZpZ2F0aW9uLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtJiBpdGVtLCBPcHRpb25h bDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBhdXRvIGl0 ZW1TdGF0ZXMgPSBtX3BhZ2UuYmFja0ZvcndhcmRMaXN0KCkuZmlsdGVyZWRJdGVtU3RhdGVzKFt0 aGlzLCB0YXJnZXRJdGVtID0gJml0ZW1dKGF1dG8mIGl0ZW0pIHsKKyAgICAgICAgaWYgKGF1dG8q IHBhZ2UgPSBpdGVtLnN1c3BlbmRlZFBhZ2UoKSkgeworICAgICAgICAgICAgaWYgKCZwYWdlLT5w cm9jZXNzKCkgPT0gbV9wcm9jZXNzLnB0cigpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gJml0ZW0gIT0gdGFyZ2V0SXRlbTsKKyAgICB9 KTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlVwZGF0ZUJhY2tGb3J3 YXJkTGlzdEZvclJlYXR0YWNoKFdURk1vdmUoaXRlbVN0YXRlcykpLCBtX3BhZ2UucGFnZUlEKCkp OworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJk SXRlbShuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBpdGVtLml0ZW1JRCgpLCAqbmF2aWdhdGlv bi5iYWNrRm9yd2FyZEZyYW1lTG9hZFR5cGUoKSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRp bnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSksIG1fcGFnZS5wYWdlSUQo KSk7CisgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKK30KKwor dm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKHVpbnQ2NF90IGZy YW1lSUQpCit7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJk aWRDcmVhdGVNYWluRnJhbWU6IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJ dTY0LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQpOworICAgIEFTU0VSVCghbV9tYWluRnJhbWUp OworCisgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5OjpjcmVhdGUobV9wYWdlLCBmcmFt ZUlEKTsKKworICAgIC8vIEFkZCB0aGUgZnJhbWUgdG8gdGhlIHByb2Nlc3Mgd2lkZSBtYXAuCisg ICAgbV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoZnJhbWVJRCwgKm1fbWFpbkZyYW1lKTsKKworICAg IC8vIFRoaXMgbmF2aWdhdGlvbiB3YXMgZGVzdHJveWVkIHNvIG5vIG5lZWQgdG8gbm90aWZ5IG9m IHJlZGlyZWN0LgorICAgIGlmICghbV9wYWdlLm5hdmlnYXRpb25TdGF0ZSgpLmhhc05hdmlnYXRp b24obV9uYXZpZ2F0aW9uSUQpKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBSZXN0b3JlIHRo ZSBtYWluIGZyYW1lJ3MgY29tbWl0dGVkIFVSTCBhcyBzb21lIGNsaWVudHMgbWF5IHJlbHkgb24g aXQgdW50aWwgdGhlIG5leHQgbG9hZCBpcyBjb21taXR0ZWQuCisgICAgaWYgKGF1dG8qIG1haW5G cmFtZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAgICAgbV9tYWluRnJhbWUtPmZyYW1lTG9h ZFN0YXRlKCkuc2V0VVJMKG1haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS51cmwoKSk7CisKKyAg ICAvLyBOb3JtYWxseSwgbm90aWZpY2F0aW9uIG9mIGEgc2VydmVyIHJlZGlyZWN0IGNvbWVzIGZy b20gdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KKyAgICAvLyBJZiB3ZSBhcmUgcHJvY2VzcyBzd2Fw cGluZyBpbiByZXNwb25zZSB0byBhIHNlcnZlciByZWRpcmVjdCB0aGVuIHRoYXQgbm90aWZpY2F0 aW9uIHdpbGwgbm90IGNvbWUgZnJvbSB0aGUgbmV3IFdlYkNvbnRlbnQgcHJvY2Vzcy4KKyAgICAv LyBJbiB0aGlzIGNhc2Ugd2UgaGF2ZSB0aGUgVUlQcm9jZXNzIHN5bnRoZXNpemUgdGhlIHJlZGly ZWN0IG5vdGlmaWNhdGlvbiBhdCB0aGUgYXBwcm9wcmlhdGUgdGltZS4KKyAgICBpZiAobV9pc1Nl cnZlclJlZGlyZWN0KSB7CisgICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLmRp ZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKG1fcmVxdWVzdC51cmwoKSk7CisKKyAgICAgICAgYXV0byBw YWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1f cHJvY2Vzcyk7CisgICAgICAgIG1fcGFnZS5kaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92 aXNpb25hbExvYWRGb3JGcmFtZShtX21haW5GcmFtZS0+ZnJhbWVJRCgpLCBtX25hdmlnYXRpb25J RCwgV1RGTW92ZShtX3JlcXVlc3QpLCB7IH0pOworICAgIH0KK30KKwordm9pZCBQcm92aXNpb25h bFBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFt ZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmIHVybCwgVVJMJiYgdW5yZWFjaGFibGVV UkwsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICAvLyBJZiB0aGUgcHJldmlvdXMg cHJvdmlzaW9uYWwgbG9hZCB1c2VkIHRoZSBzYW1lIHByb2Nlc3MsIHdlIG1heSByZWNlaXZlIElQ QyBmb3IgdGhpcyBwcmV2aW91cyBwcm92aXNpb25hbCdzIG1haW4gZnJhbWUgdGhhdCB3ZSBuZWVk IHRvIGlnbm9yZS4KKyAgICBpZiAoIW1fbWFpbkZyYW1lIHx8IG1fbWFpbkZyYW1lLT5mcmFtZUlE KCkgIT0gZnJhbWVJRCkKKyAgICAgICAgcmV0dXJuOworCisgICAgUkVMRUFTRV9MT0dfSUZfQUxM T1dFRChQcm9jZXNzU3dhcHBpbmcsICJkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOiBw YWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQg PSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSwgZnJhbWVJRCwgbmF2aWdhdGlvbklEKTsKKyAg ICBBU1NFUlQobV9wcm92aXNpb25hbExvYWRVUkwuaXNOdWxsKCkpOworICAgIG1fcHJvdmlzaW9u YWxMb2FkVVJMID0gdXJsOworCisgICAgLy8gTWVyZWx5IGZvbGxvd2luZyBhIHNlcnZlciBzaWRl IHJlZGlyZWN0IHNvIHRoZXJlIGlzIG5vIG5lZWQgdG8gc2VuZCBhIGRpZFN0YXJ0UHJvdmlzaW9u YWxMb2FkIGFnYWluLgorICAgIGlmIChtX2lzU2VydmVyUmVkaXJlY3QpCisgICAgICAgIHJldHVy bjsKKworICAgIC8vIENsaWVudHMgZXhwZWN0IHRoZSBQYWdlJ3MgbWFpbiBmcmFtZSdzIGV4cGVj dGVkVVJMIHRvIGJlIHRoZSBwcm92aXNpb25hbCBvbmUgd2hlbiBhIHByb3Zpc2lvbmFsIGxvYWQg aXMgc3RhcnRlZC4KKyAgICBpZiAoYXV0byogcGFnZU1haW5GcmFtZSA9IG1fcGFnZS5tYWluRnJh bWUoKSkKKyAgICAgICAgcGFnZU1haW5GcmFtZS0+ZGlkU3RhcnRQcm92aXNpb25hbExvYWQodXJs KTsKKworICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92 ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgIG1fcGFnZS5kaWRTdGFydFByb3Zpc2lvbmFs TG9hZEZvckZyYW1lKGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgV1RGTW92ZSh1cmwpLCBXVEZNb3Zl KHVucmVhY2hhYmxlVVJMKSwgdXNlckRhdGEpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVBy b3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29u c3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50 NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdl YkNvcmU6OlJlc291cmNlRXJyb3ImIGVycm9yLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCit7 CisgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJp ZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nl c3NTd2FwcGluZywgImRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZTogcGFnZUlEID0gJSIg UFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEID0gJSIgUFJJdTY0 LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCk7CisgICAgbV9wcm92aXNp b25hbExvYWRVUkwgPSB7IH07CisKKyAgICAvLyBNYWtlIHN1cmUgdGhlIFBhZ2UncyBtYWluIGZy YW1lJ3MgZXhwZWN0ZWRVUkwgZ2V0cyBjbGVhcmVkIHNpbmNlIHdlIHVwZGF0ZWQgaXQgaW4gZGlk U3RhcnRQcm92aXNpb25hbExvYWQuCisgICAgaWYgKGF1dG8qIHBhZ2VNYWluRnJhbWUgPSBtX3Bh Z2UubWFpbkZyYW1lKCkpCisgICAgICAgIHBhZ2VNYWluRnJhbWUtPmRpZEZhaWxQcm92aXNpb25h bExvYWQoKTsKKworICAgIG1fcGFnZS5kaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoZnJh bWVJRCwgZnJhbWVTZWN1cml0eU9yaWdpbiwgbmF2aWdhdGlvbklELCBwcm92aXNpb25hbFVSTCwg ZXJyb3IsIHVzZXJEYXRhKTsgLy8gV2lsbCBkZWxldGUgfHRoaXN8LgorfQorCit2b2lkIFByb3Zp c2lvbmFsUGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwg dWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1l SGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBX ZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5mbywgYm9vbCBjb250YWluc1Bs dWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNl ZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAgIC8v IElmIHRoZSBwcmV2aW91cyBwcm92aXNpb25hbCBsb2FkIHVzZWQgdGhlIHNhbWUgcHJvY2Vzcywg d2UgbWF5IHJlY2VpdmUgSVBDIGZvciB0aGlzIHByZXZpb3VzIHByb3Zpc2lvbmFsJ3MgbWFpbiBm cmFtZSB0aGF0IHdlIG5lZWQgdG8gaWdub3JlLgorICAgIGlmICghbV9tYWluRnJhbWUgfHwgbV9t YWluRnJhbWUtPmZyYW1lSUQoKSAhPSBmcmFtZUlEKQorICAgICAgICByZXR1cm47CisKKyAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZENvbW1pdExvYWRGb3JG cmFtZTogcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgbmF2aWdh dGlvbklEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQsIG5hdmlnYXRpb25J RCk7CisgICAgbV9wcm92aXNpb25hbExvYWRVUkwgPSB7IH07CisgICAgbV9wcm9jZXNzLT5yZW1v dmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVy TmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAgbV93YXNDb21taXR0ZWQgPSB0cnVlOwor ICAgIG1fcGFnZS5jb21taXRQcm92aXNpb25hbFBhZ2UoZnJhbWVJRCwgbmF2aWdhdGlvbklELCBt aW1lVHlwZSwgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIGZyYW1lTG9hZFR5cGUsIGNl cnRpZmljYXRlSW5mbywgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgZm9yY2VkSGFzSW5zZWN1cmVD b250ZW50LCB1c2VyRGF0YSk7IC8vIFdpbGwgZGVsZXRlIHx0aGlzfC4KK30KKwordm9pZCBQcm92 aXNpb25hbFBhZ2VQcm94eTo6ZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiBjb25u ZWN0aW9uLCBJUEM6OkRlY29kZXImIGRlY29kZXIpCit7CisgICAgQVNTRVJUKGRlY29kZXIubWVz c2FnZVJlY2VpdmVyTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNl aXZlck5hbWUoKSk7CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OkRpZFN0YXJ0UHJvZ3Jlc3M6Om5hbWUoKQorICAgICAgICB8fCBkZWNv ZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ2hhbmdlUHJv Z3Jlc3M6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6QmFja0ZvcndhcmRBZGRJdGVtOjpuYW1lKCkKKyAgICAgICAgfHwg ZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkxvZ0RpYWdu b3N0aWNNZXNzYWdlOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09 IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aEVuaGFuY2Vk UHJpdmFjeTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpTZXROZXR3b3JrUmVxdWVzdHNJblByb2dyZXNzOjpuYW1lKCkK KyNpZiBQTEFURk9STShDT0NPQSkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09 IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlJlZ2lzdGVyV2ViUHJvY2Vzc0FjY2Vzc2liaWxpdHlU b2tlbjo6bmFtZSgpCisjZW5kaWYKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09 IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25B c3luYzo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpTdGFydFVSTFNjaGVtZVRhc2s6Om5hbWUoKQorICAgICAgICB8fCBk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGVjaWRlUG9s aWN5Rm9yUmVzcG9uc2U6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkg PT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0OjpuYW1l KCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OkRpZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWU6Om5hbWUoKQorICAgICAgICB8 fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkTmF2 aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGE6Om5hbWUoKSkKKyAgICB7CisgICAgICAgIGF1dG8gcGFn ZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3By b2Nlc3MpOworICAgICAgICBtX3BhZ2UuZGlkUmVjZWl2ZU1lc3NhZ2UoY29ubmVjdGlvbiwgZGVj b2Rlcik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdl TmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENyZWF0ZU1haW5GcmFtZTo6bmFt ZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjpEaWRDcmVhdGVNYWluRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94 eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlm IChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU3Rh cnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxl TWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lPihkZWNvZGVyLCB0aGlzLCAmUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYg KGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRGYWls UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6Om5hbWUoKSkgeworICAgICAgICBJUEM6OmhhbmRsZU1l c3NhZ2U8TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lPihkZWNvZGVyLCB0aGlzLCAmUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNp b25hbExvYWRGb3JGcmFtZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVj b2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENvbW1pdExv YWRGb3JGcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpEaWRDb21taXRMb2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQ cm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKTsKKyAgICAgICAgcmV0 dXJuOworICAgIH0KKworICAgIExPRyhQcm9jZXNzU3dhcHBpbmcsICJVbmhhbmRsZWQgbWVzc2Fn ZSAlczo6JXMgZnJvbSBwcm92aXNpb25hbCBwcm9jZXNzIiwgZGVjb2Rlci5tZXNzYWdlUmVjZWl2 ZXJOYW1lKCkudG9TdHJpbmcoKS5kYXRhKCksIGRlY29kZXIubWVzc2FnZU5hbWUoKS50b1N0cmlu ZygpLmRhdGEoKSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVT eW5jTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIElQQzo6RGVjb2RlciYgZGVj b2Rlciwgc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mIGVuY29kZXIpCit7CisgICAgaWYg KGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpCYWNrRm9y d2FyZEl0ZW1BdEluZGV4OjpuYW1lKCkgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3Nh Z2VzOjpXZWJQYWdlUHJveHk6OkJhY2tGb3J3YXJkR29Ub0l0ZW06Om5hbWUoKSkgeworICAgICAg ICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVBy b2Nlc3MobV9wcm9jZXNzKTsKKyAgICAgICAgbV9wYWdlLmRpZFJlY2VpdmVTeW5jTWVzc2FnZShj b25uZWN0aW9uLCBkZWNvZGVyLCBlbmNvZGVyKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwor ICAgIExPRyhQcm9jZXNzU3dhcHBpbmcsICJVbmhhbmRsZWQgc3luYyBtZXNzYWdlICVzOjolcyBm cm9tIHByb3Zpc2lvbmFsIHByb2Nlc3MiLCBkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKS50 b1N0cmluZygpLmRhdGEoKSwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgp KTsKK30KKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lZGMxNDE1NTQ5YmNiNThlOTc4 ZDM2MWE4NzQwMjFhYWM2MWU0ODcwCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuaApAQCAtMCwwICsxLDg5IEBACisvKgorICog Q29weXJpZ2h0IChDKSAyMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisg KiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRo IG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0 IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0 aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAg ICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1 Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0 aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRh dGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlv bi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElU UyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBX QVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVE IFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VM QVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElO Qy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJ UkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElB TCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YK KyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQ Uk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQg T04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJ Q1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0Up CisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwg RVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisg Ki8KKworI3ByYWdtYSBvbmNlCisKKyNpbmNsdWRlICJNZXNzYWdlUmVjZWl2ZXIuaCIKKworbmFt ZXNwYWNlIFdlYkNvcmUgeworY2xhc3MgUmVzb3VyY2VSZXF1ZXN0OworfQorCituYW1lc3BhY2Ug V2ViS2l0IHsKKworY2xhc3MgRHJhd2luZ0FyZWFQcm94eTsKK2NsYXNzIFN1c3BlbmRlZFBhZ2VQ cm94eTsKK2NsYXNzIFdlYkZyYW1lUHJveHk7CitjbGFzcyBXZWJQYWdlUHJveHk7CitjbGFzcyBX ZWJQcm9jZXNzUHJveHk7CisKK2NsYXNzIFByb3Zpc2lvbmFsUGFnZVByb3h5IDogcHVibGljIElQ Qzo6TWVzc2FnZVJlY2VpdmVyIHsKKyAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKK3B1Ymxp YzoKKyAgICBQcm92aXNpb25hbFBhZ2VQcm94eShXZWJQYWdlUHJveHkmLCBSZWY8V2ViUHJvY2Vz c1Byb3h5PiYmLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiwgdWludDY0X3Qg bmF2aWdhdGlvbklELCBib29sIGlzU2VydmVyUmVkaXJlY3QsIGNvbnN0IFdlYkNvcmU6OlJlc291 cmNlUmVxdWVzdCYsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpOworICAgIH5Qcm92aXNp b25hbFBhZ2VQcm94eSgpOworCisgICAgV2ViUGFnZVByb3h5JiBwYWdlKCkgeyByZXR1cm4gbV9w YWdlOyB9CisgICAgV2ViRnJhbWVQcm94eSogbWFpbkZyYW1lKCkgY29uc3QgeyByZXR1cm4gbV9t YWluRnJhbWUuZ2V0KCk7IH0KKyAgICBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MoKSB7IHJldHVy biBtX3Byb2Nlc3MuZ2V0KCk7IH0KKyAgICBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHBy b2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQoKSBjb25zdCB7IHJldHVybiBtX3Byb2Nlc3NTd2Fw UmVxdWVzdGVkQnlDbGllbnQ7IH0KKyAgICB1aW50NjRfdCBuYXZpZ2F0aW9uSUQoKSBjb25zdCB7 IHJldHVybiBtX25hdmlnYXRpb25JRDsgfQorCisgICAgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdB cmVhUHJveHk+IHRha2VEcmF3aW5nQXJlYSgpOworCisgICAgdm9pZCBsb2FkRGF0YVdpdGhOYXZp Z2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYsIGNvbnN0 IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYg YmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNE YXRhPiYmID0gV1RGOjpudWxsb3B0KTsKKyAgICB2b2lkIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRp b24oQVBJOjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6 OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0 aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7CisgICAgdm9pZCBn b1RvQmFja0ZvcndhcmRJdGVtKEFQSTo6TmF2aWdhdGlvbiYsIFdlYkJhY2tGb3J3YXJkTGlzdEl0 ZW0mLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmKTsKKyAgICB2b2lkIGNhbmNlbCgp OworCitwcml2YXRlOgorICAgIC8vIElQQzo6TWVzc2FnZVJlY2VpdmVyCisgICAgdm9pZCBkaWRS ZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImKSBmaW5hbDsKKyAg ICB2b2lkIGRpZFJlY2VpdmVTeW5jTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29k ZXImLCBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVyPiYpIGZpbmFsOworCisgICAgdm9pZCBk aWRDcmVhdGVNYWluRnJhbWUodWludDY0X3QgZnJhbWVJRCk7CisgICAgdm9pZCBkaWRTdGFydFBy b3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRp b25JRCwgVVJMJiYsIFVSTCYmIHVucmVhY2hhYmxlVVJMLCBjb25zdCBVc2VyRGF0YSYpOworICAg IHZvaWQgZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5h dmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNv bnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2Vy dGlmaWNhdGVJbmZvJiwgYm9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJD b3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3Qg VXNlckRhdGEmKTsKKyAgICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50 NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2Vj dXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNp b25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIGNvbnN0IFVzZXJEYXRhJik7 CisKKyAgICB2b2lkIGluaXRpYWxpemVXZWJQYWdlKCk7CisKKyAgICBXZWJQYWdlUHJveHkmIG1f cGFnZTsKKyAgICBSZWY8V2ViUHJvY2Vzc1Byb3h5PiBtX3Byb2Nlc3M7CisgICAgc3RkOjp1bmlx dWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IG1fZHJhd2luZ0FyZWE7CisgICAgUmVmUHRyPFdlYkZy YW1lUHJveHk+IG1fbWFpbkZyYW1lOworICAgIHVpbnQ2NF90IG1fbmF2aWdhdGlvbklEOworICAg IGJvb2wgbV9pc1NlcnZlclJlZGlyZWN0OworICAgIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCBt X3JlcXVlc3Q7CisgICAgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBtX3Byb2Nlc3NTd2Fw UmVxdWVzdGVkQnlDbGllbnQ7CisgICAgYm9vbCBtX3dhc0NvbW1pdHRlZCB7IGZhbHNlIH07Cisg ICAgVVJMIG1fcHJvdmlzaW9uYWxMb2FkVVJMOworCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkK KyAgICBQcm9jZXNzVGhyb3R0bGVyOjpCYWNrZ3JvdW5kQWN0aXZpdHlUb2tlbiBtX3N1c3BlbnNp b25Ub2tlbjsKKyNlbmRpZgorfTsKKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcAppbmRleCBmMTk4YTgxNTMz Zjc2YjJlOGUyYmY3MWQ0YTNiOWQyNzQwYzk1MDc4Li5mZjc2ZDlmN2Y5N2FjNmZhNGZiYjMwMmY2 NDY2NjFkMTY3OGFlMjU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNw ZW5kZWRQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRl ZFBhZ2VQcm94eS5jcHAKQEAgLTEwMCw3ICsxMDAsOSBAQCBTdXNwZW5kZWRQYWdlUHJveHk6On5T dXNwZW5kZWRQYWdlUHJveHkoKQogICAgIC8vIElmIHRoZSBzdXNwZW5kZWQgcGFnZSB3YXMgbm90 IGNvbnN1bWVkIGJlZm9yZSBnZXR0aW5nIGRlc3Ryb3llZCwgdGhlbiBjbG9zZSB0aGUgY29ycmVz cG9uZGluZyBwYWdlCiAgICAgLy8gb24gdGhlIFdlYlByb2Nlc3Mgc2lkZS4KICAgICBtX3Byb2Nl c3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNsb3NlKCksIG1fcGFnZS5wYWdlSUQoKSk7Ci0g ICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAgaWYgKG1f c3VzcGVuc2lvblN0YXRlID09IFN1c3BlbnNpb25TdGF0ZTo6U3VzcGVuZGluZykKKyAgICAgICAg bV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6 bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOwogCiAgICAgLy8gV2UgY2Fs bCBtYXliZVNodXREb3duKCkgYXN5bmNocm9ub3VzbHkgc2luY2UgdGhlIFN1c3BlbmRlZFBhZ2Ug aXMgY3VycmVudGx5IGJlaW5nIHJlbW92ZWQgZnJvbSB0aGUgV2ViUHJvY2Vzc1Bvb2wKICAgICAv LyBhbmQgd2Ugd2FudCB0byBhdm9pZCByZS1lbnRlcmluZyBXZWJQcm9jZXNzUG9vbCBtZXRob2Rz LgpAQCAtMTM0LDcgKzEzNiw2IEBAIHZvaWQgU3VzcGVuZGVkUGFnZVByb3h5Ojp1bnN1c3BlbmQo KQogICAgIEFTU0VSVChtX3N1c3BlbnNpb25TdGF0ZSA9PSBTdXNwZW5zaW9uU3RhdGU6OlN1c3Bl bmRlZCk7CiAKICAgICBtX3N1c3BlbnNpb25TdGF0ZSA9IFN1c3BlbnNpb25TdGF0ZTo6UmVzdW1l ZDsKLSAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CiAgICAgbV9w cm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRJc1N1c3BlbmRlZChmYWxzZSksIG1f cGFnZS5wYWdlSUQoKSk7CiB9CiAKQEAgLTE1MSw2ICsxNTIsOCBAQCB2b2lkIFN1c3BlbmRlZFBh Z2VQcm94eTo6ZGlkUHJvY2Vzc1JlcXVlc3RUb1N1c3BlbmQoU3VzcGVuc2lvblN0YXRlIG5ld1N1 c3BlbnNpbwogICAgIG1fc3VzcGVuc2lvblRva2VuID0gbnVsbHB0cjsKICNlbmRpZgogCisgICAg bV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6 bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCiAgICAgaWYgKG1fcmVh ZHlUb1Vuc3VzcGVuZEhhbmRsZXIpCiAgICAgICAgIG1fcmVhZHlUb1Vuc3VzcGVuZEhhbmRsZXIo dGhpcyk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVBy b3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCmluZGV4 IGM3N2EyNmI3NDI3YzMxYzgyOGUyZWFhMjIxZjgwNzBiNzdhZGQyNjIuLjUzYzcxOTZjMmFhMGEz M2QyMjA3NTgxOTBjZDRiZDk1YTVjZDAyNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YkZyYW1lUHJveHkuY3BwCkBAIC0yNyw2ICsyNyw3IEBACiAjaW5jbHVkZSAiV2ViRnJhbWVQcm94 eS5oIgogCiAjaW5jbHVkZSAiQVBJTmF2aWdhdGlvbi5oIgorI2luY2x1ZGUgIlByb3Zpc2lvbmFs UGFnZVByb3h5LmgiCiAjaW5jbHVkZSAiV2ViQ2VydGlmaWNhdGVJbmZvLmgiCiAjaW5jbHVkZSAi V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5LmgiCiAjaW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2Vz LmgiCkBAIC03NCw3ICs3NSw3IEBAIGJvb2wgV2ViRnJhbWVQcm94eTo6aXNNYWluRnJhbWUoKSBj b25zdAogICAgIGlmICghbV9wYWdlKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICByZXR1 cm4gdGhpcyA9PSBtX3BhZ2UtPm1haW5GcmFtZSgpOworICAgIHJldHVybiB0aGlzID09IG1fcGFn ZS0+bWFpbkZyYW1lKCkgfHwgKG1fcGFnZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKSAmJiB0aGlz ID09IG1fcGFnZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKS0+bWFpbkZyYW1lKCkpOwogfQogCiB2 b2lkIFdlYkZyYW1lUHJveHk6OmxvYWRVUkwoY29uc3QgVVJMJiB1cmwpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCAzOTI3NDNiZDU2NzljYmQyMjY3YTJjMTBl Y2NlMTk1YTYxYzMzZDI5Li43N2FkNjBjMmFkN2QyNWNmNjQ5ZjQzNzcwMWFlZDJlZjgyYzY0MzZh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTc3LDYgKzc3 LDcgQEAKICNpbmNsdWRlICJQbHVnaW5JbmZvcm1hdGlvbi5oIgogI2luY2x1ZGUgIlBsdWdpblBy b2Nlc3NNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiUHJpbnRJbmZvLmgiCisjaW5jbHVkZSAiUHJvdmlz aW9uYWxQYWdlUHJveHkuaCIKICNpbmNsdWRlICJTYWZlQnJvd3NpbmdXYXJuaW5nLmgiCiAjaW5j bHVkZSAiU2hhcmVTaGVldENhbGxiYWNrSUQuaCIKICNpbmNsdWRlICJTaGFyZWRCdWZmZXJEYXRh UmVmZXJlbmNlLmgiCkBAIC03NjgsMzggKzc2OSwyNSBAQCBib29sIFdlYlBhZ2VQcm94eTo6c3Vz cGVuZEN1cnJlbnRQYWdlSWZQb3NzaWJsZShBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIE9w dAogICAgIHJldHVybiB0cnVlOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6c3dhcFRvV2ViUHJv Y2VzcyhSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIHN0ZDo6dW5pcXVlX3B0cjxTdXNw ZW5kZWRQYWdlUHJveHk+JiYgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLCBJc1N3YXBGcm9tU3Vz cGVuZGVkIGlzU3dhcEZyb21TdXNwZW5kZWQpCit2b2lkIFdlYlBhZ2VQcm94eTo6c3dhcFRvV2Vi UHJvY2VzcyhSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIHN0ZDo6dW5pcXVlX3B0cjxE cmF3aW5nQXJlYVByb3h5PiYmIGRyYXdpbmdBcmVhLCBSZWZQdHI8V2ViRnJhbWVQcm94eT4mJiBt YWluRnJhbWUpCiB7CiAgICAgQVNTRVJUKCFtX2lzQ2xvc2VkKTsKICAgICBSRUxFQVNFX0xPR19J Rl9BTExPV0VEKExvYWRpbmcsICJzd2FwVG9XZWJQcm9jZXNzOiB3ZWJQSUQgPSAlaSwgcGFnZUlE ID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsK IAogICAgIG1fcHJvY2VzcyA9IFdURk1vdmUocHJvY2Vzcyk7CisgICAgQVNTRVJUKCFtX2RyYXdp bmdBcmVhKTsKKyAgICBtX2RyYXdpbmdBcmVhID0gV1RGTW92ZShkcmF3aW5nQXJlYSk7CisgICAg QVNTRVJUKCFtX21haW5GcmFtZSk7CisgICAgbV9tYWluRnJhbWUgPSBXVEZNb3ZlKG1haW5GcmFt ZSk7CiAgICAgbV9pc1ZhbGlkID0gdHJ1ZTsKIAotICAgIC8vIElmIHdlIGFyZSByZWF0dGFjaGlu ZyB0byBhIFN1c3BlbmRlZFBhZ2UsIHRoZW4gdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UgYWxyZWFk eSBleGlzdHMgYW5kCi0gICAgLy8gV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUoKSB3 aWxsIG5vdCBiZSBjYWxsZWQgdG8gaW5pdGlhbGl6ZSBtX21haW5GcmFtZS4gSW4gc3VjaAotICAg IC8vIGNhc2UsIHdlIG5lZWQgdG8gaW5pdGlhbGl6ZSBtX21haW5GcmFtZSB0byByZWZsZWN0IHRo ZSBmYWN0IHRoZSB0aGUgV2ViUHJvY2VzcycgV2ViUGFnZQotICAgIC8vIGFscmVhZHkgZXhpc3Rz IGFuZCBhbHJlYWR5IGhhcyBhIG1haW4gZnJhbWUuCi0gICAgaWYgKGRlc3RpbmF0aW9uU3VzcGVu ZGVkUGFnZSkgewotICAgICAgICBpZiAoIWRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZS0+ZmFpbGVk VG9TdXNwZW5kKCkpIHsKLSAgICAgICAgICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOwotICAgICAg ICAgICAgQVNTRVJUKCZkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPnByb2Nlc3MoKSA9PSBtX3By b2Nlc3MucHRyKCkpOwotICAgICAgICAgICAgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT51bnN1 c3BlbmQoKTsKLSAgICAgICAgICAgIG1fbWFpbkZyYW1lID0gV2ViRnJhbWVQcm94eTo6Y3JlYXRl KCp0aGlzLCBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPm1haW5GcmFtZUlEKCkpOwotICAgICAg ICAgICAgbV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5t YWluRnJhbWVJRCgpLCAqbV9tYWluRnJhbWUpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAg ICAgLy8gV2UgZmFpbGVkIHRvIHN1c3BlbmQgdGhlIHBhZ2Ugc28gZGVzdHJveSBpdCBub3cgYW5k IG1lcmVseSByZXVzZSBpdHMgV2ViQ29udGVudCBwcm9jZXNzLgotICAgICAgICAgICAgZGVzdGlu YXRpb25TdXNwZW5kZWRQYWdlID0gbnVsbHB0cjsKLSAgICAgICAgfQotICAgIH0KLQogICAgIG1f cHJvY2Vzcy0+YWRkRXhpc3RpbmdXZWJQYWdlKCp0aGlzLCBtX3BhZ2VJRCwgV2ViUHJvY2Vzc1By b3h5OjpCZWdpbnNVc2luZ0RhdGFTdG9yZTo6Tm8pOwogICAgIG1fcHJvY2Vzcy0+YWRkTWVzc2Fn ZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwg bV9wYWdlSUQsICp0aGlzKTsKIAotICAgIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2Vzcyhpc1N3 YXBGcm9tU3VzcGVuZGVkKTsKKyAgICBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoKTsKIH0K IAotdm9pZCBXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhJc1N3YXBG cm9tU3VzcGVuZGVkIGlzU3dhcEZyb21TdXNwZW5kZWQpCit2b2lkIFdlYlBhZ2VQcm94eTo6Zmlu aXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKCkKIHsKICAgICBBU1NFUlQobV9wcm9jZXNzLT5zdGF0 ZSgpICE9IENoaWxkUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6VGVybWluYXRlZCk7CiAKQEAgLTgzNSw3 ICs4MjMsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNz KElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1cwogICAgIG1fZWRpdGFibGVJbWFnZUNv bnRyb2xsZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyPigqdGhp cyk7CiAjZW5kaWYKIAotICAgIGluaXRpYWxpemVXZWJQYWdlKGlzU3dhcEZyb21TdXNwZW5kZWQp OworICAgIGluaXRpYWxpemVXZWJQYWdlKCk7CiAKICAgICBtX2luc3BlY3Rvci0+dXBkYXRlRm9y TmV3UGFnZVByb2Nlc3ModGhpcyk7CiAKQEAgLTkwMCwxMiArODg4LDE0IEBAIFJlZlB0cjxBUEk6 Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRlbShX ZWJCYWNrRm9yd2FyCiAgICAgcmV0dXJuIFdURk1vdmUobmF2aWdhdGlvbik7CiB9CiAKLXZvaWQg V2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZShJc1N3YXBGcm9tU3VzcGVuZGVkIGlzU3dh cEZyb21TdXNwZW5kZWQpCit2b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoKQog ewogICAgIEFTU0VSVChpc1ZhbGlkKCkpOwogCi0gICAgbV9kcmF3aW5nQXJlYSA9IHBhZ2VDbGll bnQoKS5jcmVhdGVEcmF3aW5nQXJlYVByb3h5KCk7Ci0gICAgQVNTRVJUKG1fZHJhd2luZ0FyZWEp OworICAgIGlmICghbV9kcmF3aW5nQXJlYSkgeworICAgICAgICBtX2RyYXdpbmdBcmVhID0gcGFn ZUNsaWVudCgpLmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKKyAgICAgICAgQVNTRVJUKG1fZHJh d2luZ0FyZWEpOworICAgIH0KIAogI2lmIEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpICYmIFBMQVRG T1JNKENPQ09BKQogICAgIGlmIChtX2RyYXdpbmdBcmVhLT50eXBlKCkgPT0gRHJhd2luZ0FyZWFU eXBlUmVtb3RlTGF5ZXJUcmVlKSB7CkBAIC05MTcsMTQgKzkwNyw3IEBAIHZvaWQgV2ViUGFnZVBy b3h5Ojppbml0aWFsaXplV2ViUGFnZShJc1N3YXBGcm9tU3VzcGVuZGVkIGlzU3dhcEZyb21TdXNw ZW5kZWQpCiAgICAgfQogI2VuZGlmCiAKLSAgICBhdXRvIHBhcmFtZXRlcnMgPSBjcmVhdGlvblBh cmFtZXRlcnMoKTsKLSAgICBwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQgPSBpc1N3YXBG cm9tU3VzcGVuZGVkID09IElzU3dhcEZyb21TdXNwZW5kZWQ6OlllczsKLQotI2lmIEVOQUJMRShT RVJWSUNFX1dPUktFUikKLSAgICBwYXJhbWV0ZXJzLmhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2Vy cyA9IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLm1heUhhdmVSZWdpc3RlcmVkU2VydmljZVdvcmtl cnMobV93ZWJzaXRlRGF0YVN0b3JlKTsKLSNlbmRpZgotCi0gICAgcHJvY2VzcygpLnNlbmQoTWVz c2FnZXM6OldlYlByb2Nlc3M6OkNyZWF0ZVdlYlBhZ2UobV9wYWdlSUQsIHBhcmFtZXRlcnMpLCAw KTsKKyAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6Q3JlYXRlV2ViUGFn ZShtX3BhZ2VJRCwgY3JlYXRpb25QYXJhbWV0ZXJzKCkpLCAwKTsKIAogICAgIG1fbmVlZHNUb0Zp bmlzaEluaXRpYWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2ggPSB0cnVlOwogICAgIGZp bmlzaEluaXRpYWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2goKTsKQEAgLTEwNzYsNyAr MTA1OSw4IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQ STo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgUmVzb3VyCiAgICAgYXV0byB0cmFuc2FjdGlvbiA9 IG1fcGFnZUxvYWRTdGF0ZS50cmFuc2FjdGlvbigpOwogCiAgICAgYXV0byB1cmwgPSByZXF1ZXN0 LnVybCgpOwotICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFu c2FjdGlvbiwgdXJsKTsKKyAgICBpZiAoc2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkICE9IFNo b3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzKQorICAgICAgICBtX3BhZ2VMb2FkU3RhdGUu c2V0UGVuZGluZ0FQSVJlcXVlc3RVUkwodHJhbnNhY3Rpb24sIHVybCk7CiAKICAgICBpZiAoIWlz VmFsaWQoKSkKICAgICAgICAgcmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsKQEAgLTI2OTcsNyArMjY4 MSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lv bihXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uCiAgICAgICAgIH0KIAogICAgICAgICBpZiAo cHJvY2Vzc0Zvck5hdmlnYXRpb24ucHRyKCkgIT0gJnByb2Nlc3MoKSkgewotICAgICAgICAgICAg cG9saWN5QWN0aW9uID0gaXNQYWdlT3BlbmVkQnlET01TaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1l bnQoKSA/IFdlYlBvbGljeUFjdGlvbjo6SWdub3JlIDogV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5k OworICAgICAgICAgICAgcG9saWN5QWN0aW9uID0gV2ViUG9saWN5QWN0aW9uOjpJZ25vcmU7CiAg ICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRlY2lk ZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24sIHN3YXBwaW5nIHByb2Nlc3MgJWkgd2l0aCBwcm9j ZXNzICVpIGZvciBuYXZpZ2F0aW9uLCByZWFzb246ICV7cHVibGljfXMiLCBwcm9jZXNzSWRlbnRp ZmllcigpLCBwcm9jZXNzRm9yTmF2aWdhdGlvbi0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgcmVhc29u LnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICAgICAgTE9HKFByb2Nlc3NTd2FwcGluZywgIihQcm9j ZXNzU3dhcHBpbmcpIFN3aXRjaGluZyBmcm9tIHByb2Nlc3MgJWkgdG8gbmV3IHByb2Nlc3MgKCVp KSBmb3IgbmF2aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMnIiwgcHJvY2Vzc0lkZW50aWZpZXIoKSwg cHJvY2Vzc0Zvck5hdmlnYXRpb24tPnByb2Nlc3NJZGVudGlmaWVyKCksIG5hdmlnYXRpb24tPm5h dmlnYXRpb25JRCgpLCBuYXZpZ2F0aW9uLT5sb2dnaW5nU3RyaW5nKCkpOwogICAgICAgICB9IGVs c2UKQEAgLTI3MDYsOCArMjY5MCwxNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVjZWl2ZWROYXZp Z2F0aW9uUG9saWN5RGVjaXNpb24oV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbgogICAgICAg ICBib29sIHNob3VsZFByb2Nlc3NTd2FwID0gcHJvY2Vzc0Zvck5hdmlnYXRpb24ucHRyKCkgIT0g JnByb2Nlc3MoKTsKICAgICAgICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24s IG5hdmlnYXRpb24ucHRyKCksIHNob3VsZFByb2Nlc3NTd2FwID8gV1RGOjpudWxsb3B0IDogV1RG TW92ZShkYXRhKSwgV1RGTW92ZShzZW5kZXIpKTsKIAotICAgICAgICBpZiAoc2hvdWxkUHJvY2Vz c1N3YXApCi0gICAgICAgICAgICBjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MobmF2aWdh dGlvbiwgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlID8gcHJvY2VzcygpLnByb2Nlc3NQb29sKCku dGFrZVN1c3BlbmRlZFBhZ2UoKmRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSkgOiBudWxscHRyLCBX VEZNb3ZlKHByb2Nlc3NGb3JOYXZpZ2F0aW9uKSwgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVu dCwgV1RGTW92ZShkYXRhKSk7CisgICAgICAgIGlmICghc2hvdWxkUHJvY2Vzc1N3YXApCisgICAg ICAgICAgICByZXR1cm47CisKKyAgICAgICAgYXV0byBzdXNwZW5kZWRQYWdlID0gZGVzdGluYXRp b25TdXNwZW5kZWRQYWdlID8gcHJvY2VzcygpLnByb2Nlc3NQb29sKCkudGFrZVN1c3BlbmRlZFBh Z2UoKmRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSkgOiBudWxscHRyOworICAgICAgICBpZiAoc3Vz cGVuZGVkUGFnZSAmJiBzdXNwZW5kZWRQYWdlLT5mYWlsZWRUb1N1c3BlbmQoKSkKKyAgICAgICAg ICAgIHN1c3BlbmRlZFBhZ2UgPSBudWxscHRyOworCisgICAgICAgIGNvbnRpbnVlTmF2aWdhdGlv bkluTmV3UHJvY2VzcyhuYXZpZ2F0aW9uLCBXVEZNb3ZlKHN1c3BlbmRlZFBhZ2UpLCBXVEZNb3Zl KHByb2Nlc3NGb3JOYXZpZ2F0aW9uKSwgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgV1RG TW92ZShkYXRhKSk7CiAgICAgfSk7CiB9CiAKQEAgLTI3NDMsMjQgKzI3MzMsNDUgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OnJlY2VpdmVkUG9saWN5RGVjaXNpb24oV2ViUG9saWN5QWN0aW9uIGFjdGlv biwgQVBJOjpOYXZpZ2F0aW8KICAgICBzZW5kZXItPnNlbmQoYWN0aW9uLCBuYXZpZ2F0aW9uID8g bmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCkgOiAwLCBkb3dubG9hZElELCBXVEZNb3ZlKHdlYnNp dGVQb2xpY2llcykpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6Y29udGludWVOYXZpZ2F0aW9u SW5OZXdQcm9jZXNzKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgc3RkOjp1bmlxdWVfcHRy PFN1c3BlbmRlZFBhZ2VQcm94eT4mJiBzdXNwZW5kZWRQYWdlUHJveHksIFJlZjxXZWJQcm9jZXNz UHJveHk+JiYgcHJvY2VzcywgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dh cFJlcXVlc3RlZEJ5Q2xpZW50LCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNp dGVQb2xpY2llcykKK3ZvaWQgV2ViUGFnZVByb3h5Ojpjb21taXRQcm92aXNpb25hbFBhZ2UodWlu dDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVU eXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxv YWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5mbywg Ym9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3Vy ZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmIHVzZXJE YXRhKQogewotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImNvbnRpbnVlTmF2 aWdhdGlvbkluTmV3UHJvY2Vzczogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9w cm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCk7Ci0gICAgTE9HKExvYWRpbmcs ICJDb250aW51aW5nIG5hdmlnYXRpb24gJSIgUFJJdTY0ICIgJyVzJyBpbiBhIG5ldyB3ZWIgcHJv Y2VzcyIsIG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24ubG9nZ2luZ1N0cmlu ZygpKTsKKyAgICBBU1NFUlQobV9wcm92aXNpb25hbFBhZ2UpOworICAgIFJFTEVBU0VfTE9HX0lG X0FMTE9XRUQoTG9hZGluZywgImNvbW1pdFByb3Zpc2lvbmFsUGFnZTogcHJldmlvdXNQSUQgPSAl aSwgbmV3UElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRl bnRpZmllcigpLCBtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2VzcygpLnByb2Nlc3NJZGVudGlmaWVy KCksIG1fcGFnZUlEKTsKIAotICAgIFJlZjxXZWJQcm9jZXNzUHJveHk+IHByZXZpb3VzUHJvY2Vz cyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCk7CiAgICAgT3B0aW9uYWw8dWludDY0X3Q+IG1haW5GcmFt ZUlESW5QcmV2aW91c1Byb2Nlc3MgPSBtX21haW5GcmFtZSA/IG1ha2VPcHRpb25hbChtX21haW5G cmFtZS0+ZnJhbWVJRCgpKSA6IFdURjo6bnVsbG9wdDsKLSAgICBhdXRvIG1haW5GcmFtZVVSTCA9 IG1fbWFpbkZyYW1lID8gbV9tYWluRnJhbWUtPnVybCgpIDogVVJMKCk7CiAKLSAgICBBU1NFUlQo bV9wcm9jZXNzLnB0cigpICE9IHByb2Nlc3MucHRyKCkpOworICAgIEFTU0VSVChtX3Byb2Nlc3Mu cHRyKCkgIT0gJm1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCkpOwogCiAgICAgcHJvY2Vzc0Rp ZFRlcm1pbmF0ZShQcm9jZXNzVGVybWluYXRpb25SZWFzb246Ok5hdmlnYXRpb25Td2FwKTsKIAog ICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlSUQpOwotICAgIGJvb2wgZGlkU3VzcGVu ZFByZXZpb3VzUGFnZSA9IHN1c3BlbmRDdXJyZW50UGFnZUlmUG9zc2libGUobmF2aWdhdGlvbiwg bWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcywgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVu dCk7CisgICAgYXV0byogbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRpb24o bV9wcm92aXNpb25hbFBhZ2UtPm5hdmlnYXRpb25JRCgpKTsKKyAgICBib29sIGRpZFN1c3BlbmRQ cmV2aW91c1BhZ2UgPSBuYXZpZ2F0aW9uID8gc3VzcGVuZEN1cnJlbnRQYWdlSWZQb3NzaWJsZSgq bmF2aWdhdGlvbiwgbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcywgbV9wcm92aXNpb25hbFBh Z2UtPnByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQoKSkgOiBmYWxzZTsKICAgICBtX3Byb2Nl c3MtPnJlbW92ZVdlYlBhZ2UoKnRoaXMsIG1fcGFnZUlELCBXZWJQcm9jZXNzUHJveHk6OkVuZHNV c2luZ0RhdGFTdG9yZTo6Tm8pOwogCi0gICAgc3dhcFRvV2ViUHJvY2VzcyhXVEZNb3ZlKHByb2Nl c3MpLCBXVEZNb3ZlKHN1c3BlbmRlZFBhZ2VQcm94eSksIGRpZFN1c3BlbmRQcmV2aW91c1BhZ2Ug PyBJc1N3YXBGcm9tU3VzcGVuZGVkOjpZZXMgOiBJc1N3YXBGcm9tU3VzcGVuZGVkOjpObyk7Cisg ICAgLy8gVGhlcmUgaXMgbm8gd2F5IHdlJ2xsIGJlIGFibGUgdG8gcmV0dXJuIHRvIHRoZSBwYWdl IGluIHRoZSBwcmV2aW91cyBwYWdlIHNvIGNsb3NlIGl0LgorICAgIGlmICghZGlkU3VzcGVuZFBy ZXZpb3VzUGFnZSkKKyAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpD bG9zZSgpLCBwYWdlSUQoKSk7CisKKyAgICBzd2FwVG9XZWJQcm9jZXNzKG1fcHJvdmlzaW9uYWxQ YWdlLT5wcm9jZXNzKCksIG1fcHJvdmlzaW9uYWxQYWdlLT50YWtlRHJhd2luZ0FyZWEoKSwgbV9w cm92aXNpb25hbFBhZ2UtPm1haW5GcmFtZSgpKTsKKworICAgIGRpZENvbW1pdExvYWRGb3JGcmFt ZShmcmFtZUlELCBuYXZpZ2F0aW9uSUQsIG1pbWVUeXBlLCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQ cm92aWRlciwgZnJhbWVMb2FkVHlwZSwgY2VydGlmaWNhdGVJbmZvLCBjb250YWluc1BsdWdpbkRv Y3VtZW50LCBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIHVzZXJEYXRhKTsKKworICAgIG1fcHJv dmlzaW9uYWxQYWdlID0gbnVsbHB0cjsKK30KKwordm9pZCBXZWJQYWdlUHJveHk6OmNvbnRpbnVl TmF2aWdhdGlvbkluTmV3UHJvY2VzcyhBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIHN0ZDo6 dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYgc3VzcGVuZGVkUGFnZVByb3h5LCBSZWY8 V2ViUHJvY2Vzc1Byb3h5PiYmIG5ld1Byb2Nlc3MsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGll bnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVz RGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChM b2FkaW5nLCAiY29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzOiB3ZWJQSUQgPSAlaSwgcGFn ZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlE KTsKKyAgICBMT0coTG9hZGluZywgIkNvbnRpbnVpbmcgbmF2aWdhdGlvbiAlIiBQUkl1NjQgIiAn JXMnIGluIGEgbmV3IHdlYiBwcm9jZXNzIiwgbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2 aWdhdGlvbi5sb2dnaW5nU3RyaW5nKCkpOworCisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlKSB7 CisgICAgICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkgIT0gbmF2aWdh dGlvbi5uYXZpZ2F0aW9uSUQoKSkKKyAgICAgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5jYW5j ZWwoKTsKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBudWxscHRyOworICAgIH0KKworICAg IG1fcHJvdmlzaW9uYWxQYWdlID0gc3RkOjptYWtlX3VuaXF1ZTxQcm92aXNpb25hbFBhZ2VQcm94 eT4oKnRoaXMsIG5ld1Byb2Nlc3MuY29weVJlZigpLCBXVEZNb3ZlKHN1c3BlbmRlZFBhZ2VQcm94 eSksIG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3RJ c1JlZGlyZWN0KCksIG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKSwgcHJvY2Vzc1N3YXBSZXF1 ZXN0ZWRCeUNsaWVudCk7CiAKICAgICBpZiAoYXV0byogaXRlbSA9IG5hdmlnYXRpb24udGFyZ2V0 SXRlbSgpKSB7CiAgICAgICAgIExPRyhMb2FkaW5nLCAiV2ViUGFnZVByb3h5ICVwIGNvbnRpbnVl TmF2aWdhdGlvbkluTmV3UHJvY2VzcyB0byBiYWNrIGl0ZW0gVVJMICVzIiwgdGhpcywgaXRlbS0+ dXJsKCkudXRmOCgpLmRhdGEoKSk7CkBAIC0yNzY4LDY3ICsyNzc5LDIyIEBAIHZvaWQgV2ViUGFn ZVByb3h5Ojpjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpOYXZpZ2F0aW9uJiBu YXZpZ2F0aW9uLCBzCiAgICAgICAgIGF1dG8gdHJhbnNhY3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUu dHJhbnNhY3Rpb24oKTsKICAgICAgICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1 ZXN0VVJMKHRyYW5zYWN0aW9uLCBpdGVtLT51cmwoKSk7CiAKLSAgICAgICAgYXV0byBpdGVtU3Rh dGVzID0gbV9iYWNrRm9yd2FyZExpc3QtPmZpbHRlcmVkSXRlbVN0YXRlcyhbdGhpcywgdGFyZ2V0 SXRlbSA9IGl0ZW1dKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mIGl0ZW0pIHsKLSAgICAgICAgICAg IGlmIChhdXRvKiBwYWdlID0gaXRlbS5zdXNwZW5kZWRQYWdlKCkpIHsKLSAgICAgICAgICAgICAg ICBpZiAoJnBhZ2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpCi0gICAgICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybiAm aXRlbSAhPSB0YXJnZXRJdGVtOwotICAgICAgICB9KTsKLSAgICAgICAgbV9wcm9jZXNzLT5zZW5k KE1lc3NhZ2VzOjpXZWJQYWdlOjpVcGRhdGVCYWNrRm9yd2FyZExpc3RGb3JSZWF0dGFjaChXVEZN b3ZlKGl0ZW1TdGF0ZXMpKSwgbV9wYWdlSUQpOwotICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0obmF2aWdhdGlvbi5uYXZpZ2F0aW9u SUQoKSwgaXRlbS0+aXRlbUlEKCksICpuYXZpZ2F0aW9uLmJhY2tGb3J3YXJkRnJhbWVMb2FkVHlw ZSgpLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9s aWNpZXMpKSwgbV9wYWdlSUQpOwotICAgICAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGlt ZXIoKS5zdGFydCgpOwotCisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5nb1RvQmFja0Zvcndh cmRJdGVtKG5hdmlnYXRpb24sICppdGVtLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOwogICAg ICAgICByZXR1cm47CiAgICAgfQogCiAgICAgaWYgKG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50 SXRlbSgpICYmIChuYXZpZ2F0aW9uLmxvY2tCYWNrRm9yd2FyZExpc3QoKSA9PSBMb2NrQmFja0Zv cndhcmRMaXN0OjpZZXMgfHwgbmF2aWdhdGlvbi5sb2NrSGlzdG9yeSgpID09IExvY2tIaXN0b3J5 OjpZZXMpKSB7CiAgICAgICAgIC8vIElmIFdlYkNvcmUgaXMgc3VwcG9zZWQgdG8gbG9jayB0aGUg aGlzdG9yeSBmb3IgdGhpcyBsb2FkLCB0aGVuIHRoZSBuZXcgcHJvY2VzcyBuZWVkcyB0byBrbm93 IGFib3V0IHRoZSBjdXJyZW50IGhpc3RvcnkgaXRlbSBzbyBpdCBjYW4gdXBkYXRlCiAgICAgICAg IC8vIGl0IGluc3RlYWQgb2YgY3JlYXRpbmcgYSBuZXcgb25lLgotICAgICAgICBtX3Byb2Nlc3Mt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldEN1cnJlbnRIaXN0b3J5SXRlbUZvclJlYXR0YWNo KG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50SXRlbSgpLT5pdGVtU3RhdGUoKSksIG1fcGFnZUlE KTsKKyAgICAgICAgbmV3UHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0Q3VycmVu dEhpc3RvcnlJdGVtRm9yUmVhdHRhY2gobV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkt Pml0ZW1TdGF0ZSgpKSwgbV9wYWdlSUQpOwogICAgIH0KIAogICAgIC8vIEZJWE1FOiBXb3JrIG91 dCB0aW1pbmcgb2YgcmVzcG9uZGluZyB3aXRoIHRoZSBsYXN0IHBvbGljeSBkZWxlZ2F0ZSwgZXRj CiAgICAgQVNTRVJUKCFuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCkuaXNFbXB0eSgpKTsKICAg ICBpZiAoYXV0byYgc3Vic3RpdHV0ZURhdGEgPSBuYXZpZ2F0aW9uLnN1YnN0aXR1dGVEYXRhKCkp Ci0gICAgICAgIGxvYWREYXRhV2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgeyBzdWJzdGl0dXRl RGF0YS0+Y29udGVudC5kYXRhKCksIHN1YnN0aXR1dGVEYXRhLT5jb250ZW50LnNpemUoKSB9LCBz dWJzdGl0dXRlRGF0YS0+TUlNRVR5cGUsIHN1YnN0aXR1dGVEYXRhLT5lbmNvZGluZywgc3Vic3Rp dHV0ZURhdGEtPmJhc2VVUkwsIHN1YnN0aXR1dGVEYXRhLT51c2VyRGF0YS5nZXQoKSwgU2hvdWxk VHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Cisg ICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5sb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRp b24sIHsgc3Vic3RpdHV0ZURhdGEtPmNvbnRlbnQuZGF0YSgpLCBzdWJzdGl0dXRlRGF0YS0+Y29u dGVudC5zaXplKCkgfSwgc3Vic3RpdHV0ZURhdGEtPk1JTUVUeXBlLCBzdWJzdGl0dXRlRGF0YS0+ ZW5jb2RpbmcsIHN1YnN0aXR1dGVEYXRhLT5iYXNlVVJMLCBzdWJzdGl0dXRlRGF0YS0+dXNlckRh dGEuZ2V0KCksIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiAgICAgZWxzZQotICAgICAgICBs b2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIFJlc291cmNlUmVxdWVzdCB7IG5h dmlnYXRpb24uY3VycmVudFJlcXVlc3QoKSB9LCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxV UkxzUG9saWN5OjpTaG91bGRBbGxvd0V4dGVybmFsU2NoZW1lcywgbnVsbHB0ciwgU2hvdWxkVHJl YXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Ci0KLSAg ICBBU1NFUlQoIW1fbWFpbkZyYW1lKTsKLSAgICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlciA9 IFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKSwgbmF2aWdhdGlvbklEID0gbmF2 aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgcmVxdWVzdCA9ICBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1 ZXN0KCksIG1haW5GcmFtZVVSTCwgaXNTZXJ2ZXJSZWRpcmVjdCA9IG5hdmlnYXRpb24uY3VycmVu dFJlcXVlc3RJc1JlZGlyZWN0KCldKCkgbXV0YWJsZSB7Ci0gICAgICAgIGlmICghd2Vha1RoaXMp Ci0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKLSAg ICAgICAgLy8gVGhpcyBuYXZpZ2F0aW9uIHdhcyBkZXN0cm95ZWQgc28gbm8gbmVlZCB0byBub3Rp Znkgb2YgcmVkaXJlY3QuCi0gICAgICAgIGlmICghbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlv bihuYXZpZ2F0aW9uSUQpKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIC8vIFJlc3Rv cmUgdGhlIG1haW4gZnJhbWUncyBjb21taXR0ZWQgVVJMIGFzIHNvbWUgY2xpZW50cyBtYXkgcmVs eSBvbiBpdCB1bnRpbCB0aGUgbmV4dCBsb2FkIGlzIGNvbW1pdHRlZC4KLSAgICAgICAgbV9tYWlu RnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkuc2V0VVJMKG1haW5GcmFtZVVSTCk7Ci0KLSAgICAgICAg Ly8gTm9ybWFsbHksIG5vdGlmaWNhdGlvbiBvZiBhIHNlcnZlciByZWRpcmVjdCBjb21lcyBmcm9t IHRoZSBXZWJDb250ZW50IHByb2Nlc3MuCi0gICAgICAgIC8vIElmIHdlIGFyZSBwcm9jZXNzIHN3 YXBwaW5nIGluIHJlc3BvbnNlIHRvIGEgc2VydmVyIHJlZGlyZWN0IHRoZW4gdGhhdCBub3RpZmlj YXRpb24gd2lsbCBub3QgY29tZSBmcm9tIHRoZSBuZXcgV2ViQ29udGVudCBwcm9jZXNzLgotICAg ICAgICAvLyBJbiB0aGlzIGNhc2Ugd2UgaGF2ZSB0aGUgVUlQcm9jZXNzIHN5bnRoZXNpemUgdGhl IHJlZGlyZWN0IG5vdGlmaWNhdGlvbiBhdCB0aGUgYXBwcm9wcmlhdGUgdGltZS4KLSAgICAgICAg aWYgKGlzU2VydmVyUmVkaXJlY3QpIHsKLSAgICAgICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxv YWRTdGF0ZSgpLmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKHJlcXVlc3QudXJsKCkpOwotICAgICAg ICAgICAgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUo bV9tYWluRnJhbWUtPmZyYW1lSUQoKSwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKHJlcXVlc3QpLCB7 IH0pOwotICAgICAgICB9Ci0gICAgfTsKLQotICAgIGlmICghbV9wcm9jZXNzLT5wcm9jZXNzUG9v bCgpLmNvbmZpZ3VyYXRpb24oKS5wcm9jZXNzU3dhcHNPbldpbmRvd09wZW5XaXRoT3BlbmVyKCkg fHwgIWlzUGFnZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgfHwgIW1h aW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MpIHsKLSAgICAgICAgLy8gVGhlcmUgaXMgbm8gd2F5 IHdlJ2xsIGJlIGFibGUgdG8gcmV0dXJuIHRvIHRoZSBwYWdlIGluIHRoZSBwcmV2aW91cyBwYWdl IHNvIGNsb3NlIGl0LgotICAgICAgICBpZiAoIWRpZFN1c3BlbmRQcmV2aW91c1BhZ2UpCi0gICAg ICAgICAgICBwcmV2aW91c1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNsb3NlKCks IG1fcGFnZUlEKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIG1fbWFpbkZyYW1lV2lu ZG93Q3JlYXRpb25IYW5kbGVyID0gW3RoaXMsIHByZXZpb3VzUHJvY2VzcyA9IFdURk1vdmUocHJl dmlvdXNQcm9jZXNzKSwgbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcyA9ICptYWluRnJhbWVJ REluUHJldmlvdXNQcm9jZXNzXShjb25zdCBHbG9iYWxXaW5kb3dJZGVudGlmaWVyJiB3aW5kb3dJ ZGVudGlmaWVyKSB7Ci0gICAgICAgIEFTU0VSVChtX21haW5GcmFtZSk7Ci0gICAgICAgIEdsb2Jh bEZyYW1lSWRlbnRpZmllciBuYXZpZ2F0ZWRGcmFtZUlkZW50aWZpZXJJbk5ld1Byb2Nlc3MgeyBw YWdlSUQoKSwgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSB9OwotICAgICAgICBwcmV2aW91c1Byb2Nl c3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkZyYW1lQmVjYW1lUmVtb3RlKG1haW5GcmFtZUlE SW5QcmV2aW91c1Byb2Nlc3MsIG5hdmlnYXRlZEZyYW1lSWRlbnRpZmllckluTmV3UHJvY2Vzcywg d2luZG93SWRlbnRpZmllciksIHBhZ2VJRCgpKTsKLSAgICB9OworICAgICAgICBtX3Byb3Zpc2lv bmFsUGFnZS0+bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCBSZXNvdXJjZVJl cXVlc3QgeyBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCkgfSwgV2ViQ29yZTo6U2hvdWxkT3Bl bkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkQWxsb3dFeHRlcm5hbFNjaGVtZXMsIG51bGxwdHIs IFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiB9CiAKIGJvb2wgV2ViUGFnZVByb3h5Ojppc1Bh Z2VPcGVuZWRCeURPTVNob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpIGNvbnN0CkBAIC0zNjkz LDExICszNjU5LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZU1haW5GcmFtZSh1aW50 NjRfdCBmcmFtZUlEKQogCiAgICAgLy8gQWRkIHRoZSBmcmFtZSB0byB0aGUgcHJvY2VzcyB3aWRl IG1hcC4KICAgICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChmcmFtZUlELCAqbV9tYWluRnJhbWUp OwotCi0gICAgaWYgKG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyKSB7Ci0gICAgICAgIG1fbWFp bkZyYW1lQ3JlYXRpb25IYW5kbGVyKCk7Ci0gICAgICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5k bGVyID0gbnVsbHB0cjsKLSAgICB9CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVT dWJmcmFtZSh1aW50NjRfdCBmcmFtZUlEKQpAQCAtMzcyMiwxMCArMzY4Myw2IEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpkaWRDcmVhdGVTdWJmcmFtZSh1aW50NjRfdCBmcmFtZUlEKQogCiB2b2lkIFdl YlBhZ2VQcm94eTo6ZGlkQ3JlYXRlV2luZG93KHVpbnQ2NF90IGZyYW1lSUQsIEdsb2JhbFdpbmRv d0lkZW50aWZpZXImJiB3aW5kb3dJZGVudGlmaWVyKQogewotICAgIGlmIChtX21haW5GcmFtZSAm JiBtX21haW5GcmFtZS0+ZnJhbWVJRCgpID09IGZyYW1lSUQpIHsKLSAgICAgICAgaWYgKGF1dG8g bWFpbkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyID0gV1RGTW92ZShtX21haW5GcmFtZVdpbmRv d0NyZWF0aW9uSGFuZGxlcikpCi0gICAgICAgICAgICBtYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhh bmRsZXIod2luZG93SWRlbnRpZmllcik7Ci0gICAgfQogfQogCiBkb3VibGUgV2ViUGFnZVByb3h5 Ojplc3RpbWF0ZWRQcm9ncmVzcygpIGNvbnN0CkBAIC0zNzc4LDYgKzM3MzUsMTAgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmRpZERlc3Ryb3lOYXZpZ2F0aW9uKHVpbnQ2NF90IG5hdmlnYXRpb25JRCkK IHsKICAgICBQYWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCisg ICAgLy8gT24gcHJvY2Vzcy1zd2FwLCB0aGUgcHJldmlvdXMgcHJvY2VzcyB0cmllcyB0byBkZXN0 cm95IHRoZSBuYXZpZ2F0aW9uIGJ1dCB0aGUgcHJvdmlzaW9uYWwgcHJvY2VzcyBpcyBhY3R1YWxs eSB0YWtpbmcgb3ZlciB0aGUgbmF2aWdhdGlvbi4KKyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2Ug JiYgbV9wcm92aXNpb25hbFBhZ2UtPm5hdmlnYXRpb25JRCgpID09IG5hdmlnYXRpb25JRCkKKyAg ICAgICAgcmV0dXJuOworCiAgICAgLy8gRklYTUU6IE1lc3NhZ2UgY2hlY2sgdGhlIG5hdmlnYXRp b25JRC4KICAgICBtX25hdmlnYXRpb25TdGF0ZS0+ZGlkRGVzdHJveU5hdmlnYXRpb24obmF2aWdh dGlvbklEKTsKIH0KQEAgLTM3OTUsMTQgKzM3NTYsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlk U3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBu YQogICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSAmJiBuYXZpZ2F0aW9uSUQpCiAgICAgICAg IG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCk7 CiAKLSAgICAvLyBJZiB0aGlzIHNlZW1pbmdseSBuZXcgbG9hZCBpcyBhY3R1YWxseSBjb250aW51 aW5nIGEgc2VydmVyIHJlZGlyZWN0IGZvciBhIHByZXZpb3VzIG5hdmlnYXRpb24gaW4gYSBuZXcg cHJvY2VzcywKLSAgICAvLyB0aGVuIHdlIGlnbm9yZSB0aGlzIG5vdGlmaWNhdGlvbi4KLSAgICBp ZiAobmF2aWdhdGlvbiAmJiBuYXZpZ2F0aW9uLT5jdXJyZW50UmVxdWVzdElzUmVkaXJlY3QoKSkg ewotICAgICAgICBhdXRvIG5hdmlnYXRpb25Qcm9jZXNzSWRlbnRpZmllciA9IG5hdmlnYXRpb24t PmN1cnJlbnRSZXF1ZXN0UHJvY2Vzc0lkZW50aWZpZXIoKTsKLSAgICAgICAgaWYgKG5hdmlnYXRp b25Qcm9jZXNzSWRlbnRpZmllciAmJiAqbmF2aWdhdGlvblByb2Nlc3NJZGVudGlmaWVyICE9IG1f cHJvY2Vzcy0+Y29yZVByb2Nlc3NJZGVudGlmaWVyKCkpCi0gICAgICAgICAgICByZXR1cm47Ci0g ICAgfQotCiAgICAgTE9HKExvYWRpbmcsICJXZWJQYWdlUHJveHkgJSIgUFJJdTY0ICIgaW4gcHJv Y2VzcyBwaWQgJWkgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSB0byBmcmFtZUlEICUi IFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgJSIgUFJJdTY0ICIsIHVybCAlcyIsIG1fcGFnZUlELCBt X3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgdXJs LnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9h ZGluZywgImRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6IHdlYlBJRCA9ICVpLCBwYWdl SUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNz SWRlbnRpZmllcigpLCBtX3BhZ2VJRCwgZnJhbWVJRCk7CiAKQEAgLTM5MTAsNiArMzg2MywxMSBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2 NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaQogCiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90 ZWN0b3IocGFnZUNsaWVudCgpKTsKIAorICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZSAmJiBtX3By b3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkgPT0gbmF2aWdhdGlvbklEICYmICZtX3Byb3Zp c2lvbmFsUGFnZS0+cHJvY2VzcygpICE9IG1fcHJvY2Vzcy5wdHIoKSkgeworICAgICAgICAvLyBU aGUgbG9hZCBkaWQgbm90IGZhaWwsIGl0IG1lcmVseSBoYXBwZW5pbmcgaW4gYSBuZXcgcHJvdmlz aW9uYWwgcHJvY2Vzcy4KKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIFdlYkZyYW1lUHJv eHkqIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKICAgICBNRVNTQUdFX0NI RUNLKGZyYW1lKTsKIApAQCAtMzk0OCw2ICszOTA2LDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpk aWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2Vj dXJpCiAgICAgfQogCiAgICAgbV9mYWlsaW5nUHJvdmlzaW9uYWxMb2FkVVJMID0geyB9OworCisg ICAgLy8gSWYgdGhlIHByb3Zpc2lvbmFsIHBhZ2UncyBsb2FkIGZhaWxzIHRoZW4gd2UgZGVzdHJv eSB0aGUgcHJvdmlzaW9uYWwgcGFnZS4KKyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UgJiYgbV9w cm92aXNpb25hbFBhZ2UtPm1haW5GcmFtZSgpID09IGZyYW1lKQorICAgICAgICBtX3Byb3Zpc2lv bmFsUGFnZSA9IG51bGxwdHI7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpjbGVhckxvYWREZXBl bmRlbnRDYWxsYmFja3MoKQpAQCAtNDMzOSw4ICs0MzAxLDggQEAgdm9pZCBXZWJQYWdlUHJveHk6 OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYyh1aW50NjRfdCBmcmFtZUlELCBX ZWJDb3IKICAgICBhdXRvKiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7CiAg ICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CiAKLSAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u QWN0aW9uKCpmcmFtZSwgV1RGTW92ZShmcmFtZVNlY3VyaXR5T3JpZ2luKSwgbmF2aWdhdGlvbklE LCBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb25EYXRhKSwgV1RGTW92ZShmcmFtZUluZm9EYXRhKSwg b3JpZ2luYXRpbmdQYWdlSUQsIG9yaWdpbmFsUmVxdWVzdCwgV1RGTW92ZShyZXF1ZXN0KSwgV1RG TW92ZShyZXF1ZXN0Qm9keSksIFdURk1vdmUocmVkaXJlY3RSZXNwb25zZSksIHVzZXJEYXRhLCBQ b2xpY3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJl ZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySURdIChhdXRvLi4uIGFyZ3MpIHsKLSAgICAgICAg bV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRSZWNlaXZlUG9saWN5RGVjaXNp b24oZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJncy4uLiksIG1fcGFnZUlEKTsKKyAgICBkZWNpZGVQ b2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKCpmcmFtZSwgV1RGTW92ZShmcmFtZVNlY3VyaXR5T3Jp Z2luKSwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb25EYXRhKSwgV1RGTW92 ZShmcmFtZUluZm9EYXRhKSwgb3JpZ2luYXRpbmdQYWdlSUQsIG9yaWdpbmFsUmVxdWVzdCwgV1RG TW92ZShyZXF1ZXN0KSwgV1RGTW92ZShyZXF1ZXN0Qm9keSksIFdURk1vdmUocmVkaXJlY3RSZXNw b25zZSksIHVzZXJEYXRhLCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90 ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIHByb2Nlc3Mg PSBtX3Byb2Nlc3MuY29weVJlZigpXSAoYXV0by4uLiBhcmdzKSB7CisgICAgICAgIHByb2Nlc3Mt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihmcmFtZUlE LCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQpOwogICAgIH0pKTsKIH0KIApAQCAtNDU3 NCwxMiArNDUzNiwxMiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yUmVzcG9u c2UodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2VjdXJpdHlPcmlnaQogICAgIE1FU1NBR0VfQ0hF Q0tfVVJMKHJlc3BvbnNlLnVybCgpKTsKIAogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IG5h dmlnYXRpb24gPSBuYXZpZ2F0aW9uSUQgPyBtX25hdmlnYXRpb25TdGF0ZS0+bmF2aWdhdGlvbihu YXZpZ2F0aW9uSUQpIDogbnVsbHB0cjsKLSAgICBhdXRvIGxpc3RlbmVyID0gbWFrZVJlZihmcmFt ZS0+c2V0VXBQb2xpY3lMaXN0ZW5lclByb3h5KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJl ZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIG5hdmlnYXRpb24gPSBXVEZNb3ZlKG5hdmln YXRpb24pXSAoV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbiwgQVBJOjpXZWJzaXRlUG9saWNp ZXMqLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlD bGllbnQsIFJlZlB0cjxTYWZlQnJvd3NpbmdXYXJuaW5nPiYmIHNhZmVCcm93c2luZ1dhcm5pbmcp IG11dGFibGUgeworICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtlUmVmKGZyYW1lLT5zZXRVcFBvbGlj eUxpc3RlbmVyUHJveHkoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZnJh bWVJRCwgbGlzdGVuZXJJRCwgbmF2aWdhdGlvbiA9IFdURk1vdmUobmF2aWdhdGlvbiksIHByb2Nl c3MgPSBtX3Byb2Nlc3MuY29weVJlZigpXSAoV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbiwg QVBJOjpXZWJzaXRlUG9saWNpZXMqLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFJlZlB0cjxTYWZlQnJvd3NpbmdXYXJuaW5nPiYmIHNh ZmVCcm93c2luZ1dhcm5pbmcpIG11dGFibGUgewogICAgICAgICAvLyBGSVhNRTogQXNzZXJ0IHRo ZSBBUEk6OldlYnNpdGVQb2xpY2llcyogaXMgbnVsbHB0ciBoZXJlIG9uY2UgY2xpZW50cyBvZiBX S0ZyYW1lUG9saWN5TGlzdGVuZXJVc2VXaXRoUG9saWNpZXMgZ28gYXdheS4KICAgICAgICAgUkVM RUFTRV9BU1NFUlQocHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCA9PSBQcm9jZXNzU3dhcFJl cXVlc3RlZEJ5Q2xpZW50OjpObyk7CiAgICAgICAgIEFTU0VSVF9VTlVTRUQoc2FmZUJyb3dzaW5n V2FybmluZywgIXNhZmVCcm93c2luZ1dhcm5pbmcpOwotICAgICAgICByZWNlaXZlZFBvbGljeURl Y2lzaW9uKHBvbGljeUFjdGlvbiwgbmF2aWdhdGlvbi5nZXQoKSwgV1RGOjpudWxsb3B0LCBQb2xp Y3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShw cm90ZWN0ZWRUaGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRF0gKGF1dG8uLi4gYXJncykgewotICAg ICAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRSZWNlaXZlUG9s aWN5RGVjaXNpb24oZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJncy4uLiksIG1fcGFnZUlEKTsKKyAg ICAgICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24sIG5hdmlnYXRpb24uZ2V0 KCksIFdURjo6bnVsbG9wdCwgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShbdGhpcywgcHJv dGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQs IHByb2Nlc3MgPSBXVEZNb3ZlKHByb2Nlc3MpXSAoYXV0by4uLiBhcmdzKSB7CisgICAgICAgICAg ICBwcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRSZWNlaXZlUG9saWN5RGVjaXNp b24oZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJncy4uLiksIG1fcGFnZUlEKTsKICAgICAgICAgfSkp OwogICAgIH0sIFNob3VsZEV4cGVjdFNhZmVCcm93c2luZ1Jlc3VsdDo6Tm8pKTsKIApAQCAtNjQ4 Niw4ICs2NDQ4LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnByb2Nlc3NXaWxsQmVjb21lRm9yZWdy b3VuZCgpCiB2b2lkIFdlYlBhZ2VQcm94eTo6cmVzZXRTdGF0ZShSZXNldFN0YXRlUmVhc29uIHJl c2V0U3RhdGVSZWFzb24pCiB7CiAgICAgbV9tYWluRnJhbWUgPSBudWxscHRyOwotICAgIG1fbWFp bkZyYW1lQ3JlYXRpb25IYW5kbGVyID0gbnVsbHB0cjsKLSAgICBtX21haW5GcmFtZVdpbmRvd0Ny ZWF0aW9uSGFuZGxlciA9IG51bGxwdHI7CiAKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBtX3Nj cm9sbGluZ1BlcmZvcm1hbmNlRGF0YSA9IG51bGxwdHI7CkBAIC02Nzc4LDYgKzY3MzgsMTAgQEAg V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyBXZWJQYWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVy cygpCiAgICAgcGFyYW1ldGVycy5hcHBsaWNhdGlvbk1hbmlmZXN0ID0gbV9jb25maWd1cmF0aW9u LT5hcHBsaWNhdGlvbk1hbmlmZXN0KCkgPyBPcHRpb25hbDxXZWJDb3JlOjpBcHBsaWNhdGlvbk1h bmlmZXN0PihtX2NvbmZpZ3VyYXRpb24tPmFwcGxpY2F0aW9uTWFuaWZlc3QoKS0+YXBwbGljYXRp b25NYW5pZmVzdCgpKSA6IFdURjo6bnVsbG9wdDsKICNlbmRpZgogCisjaWYgRU5BQkxFKFNFUlZJ Q0VfV09SS0VSKQorICAgIHBhcmFtZXRlcnMuaGFzUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXJzID0g cHJvY2VzcygpLnByb2Nlc3NQb29sKCkubWF5SGF2ZVJlZ2lzdGVyZWRTZXJ2aWNlV29ya2Vycyht X3dlYnNpdGVEYXRhU3RvcmUpOworI2VuZGlmCisKICAgICBwYXJhbWV0ZXJzLm5lZWRzRm9udEF0 dHJpYnV0ZXMgPSBtX25lZWRzRm9udEF0dHJpYnV0ZXM7CiAKICAgICBtX3Byb2Nlc3MtPmFkZFdl YlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5KG1fdXNlckNvbnRlbnRDb250cm9sbGVyLCBwYXJh bWV0ZXJzKTsKQEAgLTg1MzksNiArODUwMywyMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2ltdWxh dGVEZXZpY2VPcmllbnRhdGlvbkNoYW5nZShkb3VibGUgYWxwaGEsIGRvdWJsZSBiZXRhLCBkbwog ICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2ltdWxhdGVEZXZpY2VPcmll bnRhdGlvbkNoYW5nZShhbHBoYSwgYmV0YSwgZ2FtbWEpLCBtX3BhZ2VJRCk7CiB9CiAKK1dlYlBh Z2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6UGFnZVByb2Nlc3NPdmVycmlkZShXZWJQYWdl UHJveHkmIHBhZ2UsIFdlYlByb2Nlc3NQcm94eSYgbmV3UHJvY2VzcykKKyAgICA6IG1fcGFnZSgm cGFnZSkKKyAgICAsIG1fcHJldmlvdXNQcm9jZXNzKHBhZ2UucHJvY2VzcygpKQoreworICAgIHBh Z2UubV9wcm9jZXNzID0gbmV3UHJvY2VzczsKK30KKworV2ViUGFnZVByb3h5OjpQYWdlUHJvY2Vz c092ZXJyaWRlOjpQYWdlUHJvY2Vzc092ZXJyaWRlKFBhZ2VQcm9jZXNzT3ZlcnJpZGUmJikgPSBk ZWZhdWx0OworCitXZWJQYWdlUHJveHk6OlBhZ2VQcm9jZXNzT3ZlcnJpZGU6On5QYWdlUHJvY2Vz c092ZXJyaWRlKCkKK3sKKyAgICBpZiAobV9wYWdlKQorICAgICAgICBtX3BhZ2UtPm1fcHJvY2Vz cyA9IFdURk1vdmUobV9wcmV2aW91c1Byb2Nlc3MpOworfQorCiAjaWYgRU5BQkxFKERBVEFfREVU RUNUSU9OKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGV0ZWN0RGF0YUluQWxsRnJhbWVzKFdlYkNv cmU6OkRhdGFEZXRlY3RvclR5cGVzIHR5cGVzLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0 IERhdGFEZXRlY3Rpb25SZXN1bHQmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggY2Q4MDFiODA4YzQ2ZTQ1MGQ4Y2RhZDQ5NzA4 ZjQ3ZjhmMDEzNzAyOS4uYzY2NmZkYjZmYjA0ZDc3OGIyM2JlYjE5ZjY1YTExYTlkNjVjNDJiZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTIyNSw2ICsyMjUsNyBA QCBjbGFzcyBOYXRpdmVXZWJLZXlib2FyZEV2ZW50OwogY2xhc3MgTmF0aXZlV2ViTW91c2VFdmVu dDsKIGNsYXNzIE5hdGl2ZVdlYldoZWVsRXZlbnQ7CiBjbGFzcyBQYWdlQ2xpZW50OworY2xhc3Mg UHJvdmlzaW9uYWxQYWdlUHJveHk7CiBjbGFzcyBSZW1vdGVMYXllclRyZWVIb3N0OwogY2xhc3Mg UmVtb3RlTGF5ZXJUcmVlU2Nyb2xsaW5nUGVyZm9ybWFuY2VEYXRhOwogY2xhc3MgUmVtb3RlTGF5 ZXJUcmVlVHJhbnNhY3Rpb247CkBAIC00NTgsOCArNDU5LDcgQEAgcHVibGljOgogICAgIEFQSTo6 SWNvbkxvYWRpbmdDbGllbnQmIGljb25Mb2FkaW5nQ2xpZW50KCkgeyByZXR1cm4gKm1faWNvbkxv YWRpbmdDbGllbnQ7IH0KICAgICB2b2lkIHNldEljb25Mb2FkaW5nQ2xpZW50KHN0ZDo6dW5pcXVl X3B0cjxBUEk6Okljb25Mb2FkaW5nQ2xpZW50PiYmKTsKIAotICAgIGVudW0gY2xhc3MgSXNTd2Fw RnJvbVN1c3BlbmRlZCB7IE5vLCBZZXMgfTsKLSAgICB2b2lkIGluaXRpYWxpemVXZWJQYWdlKElz U3dhcEZyb21TdXNwZW5kZWQgPSBJc1N3YXBGcm9tU3VzcGVuZGVkOjpObyk7CisgICAgdm9pZCBp bml0aWFsaXplV2ViUGFnZSgpOwogCiAgICAgV2Vha1B0cjxTZWNLZXlQcm94eVN0b3JlPiBzZWNL ZXlQcm94eVN0b3JlKGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJik7CiAg ICAgICAgIApAQCAtMTAyNSw2ICsxMDI1LDE5IEBAIHB1YmxpYzoKICAgICBXZWJQcm9jZXNzUHJv eHkmIHByb2Nlc3MoKSB7IHJldHVybiBtX3Byb2Nlc3M7IH0KICAgICBQcm9jZXNzSUQgcHJvY2Vz c0lkZW50aWZpZXIoKSBjb25zdDsKIAorICAgIGNsYXNzIFBhZ2VQcm9jZXNzT3ZlcnJpZGUgewor ICAgIHB1YmxpYzoKKyAgICAgICAgUGFnZVByb2Nlc3NPdmVycmlkZShXZWJQYWdlUHJveHkmLCBX ZWJQcm9jZXNzUHJveHkmIG5ld1Byb2Nlc3MpOworICAgICAgICBQYWdlUHJvY2Vzc092ZXJyaWRl KFBhZ2VQcm9jZXNzT3ZlcnJpZGUmJik7CisgICAgICAgIH5QYWdlUHJvY2Vzc092ZXJyaWRlKCk7 CisKKyAgICBwcml2YXRlOgorICAgICAgICBSZWZQdHI8V2ViUGFnZVByb3h5PiBtX3BhZ2U7Cisg ICAgICAgIFJlZjxXZWJQcm9jZXNzUHJveHk+IG1fcHJldmlvdXNQcm9jZXNzOworICAgIH07CisK KyAgICBQYWdlUHJvY2Vzc092ZXJyaWRlIHRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKFdlYlBy b2Nlc3NQcm94eSYgbmV3UHJvY2VzcykgeyByZXR1cm4gUGFnZVByb2Nlc3NPdmVycmlkZSgqdGhp cywgbmV3UHJvY2Vzcyk7IH0KKwogICAgIFdlYlByZWZlcmVuY2VzJiBwcmVmZXJlbmNlcygpIHsg cmV0dXJuIG1fcHJlZmVyZW5jZXM7IH0KICAgICB2b2lkIHNldFByZWZlcmVuY2VzKFdlYlByZWZl cmVuY2VzJik7CiAKQEAgLTE0MTQsNiArMTQyNywyMSBAQCBwdWJsaWM6CiAgICAgRWRpdGFibGVJ bWFnZUNvbnRyb2xsZXImIGVkaXRhYmxlSW1hZ2VDb250cm9sbGVyKCkgeyByZXR1cm4gKm1fZWRp dGFibGVJbWFnZUNvbnRyb2xsZXI7IH0KICNlbmRpZgogCisgICAgUHJvdmlzaW9uYWxQYWdlUHJv eHkqIHByb3Zpc2lvbmFsUGFnZVByb3h5KCkgY29uc3QgeyByZXR1cm4gbV9wcm92aXNpb25hbFBh Z2UuZ2V0KCk7IH0KKyAgICB2b2lkIGNvbW1pdFByb3Zpc2lvbmFsUGFnZSh1aW50NjRfdCBmcmFt ZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wg ZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90IGZyYW1lTG9hZFR5cGUsIGNv bnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYsIGJvb2wgY29udGFpbnNQbHVnaW5Eb2N1bWVu dCwgT3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJbnNlY3Vy ZUNvbnRlbnQsIGNvbnN0IFVzZXJEYXRhJik7CisKKyAgICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9u YWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBV UkwmJiwgVVJMJiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBk aWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2Vi Q29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBu YXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNvcmU6 OlJlc291cmNlRXJyb3ImLCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkUmVjZWl2ZVNl cnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwg dWludDY0X3QgbmF2aWdhdGlvbklELCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgY29uc3Qg VXNlckRhdGEmKTsKKworICAgIHZvaWQgbG9hZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmln YXRpb24mLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBl LCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2Jq ZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRp b25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKKyAgICB2b2lkIGxv YWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6 T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBP cHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKKworICAgIC8v IElQQzo6TWVzc2FnZVJlY2VpdmVyCisgICAgLy8gSW1wbGVtZW50ZWQgaW4gZ2VuZXJhdGVkIFdl YlBhZ2VQcm94eU1lc3NhZ2VSZWNlaXZlci5jcHAKKyAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdl KElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIG92ZXJyaWRlOworICAgIHZvaWQgZGlk UmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYsIHN0ZDo6 dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+Jikgb3ZlcnJpZGU7CisKIHByaXZhdGU6CiAgICAgV2Vi UGFnZVByb3h5KFBhZ2VDbGllbnQmLCBXZWJQcm9jZXNzUHJveHkmLCB1aW50NjRfdCBwYWdlSUQs IFJlZjxBUEk6OlBhZ2VDb25maWd1cmF0aW9uPiYmKTsKICAgICB2b2lkIHBsYXRmb3JtSW5pdGlh bGl6ZSgpOwpAQCAtMTQzOCwxMiArMTQ2Niw2IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHNldFVz ZXJBZ2VudChTdHJpbmcmJik7CiAKLSAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgotICAgIC8v IEltcGxlbWVudGVkIGluIGdlbmVyYXRlZCBXZWJQYWdlUHJveHlNZXNzYWdlUmVjZWl2ZXIuY3Bw Ci0gICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29k ZXImKSBvdmVycmlkZTsKLSAgICB2b2lkIGRpZFJlY2VpdmVTeW5jTWVzc2FnZShJUEM6OkNvbm5l Y3Rpb24mLCBJUEM6OkRlY29kZXImLCBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVyPiYpIG92 ZXJyaWRlOwotCi0KICAgICAvLyBJUEM6Ok1lc3NhZ2VTZW5kZXIKICAgICBib29sIHNlbmRNZXNz YWdlKHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+LCBPcHRpb25TZXQ8SVBDOjpTZW5kT3B0 aW9uPikgb3ZlcnJpZGU7CiAgICAgSVBDOjpDb25uZWN0aW9uKiBtZXNzYWdlU2VuZGVyQ29ubmVj dGlvbigpIG92ZXJyaWRlOwpAQCAtMTQ2NSwxMiArMTQ4Nyw5IEBAIHByaXZhdGU6CiAgICAgdm9p ZCBkaWRDcmVhdGVTdWJmcmFtZSh1aW50NjRfdCBmcmFtZUlEKTsKICAgICB2b2lkIGRpZENyZWF0 ZVdpbmRvdyh1aW50NjRfdCBmcmFtZUlELCBXZWJDb3JlOjpHbG9iYWxXaW5kb3dJZGVudGlmaWVy JiYpOwogCi0gICAgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90 IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYsIFVSTCYmIHVucmVhY2hhYmxl VVJMLCBjb25zdCBVc2VyRGF0YSYpOwotICAgIHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0 Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2 aWdhdGlvbklELCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgY29uc3QgVXNlckRhdGEmKTsK ICAgICB2b2lkIHdpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RGb3JGcmFtZSh1aW50NjRfdCBmcmFt ZUlELCBjb25zdCBTdHJpbmcmIHVybCwgZG91YmxlIGRlbGF5LCBXZWJDb3JlOjpMb2NrQmFja0Zv cndhcmRMaXN0KTsKICAgICB2b2lkIGRpZENhbmNlbENsaWVudFJlZGlyZWN0Rm9yRnJhbWUodWlu dDY0X3QgZnJhbWVJRCk7CiAgICAgdm9pZCBkaWRDaGFuZ2VQcm92aXNpb25hbFVSTEZvckZyYW1l KHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYpOwotICAgIHZv aWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0 IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0 X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJMLCBjb25zdCBXZWJD b3JlOjpSZXNvdXJjZUVycm9yJiwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2b2lkIGRpZENvbW1p dExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNv bnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIs IHVpbnQzMl90IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYs IGJvb2wgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1 cmVDb250ZW50PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIGNvbnN0IFVzZXJEYXRhJik7CiAg ICAgdm9pZCBkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1 aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCBkaWRGaW5p c2hMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBj b25zdCBVc2VyRGF0YSYpOwpAQCAtMTU3NCwxOCArMTU5MywxNSBAQCBwcml2YXRlOgogICAgIHZv aWQgc2V0Q2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRzKGJvb2wgY2FuU2hvcnRD aXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRzKSB7IG1fY2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRh bFdoZWVsRXZlbnRzID0gY2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRzOyB9CiAK ICAgICB2b2lkIHJlYXR0YWNoVG9XZWJQcm9jZXNzKCk7Ci0gICAgdm9pZCBzd2FwVG9XZWJQcm9j ZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdl UHJveHk+JiYsIElzU3dhcEZyb21TdXNwZW5kZWQpOworICAgIHZvaWQgc3dhcFRvV2ViUHJvY2Vz cyhSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmLCBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94 eT4mJiwgUmVmUHRyPFdlYkZyYW1lUHJveHk+JiYgbWFpbkZyYW1lKTsKICAgICB2b2lkIGRpZEZh aWxUb1N1c3BlbmRBZnRlclByb2Nlc3NTd2FwKCk7CiAgICAgdm9pZCBkaWRTdXNwZW5kQWZ0ZXJQ cm9jZXNzU3dhcCgpOwogCi0gICAgdm9pZCBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoSXNT d2FwRnJvbVN1c3BlbmRlZCA9IElzU3dhcEZyb21TdXNwZW5kZWQ6Ok5vKTsKKyAgICB2b2lkIGZp bmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcygpOwogCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlv bj4gcmVhdHRhY2hUb1dlYlByb2Nlc3NGb3JSZWxvYWQoKTsKICAgICBSZWZQdHI8QVBJOjpOYXZp Z2F0aW9uPiByZWF0dGFjaFRvV2ViUHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tGb3J3YXJkTGlzdEl0 ZW0mKTsKIAotICAgIHZvaWQgbG9hZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24m LCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25z dCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1 c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxX ZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKLSAgICB2b2lkIGxvYWRSZXF1 ZXN0V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0JiYsIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0 KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25h bDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKLQogICAgIHZvaWQgcmVx dWVzdE5vdGlmaWNhdGlvblBlcm1pc3Npb24odWludDY0X3Qgbm90aWZpY2F0aW9uSUQsIGNvbnN0 IFN0cmluZyYgb3JpZ2luU3RyaW5nKTsKICAgICB2b2lkIHNob3dOb3RpZmljYXRpb24oY29uc3Qg U3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcmIGljb25VUkws IGNvbnN0IFN0cmluZyYgdGFnLCBjb25zdCBTdHJpbmcmIGxhbmcsIFdlYkNvcmU6Ok5vdGlmaWNh dGlvbkRpcmVjdGlvbiwgY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlm aWNhdGlvbklEKTsKICAgICB2b2lkIGNhbmNlbE5vdGlmaWNhdGlvbih1aW50NjRfdCBub3RpZmlj YXRpb25JRCk7CkBAIC0xOTUxLDggKzE5NjcsNiBAQCBwcml2YXRlOgogICAgIFJlZjxXZWJzaXRl RGF0YVN0b3JlPiBtX3dlYnNpdGVEYXRhU3RvcmU7CiAKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94 eT4gbV9tYWluRnJhbWU7Ci0gICAgRnVuY3Rpb248dm9pZCgpPiBtX21haW5GcmFtZUNyZWF0aW9u SGFuZGxlcjsKLSAgICBGdW5jdGlvbjx2b2lkKGNvbnN0IFdlYkNvcmU6Okdsb2JhbFdpbmRvd0lk ZW50aWZpZXImKT4gbV9tYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXI7CiAKICAgICBSZWZQ dHI8V2ViRnJhbWVQcm94eT4gbV9mb2N1c2VkRnJhbWU7CiAgICAgUmVmUHRyPFdlYkZyYW1lUHJv eHk+IG1fZnJhbWVTZXRMYXJnZXN0RnJhbWU7CkBAIC0yMzIyLDYgKzIzMzYsOCBAQCBwcml2YXRl OgogICAgIGJvb2wgbV9uZWVkc0ZvbnRBdHRyaWJ1dGVzIHsgZmFsc2UgfTsKICAgICBib29sIG1f bWF5SGF2ZVVuaXZlcnNhbEZpbGVSZWFkU2FuZGJveEV4dGVuc2lvbiB7IGZhbHNlIH07CiAKKyAg ICBzdGQ6OnVuaXF1ZV9wdHI8UHJvdmlzaW9uYWxQYWdlUHJveHk+IG1fcHJvdmlzaW9uYWxQYWdl OworCiAjaWYgSEFWRShQRU5DSUxLSVQpCiAgICAgc3RkOjp1bmlxdWVfcHRyPEVkaXRhYmxlSW1h Z2VDb250cm9sbGVyPiBtX2VkaXRhYmxlSW1hZ2VDb250cm9sbGVyOwogI2VuZGlmCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAppbmRleCBkYjFmZDU4YjkzZGZm NTg2NWQxM2ZjNTQxYjZlNWQ4NzQ2ZWI4ZTBhLi5mN2RmYWU4NjI2YzBjMjhiMDRiZTk0OWFiNTg2 NTQ2NDk2MDQ4OGE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94 eS5jcHAKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAi UGx1Z2luSW5mb1N0b3JlLmgiCiAjaW5jbHVkZSAiUGx1Z2luUHJvY2Vzc01hbmFnZXIuaCIKKyNp bmNsdWRlICJQcm92aXNpb25hbFBhZ2VQcm94eS5oIgogI2luY2x1ZGUgIlRleHRDaGVja2VyLmgi CiAjaW5jbHVkZSAiVGV4dENoZWNrZXJTdGF0ZS5oIgogI2luY2x1ZGUgIlVJTWVzc2FnZVBvcnRD aGFubmVsUHJvdmlkZXIuaCIKQEAgLTQzNiw3ICs0MzcsNyBAQCBSZWY8V2ViUGFnZVByb3h5PiBX ZWJQcm9jZXNzUHJveHk6OmNyZWF0ZVdlYlBhZ2UoUGFnZUNsaWVudCYgcGFnZUNsaWVudCwgUmVm PEFQSQogdm9pZCBXZWJQcm9jZXNzUHJveHk6OmFkZEV4aXN0aW5nV2ViUGFnZShXZWJQYWdlUHJv eHkmIHdlYlBhZ2UsIHVpbnQ2NF90IHBhZ2VJRCwgQmVnaW5zVXNpbmdEYXRhU3RvcmUgYmVnaW5z VXNpbmdEYXRhU3RvcmUpCiB7CiAgICAgQVNTRVJUKCFtX3BhZ2VNYXAuY29udGFpbnMocGFnZUlE KSk7Ci0gICAgQVNTRVJUKCFnbG9iYWxQYWdlTWFwKCkuY29udGFpbnMocGFnZUlEKSk7CisgICAg QVNTRVJUKCFnbG9iYWxQYWdlTWFwKCkuY29udGFpbnMocGFnZUlEKSB8fCBnbG9iYWxQYWdlTWFw KCkuZ2V0KHBhZ2VJRCkgPT0gJndlYlBhZ2UpOwogCiAgICAgaWYgKGJlZ2luc1VzaW5nRGF0YVN0 b3JlID09IEJlZ2luc1VzaW5nRGF0YVN0b3JlOjpZZXMpCiAgICAgICAgIG1fcHJvY2Vzc1Bvb2wt PnBhZ2VCZWdpblVzaW5nV2Vic2l0ZURhdGFTdG9yZSh3ZWJQYWdlKTsKQEAgLTU4NCw2ICs1ODUs MTUgQEAgYm9vbCBXZWJQcm9jZXNzUHJveHk6OmZ1bGxLZXlib2FyZEFjY2Vzc0VuYWJsZWQoKQog fQogI2VuZGlmCiAKK2Jvb2wgV2ViUHJvY2Vzc1Byb3h5OjpoYXNQcm92aXNpb25hbFBhZ2VXaXRo SUQodWludDY0X3QgcGFnZUlEKSBjb25zdAoreworICAgIGZvciAoYXV0byogcHJvdmlzaW9uYWxQ YWdlIDogbV9wcm92aXNpb25hbFBhZ2VzKSB7CisgICAgICAgIGlmIChwcm92aXNpb25hbFBhZ2Ut PnBhZ2UoKS5wYWdlSUQoKSA9PSBwYWdlSUQpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorCiB2b2lkIFdlYlByb2Nlc3NQcm94eTo6dXBkYXRl QmFja0ZvcndhcmRJdGVtKGNvbnN0IEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSYgaXRlbVN0YXRl KQogewogICAgIGlmIChhdXRvKiBpdGVtID0gV2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6aXRlbUZv cklEKGl0ZW1TdGF0ZS5pZGVudGlmaWVyKSkgewpAQCAtNTkxLDcgKzYwMSw3IEBAIHZvaWQgV2Vi UHJvY2Vzc1Byb3h5Ojp1cGRhdGVCYWNrRm9yd2FyZEl0ZW0oY29uc3QgQmFja0ZvcndhcmRMaXN0 SXRlbVN0YXRlJiBpdGVtCiAgICAgICAgIC8vIHRoZSBiYWNrL2ZvcndhcmQgaXRlbXMgcGFnZS4K ICAgICAgICAgLy8gZS5nLiBUaGUgb2xkIHdlYiBwcm9jZXNzIGlzIG5hdmlnYXRpbmcgdG8gYWJv dXQ6YmxhbmsgZm9yIHN1c3BlbnNpb24uCiAgICAgICAgIC8vIFdlIGlnbm9yZSB0aGVzZSB1cGRh dGVzLgotICAgICAgICBpZiAobV9wYWdlTWFwLmNvbnRhaW5zKGl0ZW0tPnBhZ2VJRCgpKSkKKyAg ICAgICAgaWYgKG1fcGFnZU1hcC5jb250YWlucyhpdGVtLT5wYWdlSUQoKSkgfHwgaGFzUHJvdmlz aW9uYWxQYWdlV2l0aElEKGl0ZW0tPnBhZ2VJRCgpKSkKICAgICAgICAgICAgIGl0ZW0tPnNldFBh Z2VTdGF0ZShpdGVtU3RhdGUucGFnZVN0YXRlKTsKICAgICB9CiB9CkBAIC04NzMsNyArODgzLDcg QEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6Om1heWJlU2h1dERvd24oKQogCiBib29sIFdlYlByb2Nl c3NQcm94eTo6Y2FuVGVybWluYXRlQ2hpbGRQcm9jZXNzKCkKIHsKLSAgICBpZiAoIW1fcGFnZU1h cC5pc0VtcHR5KCkgfHwgbV9wcm9jZXNzUG9vbC0+aGFzU3VzcGVuZGVkUGFnZUZvcigqdGhpcykp CisgICAgaWYgKCFtX3BhZ2VNYXAuaXNFbXB0eSgpIHx8IG1fcHJvY2Vzc1Bvb2wtPmhhc1N1c3Bl bmRlZFBhZ2VGb3IoKnRoaXMpIHx8ICFtX3Byb3Zpc2lvbmFsUGFnZXMuaXNFbXB0eSgpKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAoIW1fcHJvY2Vzc1Bvb2wtPnNob3VsZFRlcm1p bmF0ZSh0aGlzKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nl c3NQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKaW5k ZXggNzVmNjVhN2Y3ZWIxYWNjODE5OTkxY2U0ZjlmNjk4NmM5NWI2MWZmMy4uNTA0MjYzMGRlMzcx ZDg1YTgyODM3NDM0OGFhOTY5MTczOWM5Y2Q3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUHJvY2Vzc1Byb3h5LmgKQEAgLTcwLDYgKzcwLDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBj bGFzcyBOZXR3b3JrUHJvY2Vzc1Byb3h5OwogY2xhc3MgT2JqQ09iamVjdEdyYXBoOwogY2xhc3Mg UGFnZUNsaWVudDsKK2NsYXNzIFByb3Zpc2lvbmFsUGFnZVByb3h5OwogY2xhc3MgVXNlck1lZGlh Q2FwdHVyZU1hbmFnZXJQcm94eTsKIGNsYXNzIFZpc2l0ZWRMaW5rU3RvcmU7CiBjbGFzcyBXZWJC YWNrRm9yd2FyZExpc3RJdGVtOwpAQCAtMTI0LDYgKzEyNSw5IEBAIHB1YmxpYzoKICAgICBlbnVt IGNsYXNzIEVuZHNVc2luZ0RhdGFTdG9yZSA6IGJvb2wgeyBObywgWWVzIH07CiAgICAgdm9pZCBy ZW1vdmVXZWJQYWdlKFdlYlBhZ2VQcm94eSYsIHVpbnQ2NF90IHBhZ2VJRCwgRW5kc1VzaW5nRGF0 YVN0b3JlKTsKIAorICAgIHZvaWQgYWRkUHJvdmlzaW9uYWxQYWdlUHJveHkoUHJvdmlzaW9uYWxQ YWdlUHJveHkmIHByb3Zpc2lvbmFsUGFnZSkgeyBBU1NFUlQoIW1fcHJvdmlzaW9uYWxQYWdlcy5j b250YWlucygmcHJvdmlzaW9uYWxQYWdlKSk7IG1fcHJvdmlzaW9uYWxQYWdlcy5hZGQoJnByb3Zp c2lvbmFsUGFnZSk7IH0KKyAgICB2b2lkIHJlbW92ZVByb3Zpc2lvbmFsUGFnZVByb3h5KFByb3Zp c2lvbmFsUGFnZVByb3h5JiBwcm92aXNpb25hbFBhZ2UpIHsgQVNTRVJUKG1fcHJvdmlzaW9uYWxQ YWdlcy5jb250YWlucygmcHJvdmlzaW9uYWxQYWdlKSk7IG1fcHJvdmlzaW9uYWxQYWdlcy5yZW1v dmUoJnByb3Zpc2lvbmFsUGFnZSk7IH0KKwogICAgIHR5cGVuYW1lIFdlYlBhZ2VQcm94eU1hcDo6 VmFsdWVzQ29uc3RJdGVyYXRvclJhbmdlIHBhZ2VzKCkgY29uc3QgeyByZXR1cm4gbV9wYWdlTWFw LnZhbHVlcygpOyB9CiAgICAgdW5zaWduZWQgcGFnZUNvdW50KCkgY29uc3QgeyByZXR1cm4gbV9w YWdlTWFwLnNpemUoKTsgfQogICAgIHVuc2lnbmVkIHZpc2libGVQYWdlQ291bnQoKSBjb25zdCB7 IHJldHVybiBtX3Zpc2libGVQYWdlQ291bnRlci52YWx1ZSgpOyB9CkBAIC0zMzAsNiArMzM0LDgg QEAgcHJpdmF0ZToKIAogICAgIHZvaWQgbG9nRGlhZ25vc3RpY01lc3NhZ2VGb3JSZXNvdXJjZUxp bWl0VGVybWluYXRpb24oY29uc3QgU3RyaW5nJiBsaW1pdEtleSk7CiAKKyAgICBib29sIGhhc1By b3Zpc2lvbmFsUGFnZVdpdGhJRCh1aW50NjRfdCBwYWdlSUQpIGNvbnN0OworCiAgICAgZW51bSBj bGFzcyBJc1dlYWsgeyBObywgWWVzIH07CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gY2xhc3Mg V2Vha09yU3Ryb25nUHRyIHsKICAgICBwdWJsaWM6CkBAIC0zNzMsNiArMzc5LDcgQEAgcHJpdmF0 ZToKIAogICAgIFdlYlBhZ2VQcm94eU1hcCBtX3BhZ2VNYXA7CiAgICAgV2ViRnJhbWVQcm94eU1h cCBtX2ZyYW1lTWFwOworICAgIEhhc2hTZXQ8UHJvdmlzaW9uYWxQYWdlUHJveHkqPiBtX3Byb3Zp c2lvbmFsUGFnZXM7CiAgICAgVXNlckluaXRpYXRlZEFjdGlvbk1hcCBtX3VzZXJJbml0aWF0ZWRB Y3Rpb25NYXA7CiAKICAgICBIYXNoU2V0PFZpc2l0ZWRMaW5rU3RvcmUqPiBtX3Zpc2l0ZWRMaW5r U3RvcmVzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2oKaW5kZXggNTA3ZWRiNzNlNzRjM2E1N2Y0ZWY0NzJmNWI1NDZjYjJkYjA2N2FhOS4uNzA3OWIy Njk4ODVkZjY3YTBlODE5MDkxNmYwYmEwNTg2YmEzMTIwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViS2l0 L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0zMDk1LDYgKzMwOTUsOCBAQAog CQk0NjZCQzAzODFGQTI2NkM5MDAyRkE5QzEgLyogV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rp b24uY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV2ViU1dDb250ZXh0 TWFuYWdlckNvbm5lY3Rpb24uY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NjZC QzAzOTFGQTI2NkM5MDAyRkE5QzEgLyogV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uaCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViU1dDb250ZXh0TWFuYWdlckNvbm5l Y3Rpb24uaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDY2QkMwM0ExRkEyNjZDOTAw MkZBOUMxIC8qIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLm1lc3NhZ2VzLmluICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gdGV4dDsgcGF0aCA9IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLm1lc3NhZ2Vz LmluOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk0NjgzNTY5QTIxRTgxQ0M3MDA2RTI3 QTMgLyogUHJvdmlzaW9uYWxQYWdlUHJveHkuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gUHJvdmlzaW9uYWxQYWdlUHJveHkuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK KwkJNDY4MzU2OUIyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmNwcCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFByb3Zpc2lvbmFsUGFnZVByb3h5 LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDZBMkI2MDYxRTU2NzVBMjAwQzNE RURBIC8qIEJhY2tncm91bmRQcm9jZXNzUmVzcG9uc2l2ZW5lc3NUaW1lci5jcHAgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBCYWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVu ZXNzVGltZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NkEyQjYwNzFFNTY3 NUEyMDBDM0RFREEgLyogQmFja2dyb3VuZFByb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVyLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEJhY2tncm91bmRQcm9jZXNzUmVzcG9uc2l2 ZW5lc3NUaW1lci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NkRGMDYzOTFGMzkw NUU1MDAxOTgwQkIgLyogTmV0d29ya0NPUlNQcmVmbGlnaHRDaGVja2VyLmNwcCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IE5ldHdvcmtDT1JTUHJlZmxpZ2h0Q2hlY2tlci5j cHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC03MzUwLDYgKzczNTIsOCBAQAogCQkJ CTg2RTY3QTIyMTkwRjQxMTgwMDAwNEFCNyAvKiBQcm9jZXNzVGhyb3R0bGVyLmNwcCAqLywKIAkJ CQk4NkU2N0EyMTE5MEY0MTE4MDAwMDRBQjcgLyogUHJvY2Vzc1Rocm90dGxlci5oICovLAogCQkJ CTgzMDQ4QUU1MUFDQTQ1REMwMDgyQzgzMiAvKiBQcm9jZXNzVGhyb3R0bGVyQ2xpZW50LmggKi8s CisJCQkJNDY4MzU2OUIyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmNw cCAqLywKKwkJCQk0NjgzNTY5QTIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQYWdlUHJv eHkuaCAqLywKIAkJCQlBNTVCQTgxQjFCQTI1QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2ViSW5zcGVj dG9yUHJveHkuY3BwICovLAogCQkJCUE1NUJBODE5MUJBMjVCMUUwMDdDRDMzRCAvKiBSZW1vdGVX ZWJJbnNwZWN0b3JQcm94eS5oICovLAogCQkJCUE1NUJBODFBMUJBMjVCMUUwMDdDRDMzRCAvKiBS ZW1vdGVXZWJJbnNwZWN0b3JQcm94eS5tZXNzYWdlcy5pbiAqLywKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcCBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcAppbmRleCAwMDc0OWI0NzdhMjRjZThjY2M4 MjUwMWQ5NGUwOGI2MGVlMWE2MjYzLi5mZmVkMDBjODIwNmE5NGYwZTRmZmM3ZmYzYThhOWRmZjg2 MTNmYWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJG cmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUu Y3BwCkBAIC0yNjMsOCArMjYzLDYgQEAgc3RhdGljIFdlYkNvcmU6OlBvbGljeUFjdGlvbiB0b1Bv bGljeUFjdGlvbihXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uKQogICAgICAgICByZXR1cm4g V2ViQ29yZTo6UG9saWN5QWN0aW9uOjpJZ25vcmU7CiAgICAgY2FzZSBXZWJQb2xpY3lBY3Rpb246 OkRvd25sb2FkOgogICAgICAgICByZXR1cm4gV2ViQ29yZTo6UG9saWN5QWN0aW9uOjpEb3dubG9h ZDsKLSAgICBjYXNlIFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZDoKLSAgICAgICAgYnJlYWs7CiAg ICAgfQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIHJldHVybiBXZWJDb3JlOjpQb2xp Y3lBY3Rpb246Oklnbm9yZTsKQEAgLTI3MiwxMSArMjcwLDggQEAgc3RhdGljIFdlYkNvcmU6OlBv bGljeUFjdGlvbiB0b1BvbGljeUFjdGlvbihXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uKQog CiB2b2lkIFdlYkZyYW1lOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24odWludDY0X3QgbGlzdGVu ZXJJRCwgV2ViUG9saWN5QWN0aW9uIGFjdGlvbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBEb3du bG9hZElEIGRvd25sb2FkSUQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0 ZVBvbGljaWVzKQogewotICAgIGlmICghbV9jb3JlRnJhbWUgfHwgIW1fcG9saWN5TGlzdGVuZXJJ RCB8fCBsaXN0ZW5lcklEICE9IG1fcG9saWN5TGlzdGVuZXJJRCB8fCAhbV9wb2xpY3lGdW5jdGlv bikgewotICAgICAgICBpZiAoYWN0aW9uID09IFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZCkKLSAg ICAgICAgICAgIHBhZ2UoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRGYWlsVG9T dXNwZW5kQWZ0ZXJQcm9jZXNzU3dhcCgpKTsKKyAgICBpZiAoIW1fY29yZUZyYW1lIHx8ICFtX3Bv bGljeUxpc3RlbmVySUQgfHwgbGlzdGVuZXJJRCAhPSBtX3BvbGljeUxpc3RlbmVySUQgfHwgIW1f cG9saWN5RnVuY3Rpb24pCiAgICAgICAgIHJldHVybjsKLSAgICB9CiAKICAgICBGcmFtZVBvbGlj eUZ1bmN0aW9uIGZ1bmN0aW9uID0gV1RGTW92ZShtX3BvbGljeUZ1bmN0aW9uKTsKICAgICBib29s IGZvck5hdmlnYXRpb25BY3Rpb24gPSBtX3BvbGljeUZ1bmN0aW9uRm9yTmF2aWdhdGlvbkFjdGlv biA9PSBGb3JOYXZpZ2F0aW9uQWN0aW9uOjpZZXM7CkBAIC0yOTIsMTYgKzI4Nyw3IEBAIHZvaWQg V2ViRnJhbWU6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1aW50NjRfdCBsaXN0ZW5lcklELCBX ZWJQb2xpY3lBY3Rpb24gYWN0CiAgICAgICAgICAgICBkb2N1bWVudExvYWRlci0+c2V0TmF2aWdh dGlvbklEKG5hdmlnYXRpb25JRCk7CiAgICAgfQogCi0gICAgYm9vbCBzaG91bGRTdXNwZW5kID0g ZmFsc2U7Ci0gICAgaWYgKGFjdGlvbiA9PSBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQpIHsKLSAg ICAgICAgc2hvdWxkU3VzcGVuZCA9IHRydWU7Ci0gICAgICAgIGFjdGlvbiA9IFdlYlBvbGljeUFj dGlvbjo6SWdub3JlOwotICAgIH0KLQogICAgIGZ1bmN0aW9uKHRvUG9saWN5QWN0aW9uKGFjdGlv bikpOwotCi0gICAgaWYgKHNob3VsZFN1c3BlbmQpCi0gICAgICAgIHBhZ2UoKS0+c3VzcGVuZEZv clByb2Nlc3NTd2FwKCk7CiB9CiAKIHZvaWQgV2ViRnJhbWU6OnN0YXJ0RG93bmxvYWQoY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBTdHJpbmcmIHN1Z2dlc3Rl ZE5hbWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmlu ZGV4IDI1ZDZkZmI3MWQwM2E0OTY2NDRjNjIzMmY2ZmI0MjE4ZmE4ZDJmYmIuLmU0OTE4MjQ3YTY3 NjZkNjQyY2JkMzYyZmMzNTM1MTU2MDljNjc2ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC00MDEsNyArNDAxLDcgQEAgV2ViUGFnZTo6V2Vi UGFnZSh1aW50NjRfdCBwYWdlSUQsIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0 ZXJzKQogICAgICwgbV9vdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSB7IHBhcmFtZXRlcnMu b3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgfQogICAgICwgbV9jcHVMaW1pdChwYXJhbWV0 ZXJzLmNwdUxpbWl0KQogI2lmIFBMQVRGT1JNKE1BQykKLSAgICAsIG1fc2hvdWxkQXR0YWNoRHJh d2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uKHBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCkK KyAgICAsIG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uKHBhcmFtZXRl cnMuaXNQcm9jZXNzU3dhcCkKICNlbmRpZgogewogICAgIEFTU0VSVChtX3BhZ2VJRCk7CkBAIC00 NzEsNyArNDcxLDcgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIFdlYlBhZ2VD cmVhdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQogICAgIG1fZHJhd2luZ0FyZWEtPnNldFBh aW50aW5nRW5hYmxlZChmYWxzZSk7CiAgICAgbV9kcmF3aW5nQXJlYS0+c2V0U2hvdWxkU2NhbGVW aWV3VG9GaXREb2N1bWVudChwYXJhbWV0ZXJzLnNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQp OwogCi0gICAgaWYgKHBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCkKKyAgICBpZiAocGFy YW1ldGVycy5pc1Byb2Nlc3NTd2FwKQogICAgICAgICBmcmVlemVMYXllclRyZWUoTGF5ZXJUcmVl RnJlZXplUmVhc29uOjpTd2FwRnJvbVN1c3BlbmRlZCk7CiAKICNpZiBFTkFCTEUoQVNZTkNfU0NS T0xMSU5HKQpAQCAtNjk2LDcgKzY5Niw3IEBAIHZvaWQgV2ViUGFnZTo6cmVpbml0aWFsaXplV2Vi UGFnZShXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICAgICAgbV9k cmF3aW5nQXJlYS0+dXBkYXRlUHJlZmVyZW5jZXMocGFyYW1ldGVycy5zdG9yZSk7CiAgICAgICAg IG1fZHJhd2luZ0FyZWEtPnNldFBhaW50aW5nRW5hYmxlZCh0cnVlKTsKICNpZiBQTEFURk9STShN QUMpCi0gICAgICAgIG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uID0g cGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkOworICAgICAgICBtX3Nob3VsZEF0dGFjaERy YXdpbmdBcmVhT25QYWdlVHJhbnNpdGlvbiA9IHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcDsKICNl bmRpZgogICAgICAgICB1bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlBh Z2VTdXNwZW5kZWQpOwogICAgIH0KQEAgLTMwNTMsMTIgKzMwNTMsNiBAQCB2b2lkIFdlYlBhZ2U6 OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBsaXN0 ZW5lcklELCBXZQogICAgIFdlYkZyYW1lKiBmcmFtZSA9IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigp LndlYkZyYW1lKGZyYW1lSUQpOwogICAgIGlmICghZnJhbWUpCiAgICAgICAgIHJldHVybjsKLSAg ICBpZiAocG9saWN5QWN0aW9uID09IFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZCkgewotICAgICAg ICBBU1NFUlQoZnJhbWUgPT0gbV9tYWluRnJhbWUpOwotICAgICAgICBzZXRJc1N1c3BlbmRlZCh0 cnVlKTsKLQotICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5zZW5kUHJld2FybUluZm9y bWF0aW9uKG1haW5XZWJGcmFtZSgpLT51cmwoKSk7Ci0gICAgfQogICAgIGZyYW1lLT5kaWRSZWNl aXZlUG9saWN5RGVjaXNpb24obGlzdGVuZXJJRCwgcG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uSUQs IGRvd25sb2FkSUQsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiB9CiAKQEAgLTYzMTIsNiAr NjMwNiwxMCBAQCB2b2lkIFdlYlBhZ2U6OnNldElzU3VzcGVuZGVkKGJvb2wgc3VzcGVuZGVkKQog ICAgIGlmIChtX2lzU3VzcGVuZGVkKSB7CiAgICAgICAgIC8vIFVuZnJvemVuIG9uIGRyYXdpbmcg YXJlYSByZXNldC4KICAgICAgICAgZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNv bjo6UGFnZVN1c3BlbmRlZCk7CisKKyAgICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuc2Vu ZFByZXdhcm1JbmZvcm1hdGlvbihtYWluV2ViRnJhbWUoKS0+dXJsKCkpOworCisgICAgICAgIHN1 c3BlbmRGb3JQcm9jZXNzU3dhcCgpOwogICAgIH0gZWxzZQogICAgICAgICBtX3Nob3VsZFJlc2V0 RHJhd2luZ0FyZWFBZnRlclN1c3BlbmQgPSB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh Lm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1h dGlvbkRyYXdpbmdBcmVhLm1tCmluZGV4IDkxYWQ3MWFkZTFiN2RiNGY5ZGNlNjRkNGYzMzA0Njdi MjJiODMzY2MuLjgzYjY1OTkyNzBiNTFjN2JiMThlZmU3MzdhNTkyZTAyNTcxYTI4MDYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmlt YXRpb25EcmF3aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KQEAgLTk3LDcgKzk3LDcgQEAg VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdB cmVhKFdlYlBhZ2UmIHdlYlBhZ2UsIGMKICAgICB1cGRhdGVMYXllckhvc3RpbmdDb250ZXh0KCk7 CiAgICAgc2V0Q29sb3JTcGFjZShwYXJhbWV0ZXJzLmNvbG9yU3BhY2UpOwogCi0gICAgaWYgKCFw YXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQpCisgICAgaWYgKCFwYXJhbWV0ZXJzLmlzUHJv Y2Vzc1N3YXApCiAgICAgICAgIGF0dGFjaCgpOwogfQogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFu Z2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2Q1ZjhlOWRhNTVmMGRiMzEwOTVhMzM3MTk1 ODQ1NzVhYjVlM2Y1Yi4uNTVhZTJkMjg0NGQxMzhhYjA4NTA5Zjg4MDBjNWJkZWI0NTdmNjY2MiAx MDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE2IEBACisyMDE5LTAxLTE0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisK KyAgICAgICAgUmVncmVzc2lvbihQU09OKSBWaWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sg YSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1 NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IEFQSSB0ZXN0IGNvdmVyYWdlLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbToKKyAgICAgICAgKC1bUFNPTk5hdmln YXRpb25EZWxlZ2F0ZSB3ZWJWaWV3OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25SZXNwb25zZTpk ZWNpc2lvbkhhbmRsZXI6XSk6CisKIDIwMTktMDEtMTAgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1x dWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyMzk4 MjUuCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1By b2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQppbmRleCBmMzVkOGJhYTM1M2YwNzAy NGZkNDBlN2Q1Mjc0NTNhNzQyMTBjM2JhLi5kNWJkNWVjNzc2YmQ1ZTE3YjBiZDljOTQwMDJjY2I1 NDQ3Y2E1ZDA4IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KQEAgLTEsNSArMSw1 IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNy0yMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNzIsNiArNzIsNyBA QCBzdGF0aWMgYm9vbCBzZXJ2ZXJSZWRpcmVjdGVkOwogc3RhdGljIEhhc2hTZXQ8cGlkX3Q+IHNl ZW5QSURzOwogc3RhdGljIGJvb2wgd2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdDsKIHN0YXRpYyBi b29sIGRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdDsKK3N0YXRpYyBib29sIHNob3VsZENvbnZlcnRU b0Rvd25sb2FkOwogc3RhdGljIFJldGFpblB0cjxOU1VSTD4gY2xpZW50UmVkaXJlY3RTb3VyY2VV Ukw7CiBzdGF0aWMgUmV0YWluUHRyPE5TVVJMPiBjbGllbnRSZWRpcmVjdERlc3RpbmF0aW9uVVJM OwogCkBAIC0xMjgsNiArMTI5LDExIEBAIC0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2Vi VmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOihXS05hdmlnYXRpCiAgICAgZGlk UmVwb25kVG9Qb2xpY3lEZWNpc2lvbkNhbGwgPSB0cnVlOwogfQogCistICh2b2lkKXdlYlZpZXc6 KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvblJlc3BvbnNlOihX S05hdmlnYXRpb25SZXNwb25zZSAqKW5hdmlnYXRpb25SZXNwb25zZSBkZWNpc2lvbkhhbmRsZXI6 KHZvaWQgKF4pKFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5KSlkZWNpc2lvbkhhbmRsZXIKK3sK KyAgICBkZWNpc2lvbkhhbmRsZXIoc2hvdWxkQ29udmVydFRvRG93bmxvYWQgPyBfV0tOYXZpZ2F0 aW9uUmVzcG9uc2VQb2xpY3lCZWNvbWVEb3dubG9hZCA6IFdLTmF2aWdhdGlvblJlc3BvbnNlUG9s aWN5QWxsb3cpOworfQorCiAtICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlk UmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxOYXZpZ2F0aW9uOihXS05hdmlnYXRp b24gKiluYXZpZ2F0aW9uCiB7CiAgICAgc2VlblBJRHMuYWRkKFt3ZWJWaWV3IF93ZWJQcm9jZXNz SWRlbnRpZmllcl0pOwpAQCAtMTQwNSw3ICsxNDExLDcgQEAgVEVTVChQcm9jZXNzU3dhcCwgU2Vy dmVyUmVkaXJlY3QpCiAKICAgICBFWFBFQ1RfRkFMU0Uoc2VydmVyUmVkaXJlY3RlZCk7CiAgICAg RVhQRUNUX0VRKDMsIG51bWJlck9mRGVjaWRlUG9saWN5Q2FsbHMpOwotICAgIEVYUEVDVF9FUSgy dSwgc2VlblBJRHMuc2l6ZSgpKTsKKyAgICBFWFBFQ1RfRVEoM3UsIHNlZW5QSURzLnNpemUoKSk7 CiB9CiAKIFRFU1QoUHJvY2Vzc1N3YXAsIFNlcnZlclJlZGlyZWN0MikKQEAgLTE0NjcsNiArMTQ3 MywxMDkgQEAgVEVTVChQcm9jZXNzU3dhcCwgU2VydmVyUmVkaXJlY3QyKQogICAgIEVYUEVDVF9X S19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluMS5odG1sIiwgW1t3ZWJWaWV3IFVS TF0gYWJzb2x1dGVTdHJpbmddKTsKIH0KIAorc3RhdGljIGNvbnN0IGNoYXIqIGxpbmtUb1dlYktp dEJ5dGVzID0gUiJQU09OUkVTT1VSQ0UoCis8Ym9keT4KKyAgPGEgaWQ9InRlc3RMaW5rIiBocmVm PSJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIj5MaW5rPC9hPgorPC9ib2R5PgorKVBT T05SRVNPVVJDRSI7CisKK1RFU1QoUHJvY2Vzc1N3YXAsIFBvbGljeUNhbmNlbEFmdGVyU2VydmVy UmVkaXJlY3QpCit7CisgICAgYXV0byBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gPSBhZG9wdE5T KFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgcHJvY2Vz c1Bvb2xDb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbiA9IFlFUzsK KyAgICBhdXRvIHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxsb2NdIF9p bml0V2l0aENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpXSk7CisK KyAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZp Z3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0UHJv Y2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0KCldOworICAgIGF1dG8gaGFuZGxlciA9IGFkb3B0TlMo W1tQU09OU2NoZW1lIGFsbG9jXSBpbml0XSk7CisgICAgW2hhbmRsZXIgYWRkTWFwcGluZ0Zyb21V UkxTdHJpbmc6QCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1sIiB0b0RhdGE6bGlua1Rv V2ViS2l0Qnl0ZXNdOworICAgIFtoYW5kbGVyIGFkZFJlZGlyZWN0RnJvbVVSTFN0cmluZzpAInBz b246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiIHRvVVJMU3RyaW5nOkAicHNvbjovL3d3dy5h cHBsZS5jb20vaWdub3JlLmh0bWwiXTsKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0VVJM U2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAInBzb24iXTsKKworICAg IGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6 TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJh dGlvbi5nZXQoKV0pOworICAgIGF1dG8gbmF2aWdhdGlvbkRlbGVnYXRlID0gYWRvcHROUyhbW1BT T05OYXZpZ2F0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlldyBzZXROYXZp Z2F0aW9uRGVsZWdhdGU6bmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpXTsKKworICAgIG5hdmlnYXRp b25EZWxlZ2F0ZS0+ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiA9IF4oV0tOYXZpZ2F0 aW9uQWN0aW9uICphY3Rpb24sIHZvaWQgKF5kZWNpc2lvbkhhbmRsZXIpKFdLTmF2aWdhdGlvbkFj dGlvblBvbGljeSkpIHsKKyAgICAgICAgaWYgKFthY3Rpb24ucmVxdWVzdC5VUkwuYWJzb2x1dGVT dHJpbmcgaGFzU3VmZml4OkAiaWdub3JlLmh0bWwiXSkgeworICAgICAgICAgICAgZGVjaXNpb25I YW5kbGVyKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeUNhbmNlbCk7CisgICAgICAgICAgICByZXR1 cm47CisgICAgICAgIH0KKyAgICAgICAgZGVjaXNpb25IYW5kbGVyKFdLTmF2aWdhdGlvbkFjdGlv blBvbGljeUFsbG93KTsKKyAgICB9OworCisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05T VVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246Ly93 d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiXV07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVx dWVzdF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUg PSBmYWxzZTsKKyAgICBhdXRvIHBpZEFmdGVyRmlyc3RMb2FkID0gW3dlYlZpZXcgX3dlYlByb2Nl c3NJZGVudGlmaWVyXTsKKworICAgIEVYUEVDVF9FUSgxLCBudW1iZXJPZkRlY2lkZVBvbGljeUNh bGxzKTsKKworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAInRlc3RMaW5rLmNsaWNr KCkiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpy dW4oJmZhaWxlZCk7CisgICAgZmFpbGVkID0gZmFsc2U7CisgICAgZG9uZSA9IGZhbHNlOworCisg ICAgRVhQRUNUX0VRKDMsIG51bWJlck9mRGVjaWRlUG9saWN5Q2FsbHMpOworCisgICAgLy8gV2Ug c2hvdWxkIHN0aWxsIGJlIG9uIGdvb2dsZS5jb20uCisgICAgRVhQRUNUX0VRKHBpZEFmdGVyRmly c3RMb2FkLCBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKKyAgICBFWFBFQ1RfV0tf U1RSRVEoQCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1sIiwgW1t3ZWJWaWV3IFVSTF0g YWJzb2x1dGVTdHJpbmddKTsKKworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAInRl c3RMaW5rLmlubmVyVGV4dCIgY29tcGxldGlvbkhhbmRsZXI6IFsmXSAoaWQgaW5uZXJUZXh0LCBO U0Vycm9yICplcnJvcikgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJMaW5rIiwgaW5uZXJU ZXh0KTsKKyAgICAgICAgZG9uZSA9IHRydWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6 VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7Cit9CisKK1RFU1QoUHJvY2Vzc1N3 YXAsIENyb3NzU2l0ZURvd25sb2FkKQoreworICAgIGF1dG8gcHJvY2Vzc1Bvb2xDb25maWd1cmF0 aW9uID0gYWRvcHROUyhbW19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0p OworICAgIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKS5wcm9jZXNzU3dhcHNPbk5hdmln YXRpb24gPSBZRVM7CisgICAgYXV0byBwcm9jZXNzUG9vbCA9IGFkb3B0TlMoW1tXS1Byb2Nlc3NQ b29sIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOnByb2Nlc3NQb29sQ29uZmlndXJhdGlv bi5nZXQoKV0pOworCisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tX S1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXdDb25maWd1 cmF0aW9uIHNldFByb2Nlc3NQb29sOnByb2Nlc3NQb29sLmdldCgpXTsKKyAgICBhdXRvIGhhbmRs ZXIgPSBhZG9wdE5TKFtbUFNPTlNjaGVtZSBhbGxvY10gaW5pdF0pOworICAgIFtoYW5kbGVyIGFk ZE1hcHBpbmdGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy5nb29nbGUuY29tL21haW4uaHRtbCIg dG9EYXRhOmxpbmtUb1dlYktpdEJ5dGVzXTsKKyAgICBbaGFuZGxlciBhZGRNYXBwaW5nRnJvbVVS TFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiIHRvRGF0YToiSGVsbG8i XTsKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVy LmdldCgpIGZvclVSTFNjaGVtZTpAInBzb24iXTsKKworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0 TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAs IDYwMCkgY29uZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIGF1 dG8gbmF2aWdhdGlvbkRlbGVnYXRlID0gYWRvcHROUyhbW1BTT05OYXZpZ2F0aW9uRGVsZWdhdGUg YWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6bmF2aWdh dGlvbkRlbGVnYXRlLmdldCgpXTsKKworICAgIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VS TFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29uOi8vd3d3 Lmdvb2dsZS5jb20vbWFpbi5odG1sIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVl c3RdOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0g ZmFsc2U7CisgICAgYXV0byBwaWRBZnRlckZpcnN0TG9hZCA9IFt3ZWJWaWV3IF93ZWJQcm9jZXNz SWRlbnRpZmllcl07CisKKyAgICBzaG91bGRDb252ZXJ0VG9Eb3dubG9hZCA9IHRydWU7CisgICAg W3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAidGVzdExpbmsuY2xpY2soKSIgY29tcGxldGlv bkhhbmRsZXI6bmlsXTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmFpbGVkKTsK KyAgICBmYWlsZWQgPSBmYWxzZTsKKyAgICBzaG91bGRDb252ZXJ0VG9Eb3dubG9hZCA9IGZhbHNl OworCisgICAgLy8gV2Ugc2hvdWxkIHN0aWxsIGJlIG9uIGdvb2dsZS5jb20uCisgICAgRVhQRUNU X0VRKHBpZEFmdGVyRmlyc3RMb2FkLCBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsK KyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1sIiwg W1t3ZWJWaWV3IFVSTF0gYWJzb2x1dGVTdHJpbmddKTsKKworICAgIFt3ZWJWaWV3IGV2YWx1YXRl SmF2YVNjcmlwdDpAInRlc3RMaW5rLmlubmVyVGV4dCIgY29tcGxldGlvbkhhbmRsZXI6IFsmXSAo aWQgaW5uZXJUZXh0LCBOU0Vycm9yICplcnJvcikgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEo QCJMaW5rIiwgaW5uZXJUZXh0KTsKKyAgICAgICAgZG9uZSA9IHRydWU7CisgICAgfV07CisgICAg VGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7Cit9CisK IGVudW0gY2xhc3MgU2hvdWxkRW5hYmxlUFNPTiB7IE5vLCBZZXMgfTsKIHN0YXRpYyB2b2lkIHJ1 bkNsaWVudFNpZGVSZWRpcmVjdFRlc3QoU2hvdWxkRW5hYmxlUFNPTiBzaG91bGRFbmFibGVQU09O KQogewpAQCAtMjIzMiwxMiArMjM0MSwyNyBAQCBURVNUKFByb2Nlc3NTd2FwLCBQYWdlU2hvd0hp ZGUpCiAKICAgICBFWFBFQ1RfRVEoN3UsIFtyZWNlaXZlZE1lc3NhZ2VzIGNvdW50XSk7CiAgICAg RVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2Vz aG93IE5PVCBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzBdKTsKLSAgICBFWFBF Q1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUg cGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7Ci0gICAgRVhQRUNUX1dLX1NU UkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgTk9UIHBlcnNp c3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOwotICAgIEVYUEVDVF9XS19TVFJFUShA InBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJl Y2VpdmVkTWVzc2FnZXMuZ2V0KClbM10pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93 d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1l c3NhZ2VzLmdldCgpWzRdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtp dC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5n ZXQoKVs1XSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFp bi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7 CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdIGhhc1ByZWZpeDpAInBzb246Ly93 d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiXSkgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJw c29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVj ZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246 Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93IE5PVCBwZXJzaXN0ZWQiLCByZWNl aXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsKKyAgICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tf U1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlc2hvdyBOT1QgcGVy c2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7CisgICAgICAgIEVYUEVDVF9XS19T VFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0 ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsKKyAgICB9CisgICAgaWYgKFtyZWNlaXZl ZE1lc3NhZ2VzLmdldCgpWzNdIGhhc1ByZWZpeDpAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4u aHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29t L21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClb M10pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFp bi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs0XSk7 CisgICAgfSBlbHNlIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJr aXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMu Z2V0KClbM10pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNv bS9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgp WzRdKTsKKyAgICB9CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdIGhhc1ByZWZp eDpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiXSkgeworICAgICAgICBFWFBFQ1Rf V0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVy c2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7CisgICAgICAgIEVYUEVDVF9XS19T VFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3Rl ZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAgIH0gZWxzZSB7CisgICAgICAgIEVY UEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93 IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0pOworICAgICAgICBFWFBFQ1Rf V0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVy c2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7CisgICAgfQogfQogCiAvLyBEaXNh YmxpbmcgdGhlIHBhZ2UgY2FjaGUgZXhwbGljaXRseSBpcyAoZm9yIHNvbWUgcmVhc29uKSBub3Qg YXZhaWxhYmxlIG9uIGlPUy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyMWY3Nzg4MjVkNzFiN2Y2MTY1OTJjMjZjMjk3M2Ew MWRmOTgwNGZjLi43Y2Q3OTY0YmViMTc2M2U0MTY4OWE0OTc5MzE5N2M2ODEyZGEzNWQ2IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMDEtMTQgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxl LmNvbT4KKworICAgICAgICBSZWdyZXNzaW9uKFBTT04pIFZpZXcgYmVjb21lcyBibGFuayBhZnRl ciBjbGljayBhIGNyb3NzLXNpdGUgZG93bmxvYWQgbGluaworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzMzYxCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS80NzA5OTU3Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBTa2lwIHRlc3QgdGVzdGluZyB0aGUgY3Jvc3MtcHJvY2VzcyBET01XaW5kb3cgQVBJIGFz IEkgYnJva2UgaXQgd2l0aCB0aGlzIHBhdGNoLgorICAgICAgICBUaGUgZmVhdHVyZSBpcyBmYXIg ZnJvbSByZWFkeSBhbmQgb2ZmIGJ5IGRlZmF1bHQgYW55d2F5LiBJIHdpbGwgYWRkIHN1cHBvcnQg YmFjaworICAgICAgICBpbiBhIGZvbGxvdy11cC4KKworICAgICAgICAqIHBsYXRmb3JtL3drMi9U ZXN0RXhwZWN0YXRpb25zOgorCiAyMDE5LTAxLTEwICBDb21taXQgUXVldWUgIDxjb21taXQtcXVl dWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjM5ODI1 LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMg Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA4ZTk1OWVk YWZmZDg5MjdlZjljMmFhYzMxNmU5ZTMxMDBjZDE0MGNiLi45ZDkwYmU4YjQ4ZTU3Yzk2MGJjZGE2 ODZjZTI0NDBkNzEzOGJiMGY2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIv VGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVj dGF0aW9ucwpAQCAtNzMzLDggKzczMyw4IEBAIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlz dGljcy9yZW1vdmUtYmxvY2tpbmctaW4tcmVkaXJlY3QuaHRtbCBbIFNraXAgXQogaHR0cC90ZXN0 cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL25vbi1wcmV2YWxlbnQtcmVzb3VyY2VzLWNhbi1hY2Nl c3MtY29va2llcy1pbi1hLXRoaXJkLXBhcnR5LWNvbnRleHQuaHRtbCBbIFNraXAgXQogaHR0cC90 ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL2NhcC1jYWNoZS1tYXgtYWdlLWZvci1wcmV2YWxl bnQtcmVzb3VyY2UuaHRtbCBbIFNraXAgXQogCi0jIFByb2Nlc3Mgc3dhcHBpbmcgaXMgb25seSBp bXBsZW1lbnRlZCBvbiBXZWJLaXQyLgotaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3Byb2Nlc3Mtc3dh cC13aW5kb3ctb3Blbi5odG1sIFsgUGFzcyBdCisjIFRoaXMgZmVhdHVyZSBpcyBjdXJyZW50bHkg ZGlzYWJsZWQgYnkgZGVmYXVsdCBhbmQgdW5maW5pc2hlZCA8cmRhcjovL3Byb2JsZW0vMzg5MjUw Nzc+LgoraHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3Byb2Nlc3Mtc3dhcC13aW5kb3ctb3Blbi5odG1s IFsgU2tpcCBdCiAKICMgQ3Jvc3MtT3JpZ2luLVJlc291cmNlLVBvbGljeSByZXNwb25zZSBoZWFk ZXIgaXMgb25seSBpbXBsZW1lbnRlZCBpbiBXZWJLaXQyLgogaHR0cC93cHQvY3Jvc3Mtb3JpZ2lu LXJlc291cmNlLXBvbGljeS8gWyBQYXNzIF0K 359071 2019-01-14 13:10:32 -0800 2019-01-14 15:41:35 -0800 Patch bug-193361-20190114131031.patch text/plain 98307 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5ODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Y4YjllNWYwMzU1YTQ0 MzU0Yjc4OTdlMTRhNjE0MDQwYzVmNWY0MC4uMzUwNjUyYjM0MzQ2YWUyYTU3MTkyODM2ZTZlMWI2 NGQ0MjI2MjhlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAxLTE0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBW aWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAg ICAgIFdoZW4gcmVzdG9yaW5nIGZyb20gUGFnZUNhY2hlLCBtYWtlIHN1cmUgd2Ugbm90aWZ5IHRo ZSBjbGllbnQgdGhhdCB0aGUgbG9hZCB3YXMgY29tbWl0dGVkCisgICAgICAgICpiZWZvcmUqIHdl IHRlbGwgaXQgdGhhdCB0aGUgbmF2aWdhdGlvbiBpcyBjb21wbGV0ZS4gVGhpcyB3b3VsZCBjb25m dXNlIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eQorICAgICAgICBsb2dpYyBpbiB0aGUgVUlQcm9j ZXNzLgorCiAyMDE5LTAxLTEwICBKdXN0aW4gRmFuICA8anVzdGluX2ZhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW1dlYkdQVV0gQWRkIEJpbmRHcm91cEJpbmRpbmcsIEJpbmRHcm91cERlc2NyaXB0 b3IsIGFuZCBCdWZmZXJCaW5kaW5nIGRpY3Rpb25hcmllcyBmcm9tIEFQSQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAw ZjAwYWJjZDhkYzUyZGViNmE3ZWViMTc2NmU4YjAxNjIxMDY1OGU2Li42NTg2NThhOTA1MDY3NzA2 OTdmM2IyNThlYTUzZjA3NjZkOWZiMDE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwMSBAQAorMjAx OS0wMS0xNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFJlZ3Jl c3Npb24oUFNPTikgVmlldyBiZWNvbWVzIGJsYW5rIGFmdGVyIGNsaWNrIGEgY3Jvc3Mtc2l0ZSBk b3dubG9hZCBsaW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTMzNjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBpc3N1ZSB0cmFja2Vk IGJ5IHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczIGlzIHRoYXQgYSBwcm92aXNpb25hbCBsb2FkIG1h eSBnZXQKKyAgICAgICAgY2FuY2VsZWQgKG9yIGNvbnZlcnRlZCBpbnRvIGEgZG93bmxvYWQpICph ZnRlciogd2UndmUgZGVjaWRlZCB0byBwcm9jZXNzLXN3YXAuCisgICAgICAgIEluIHN1Y2ggY2Fz ZXMsIHRoZSB2aWV3IHNob3VsZCBrZWVwIGRpc3BsYXlpbmcgdGhlIGN1cnJlbnQgc2l0ZSBhbmQg aXQgc2hvdWxkCisgICAgICAgIHN0aWxsIGJlIGludGVyYWN0aXZlLiBIb3dldmVyLCB3aXRoIHRo ZSBwcmV2aW91cyBQU09OIG1vZGVsLCB0aGUgdmlldyAocGFnZVByb3h5KQorICAgICAgICB3b3Vs ZCBoYXZlIGFscmVhZHkgc3dhcHBlZCB0byB0aGUgbmV3IHByb2Nlc3MgYW5kIHdvdWxkIGVuZCB1 cCBkaXNwbGF5aW5nIHRoZQorICAgICAgICBpbml0aWFsbHkgZW1wdHkgZG9jdW1lbnQuCisKKyAg ICAgICAgVG8gYWRkcmVzcyB0aGUgaXNzdWUsIHRoaXMgcGF0Y2ggaW50cm9kdWNlcyB0aGUgY29u Y2VwdCBvZiBhIHByb3Zpc2lvbmFsIGxvYWQKKyAgICAgICAgaW4gdGhlIFVJUHJvY2VzcywgaGFu ZGxlZCBieSBhIFByb3Zpc2lvbmFsUGFnZVByb3h5IHdoaWNoIGhhcyBpdHMgb3duIHByaXZpc2lv bmFsCisgICAgICAgIHByb2Nlc3MuIFRoZSBXZWJQYWdlUHJveHkgb3ducyB0aGUgUHJvdmlzaW9u YWxQYWdlUHJveHkgYnV0IHdlIGRvIG5vdCBjb21taXQgdGhlCisgICAgICAgIHByb3Zpc2lvbmFs IHBhZ2UgdW50aWwgYWZ0ZXIgdGhlIGxvYWQgd2FzIGNvbW1pdHRlZCBpbiB0aGUgbmV3IHByb2Nl c3MuIFRoaXMgbWVhbnMKKyAgICAgICAgdGhhdCB0aGUgdmlldyAvIFdlYlBhZ2VQcm94eSBrZWVw cyB1c2luZyB0aGUgb2xkIHByb2Nlc3MgYW5kIGRpc3BsYXlzIHRoZSBjdXJyZW50CisgICAgICAg IGNvbnRlbnQgdW50aWwgYSBsb2FkIGhhcyBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHBh Z2UuIElmIG5vIGxvYWQgY29tbWl0cworICAgICAgICBpbiB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vz cyAoZS5nLiBiZWNhdXNlIHRoZSBsb2FkIGlzIGNhbmNlbGxlZCBvciBjb252ZXJ0ZWQgaW50bwor ICAgICAgICBhIGRvd25sb2FkKSwgdGhlbiB3ZSBtZXJlbHkgZGVzdHJveSB0aGUgUHJvdmlzaW9u YWxQYWdlUHJveHkgYW5kIHRlcm1pbmF0ZSBpdHMKKyAgICAgICAgcHJvY2Vzcywgd2l0aG91dCBp bXBhY3RpbmcgdGhlIFdlYlBhZ2VQcm94eS4KKworICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVyczo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVycy5oOgorICAgICAgICBSZW5hbWUgaXNTd2FwRnJvbVN1c3BlbmRlZCB0byBpc1Byb2Nl c3NTd2FwIGZvciBjbGFyaXR5IGFzIHdlIGFsd2F5cyB3YW50IHRvCisgICAgICAgIGRlbGF5IGF0 dGFjaGluZyB0aGUgZHJhd2luZyBhcmVhIGluIGNhc2Ugb2YgYSBwcm9jZXNzLXN3YXAsIG5vIG1h dHRlciB3aGF0CisgICAgICAgIG5vdyB0aGF0IHRoZSBwcmV2aW91cyBwcm9jZXNzIGlzIGtlcHQg YWxpdmUgdW50aWwgdGhlIHByb3Zpc2lvbmFsIGxvYWQgaXMKKyAgICAgICAgY29tbWl0dGVkIGlu IHRoZSBuZXcgcHJvY2Vzcy4KKworICAgICAgICAqIFNoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaDoK KyAgICAgICAgRHJvcCBTdXNwZW5kIHBvbGljeSBhY3Rpb24uIEF0IGRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb24gdGltZSwgaW4gY2FzZSBvZgorICAgICAgICBwcm9jZXNzLXN3YXAsIHdl IG5vdyB0ZWxsIHRoZSBwcmV2aW91cyBwcm9jZXNzIHRvIHNpbXBseSBpZ25vcmUgdGhlIGxvYWQs IHdoaWxlCisgICAgICAgIHdlIGNyZWF0ZSBhIFByb3Zpc2lvbmFsUGFnZVByb3h5IHRvIGRvIHRo ZSBuZXcgbG9hZCBpbiBhIG5ldyBwcm9jZXNzLgorICAgICAgICBTdXNwZW5zaW9uIG9mIHRoZSBw cmV2aW91cyBwYWdlIGluIHRoZSBvbGQgcHJvY2VzcywgaGFwcGVucyBsYXRlciwgd2hlbiBhIGxv YWQKKyAgICAgICAgaXMgYWN0dWFsbHkgY29tbWl0dGVkIGluIHRoZSBuZXcgcHJvY2Vzcy4KKwor ICAgICAgICAqIFNvdXJjZXMudHh0OgorICAgICAgICBBZGQgbmV3IFByb3Zpc2lvbmFsUGFnZVBy b3h5IGZpbGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToK KyAgICAgICAgKC1bV0tXZWJWaWV3IF9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0YXRl XSk6CisgICAgICAgIFdoZW4gY2FsbGluZyBfa2lsbFdlYkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRT dGF0ZSBvbiBhIFdLV2ViVmlldywga2lsbCBib3RoIHRoZSBjdXJyZW50CisgICAgICAgIHByb2Nl c3MgYW5kIHRoZSBwcm92aXNpb25hbCBvbmUsIHRvIG1haW50YWluIHByZXZpb3VzIGJlaGF2aW9y IGluIG91ciBBUEkgdGVzdHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUNsaWVudC5oOgor ICAgICAgICBUaW55IGJ1aWxkIGZpeC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Qcm92aXNpb25h bFBhZ2VQcm94eS5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQ cm94eTo6UHJvdmlzaW9uYWxQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25h bFBhZ2VQcm94eTo6flByb3Zpc2lvbmFsUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OnRha2VEcmF3aW5nQXJlYSk6CisgICAgICAgIChXZWJLaXQ6OlBy b3Zpc2lvbmFsUGFnZVByb3h5OjpjYW5jZWwpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25h bFBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6bG9hZERhdGFXaXRoTmF2aWdhdGlvbik6CisgICAgICAgIChXZWJLaXQ6 OlByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKToKKyAgICAg ICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0pOgor ICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1l KToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlz aW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94 eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJL aXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2FnZSk6CisgICAgICAgIChX ZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlU3luY01lc3NhZ2UpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oOiBBZGRlZC4KKyAgICAgICAg KFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OnBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpQ cm92aXNpb25hbFBhZ2VQcm94eTo6bWFpbkZyYW1lIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6 UHJvdmlzaW9uYWxQYWdlUHJveHk6OnByb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBjb25zdCk6CisgICAg ICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpuYXZpZ2F0aW9uSUQgY29uc3QpOgor ICAgICAgICBBZGQgbmV3IFByb3Zpc2lvbmFsUGFnZVByb3h5IGNsYXNzIHRvIHdyYXAgdGhlIHBy b3Zpc2lvbmFsIGxvYWQgaW4gdGhlIG5ldyBwcm9jZXNzCisgICAgICAgIGFmdGVyIGEgc3dhcC4g VGhlIHByb3Zpc2lvbmFsIHBhZ2UgaXMgb3duZWQgYnkgdGhlIFdlYlBhZ2VQcm94eSBhbmQgd2Ug b25seSBjb21taXQKKyAgICAgICAgdGhlIHByb3Zpc2lvbmFsIHBhZ2Ugd2hlbiB0aGUgbG9hZCBp cyBjb21taXR0ZWQuIFVudGlsIHRoZW4sIHRoZSBXZWJQYWdlUHJveHkga2VlcHMKKyAgICAgICAg dXNpbmcgdGhlIG9sZCBwcm9jZXNzIGFuZCBkaXNwbGF5aW5nIHRoZSBjdXJyZW50IGNvbnRlbnQu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5Ojp+U3VzcGVuZGVkUGFnZVByb3h5KToKKyAgICAg ICAgKFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5Ojp1bnN1c3BlbmQpOgorICAgICAgICAoV2Vi S2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6OmRpZFByb2Nlc3NSZXF1ZXN0VG9TdXNwZW5kKToKKyAg ICAgICAgVW5yZWdpc3RlciB0aGUgU3VzcGVuZGVkUGFnZVByb3h5IGFzIGFuIElQQyBtZXNzYWdl IHJlY2VpdmVyIGEgbGl0dGxlIGJpdCBlYXJsaWVyCisgICAgICAgIHdoZW4gd2UncmUgZ29pbmcg dG8gdW5zdXNwZW5kIGl0LiBUaGlzIGF2b2lkcyBjb25mbGljdGluZyB3aXRoIHRoZSBQcm92aXNp b25hbFBhZ2VQcm94eQorICAgICAgICB3aGljaCB0cmllcyB0byByZWdpc3RlciBpdHNlbGYgYXMg YW4gSVBDIG1lc3NhZ2UgcmVjZWl2ZXIgZm9yIHRoZSBzYW1lIHBhZ2VJRCB3aGVuCisgICAgICAg IGEgcHJvY2Vzcy1zd2FwIG9jY3VycyBhbmQgd2UncmUgc3dpdGNoaW5nIHRvIGEgc3VzcGVuZGVk IHBhZ2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkZyYW1lUHJveHk6OmlzTWFpbkZyYW1lIGNvbnN0KToKKyAgICAgICAgV2Vi RnJhbWVQcm94eTo6aXNNYWluRnJhbWUoKSByZWxpZXMgb24gY2hlY2tpbmcgdGhhdCB0aGUgZnJh bWUgaXMgdGhlIFdlYlBhZ2VQcm94eSdzIG1fbWFpbkZyYW1lLgorICAgICAgICBOb3cgdGhhdCB0 aGUgV2ViUGFnZVByb3h5IGNhbiBoYXZlIGEgUHJvdmlzaW9uYWxQYWdlUHJveHksIGFsc28gY2hl Y2sgaWYgaXQgaXMgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5J3MKKyAgICAgICAgbV9tYWluRnJh bWUgdG8gbWFpbnRhaW4gcHJldmlvdXMgYmVoYXZpb3IuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpzd2FwVG9X ZWJQcm9jZXNzKToKKyAgICAgICAgc3dhcFRvV2ViUHJvY2VzcygpIG5vIGxvbmdlciB0YWtlcyBj YXJlIG9mIHVuc3VzcGVuZGluZyB0aGUgU3VzcGVuZGVkUGFnZSBiZWNhdXNlIHdlIG5vdyBjYWxs IHN3YXBUb1dlYlByb2Nlc3MoKQorICAgICAgICBsYXRlciwgd2hlbiBhIGxvYWQgaXMgYWN0dWFs bHkgY29tbWl0dGVkIGluIHRoZSBwcm92aXNpb25hbCBwYWdlIC8gcHJvY2Vzcy4gc3dhcFRvV2Vi UHJvY2VzcygpIG5vdyBhbHNvIG5lZWRzCisgICAgICAgIHRvIGluaXRpYWxpemUgc29tZSBkYXRh IG1lbWJlcnMgc3VjaCBhcyB0aGUgZHJhd2luZyBhcmVhIGFuZCB0aGUgbWFpbiBmcmFtZSBhcyBp dCBpcyB0cmFuc2ZlcnJpbmcgdGhlbSBvdmVyIGZyb20KKyAgICAgICAgdGhlIFByb3Zpc2lvbmFs UGFnZVByb3h5IHdoaWNoIHN0YXJ0ZWQgdGhlIHByb3Zpc2lvbmFsIGxvYWQuCisKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MpOgorICAg ICAgICBXZSBubyBsb25nZXIgbmVlZCBJc1N3YXBGcm9tU3VzcGVuZGVkIHBhcmFtZXRlciBhcyB0 aGlzIGlzIGNhbGxlZCBsYXRlciBub3csIGFmdGVyIGEgbG9hZCBoYXMgYWN0dWFsbHkgYmVlbgor ICAgICAgICBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHByb2Nlc3MuCisKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSk6CisgICAgICAgIC0gV2Ug bm8gbG9uZ2VyIG5lZWQgSXNTd2FwRnJvbVN1c3BlbmRlZCBwYXJhbWV0ZXIgYXMgdGhpcyBpcyBj YWxsZWQgbGF0ZXIgbm93LCBhZnRlciBhIGxvYWQgaGFzIGFjdHVhbGx5IGJlZW4KKyAgICAgICAg ICBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHByb2Nlc3MuCisgICAgICAgIC0gQWxzbyBk byBub3QgcmUtaW5pdGlhbGl6ZSBtX2RyYXdpbmdBcmVhIGlmIGl0IGlzIGFscmVhZHkgc2V0IGJl Y2F1c2Ugc3dhcFRvV2ViUHJvY2VzcygpIG5vdyB0cmFuc2ZlcnMgdGhlCisgICAgICAgICAgZHJh d2luZyBhcmVhIGZyb20gdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGJlZm9yZSBjYWxsaW5nIHRo aXMgbWV0aG9kLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3RX aXRoTmF2aWdhdGlvbik6CisgICAgICAgIE9ubHkgY2FsbCBzZXRQZW5kaW5nQVBJUmVxdWVzdFVS TCgpIGluIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oKSBvbmx5IGlmIFNob3VsZFRyZWF0QXND b250aW51aW5nTG9hZCBpcyBub3QKKyAgICAgICAgWWVzLiBUaGlzIGF2b2lkcyBoaXR0aW5nIHNv bWUgYXNzZXJ0aW9ucyBhcyB0aGlzIHdhcyBhbHJlYWR5IGNhbGxlZCBkdXJpbmcgdGhlIGZpcnN0 IEFQSSBjYWxsIGlmIG5lZWRlZC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJl Y2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uKToKKyAgICAgICAgSW4gY2FzZSBvZiBwcm9j ZXNzIHN3YXAsIHRlbGwgdGhlIHByZXZpb3VzIHByb2Nlc3MgdG8gaWdub3JlIHRoZSBsb2FkIGlu c3RlYWQgb2Ygc3VzcGVuZGluZyBpdCByaWdodCBhd2F5LgorICAgICAgICBTdXNwZW5zaW9uIG5v dyBoYXBwZW5zIGxhdGVyLCBvbmx5IGlmIHdlIGVuZCB1cCBjb21taXR0aW5nIHRoZSBwcm92aXNp b25hbCBsb2FkIGluIHRoZSBuZXcgcHJvY2Vzcy4KKyAgICAgICAgQWxzbyBkaXNjYXJkIHRoZSBT dXNwZW5kZWRQYWdlIGlmIGl0IGZhaWxlZCB0byBzdXNwZW5kICh3ZSBvbmx5IHJldXNlIGl0cyBw cm9jZXNzIGluIHRoaXMgY2FzZSkuIFRoaXMgdXNlZAorICAgICAgICB0byBoYXBwZW4gYSBiaXQg bGF0ZXIgYnV0IGl0IGlzIGNsZWFyZXIgaWYgd2UgZG8gdGhpcyBhcyBlYXJseSBhcyBwb3NzaWJs ZSBJIHRoaW5rLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y29tbWl0UHJvdmlz aW9uYWxQYWdlKToKKyAgICAgICAgV2hlbiB0aGUgbG9hZCBpcyBjb21taXR0ZWQgaW4gdGhlIG5l dyBwcm9jZXNzLCB3ZSBjYWxsIFdlYlBhZ2VQcm94eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKCku IEl0IHRha2VzIGNhcmUgb2Y6CisgICAgICAgIC0gQWN0dWFsbHkgc3dhcHBpbmcgdGhlIFdlYlBh Z2VQcm94eSB0byB0aGUgbmV3IHByb2Nlc3MgYnkgY2FsbGluZyBwcm9jZXNzRGlkVGVybWluYXRl KCkgLyBzd2FwVG9XZWJQcm9jZXNzKCkuCisgICAgICAgIC0gU3VzcGVuZGluZyB0aGUgY3VycmVu dCBwYWdlLgorICAgICAgICAtIExldHRpbmcgdGhlIGNsaWVudCBrbm93IHRoZSBsb2FkIGlzIGNv bWl0dGVkCisgICAgICAgIC0gRGVzdHJveSB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkuCisgICAg ICAgIFRoaXMgd29yayB1c2VkIHRvIGhhcHBlbiBlYXJsaWVyIGluIGNvbnRpbnVlTmF2aWdhdGlv bkluTmV3UHJvY2VzcygpLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y29udGlu dWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKToKKyAgICAgICAgTW92ZWQgc29tZSBvZiB0aGUgbG9n aWMgdG8gY29tbWl0UHJvdmlzaW9uYWxQYWdlKCkuIFdlIG5vdyBtZXJlbHkgc3RhcnQgdGhlIGxv YWQgaW4gYSBuZXcgUHJvdmlzaW9uYWxQYWdlUHJveHksCisgICAgICAgIHdpdGhvdXQgYWN0dWFs bHkgaGF2aW5nIHRoZSBXZWJQYWdlUHJveHkgc3dpdGNoIHRvIHRoZSBuZXcgcHJvY2VzcyB5ZXQu CisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVdpbmRvdyk6CisgICAgICAg IERyb3Agc29tZSBjb2RlIHRoYXQgaXMgbm8gbG9uZ2VyIG5lZWRlZCwgbm93IHRoYXQgdGhlIFBy b3Zpc2lvbmFsUGFnZVByb3h5IHRha2VzIGNhcmUgb2YgdGhpcy4KKworICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmRpZERlc3Ryb3lOYXZpZ2F0aW9uKToKKyAgICAgICAgT24gcHJvY2Vz cy1zd2FwLCB3aGVuIHRlbGxpbmcgdGhlIHByZXZpb3VzIHByb2Nlc3MgdG8gaWdub3JlIHRoZSBs b2FkIGFuZCBzdGFydGluZyB0aGUgbmV3IGxvYWQgaW4gYSBuZXcKKyAgICAgICAgUHJvdmlzaW9u YWxQYWdlUHJveHksIHRoZSBwcmV2aW91cyBXZWJQYWdlIGF0dGVtcHRzIHRvIGRlc3Ryb3kgdGhl IG5hdmlnYXRpb24uIEluIHRoaXMgY2FzZSwgd2UgaWdub3JlCisgICAgICAgIHRoZSBjYWxsIHNp bmNlIHRoZSBuYXZpZ2F0aW9uIGlzIG1lcmVseSB0YWtlbiBvdmVyIGJ5IHRoZSBQcm92aXNpb25h bFBhZ2VQcm94eS4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICBNb3ZlZCBzb21lIFBTT04gbG9naWMgdG8g dGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGluc3RlYWQuCisKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICBXaGVu IGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSgpIGlzIGNhbGxlZCBmb3IgYSBQcm92aXNp b25hbFBhZ2VQcm94eSwgZGVzdHJveSBpdC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYyk6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UpOgorICAgICAgICBDYXB0 dXJlIHRoZSBwcm9jZXNzIGluIHRoZSBsYW1iZGEsIHRvIG1ha2Ugc3VyZSB3ZSBzZW5kIHRoZSBw b2xpY3kgZGVjaXNpb24gdG8gdGhlIHNhbWUgcHJvY2VzcyB0aGF0CisgICAgICAgIGFza2VkIGZv ciBpdCwgc28gYXMgdG8gbm90IGdldCBjb25mdXNlZCBieSBwcm9jZXNzIHN3YXBzLgorCisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVzZXRTdGF0ZSk6CisgICAgICAgIERyb3Agc29t ZSBjb2RlIHRoYXQgaXMgbm8gbG9uZ2VyIG5lZWRlZC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycyk6CisgICAgICAgIE1vdmUgdGhlIGhhc1JlZ2lz dGVyZWRTZXJ2aWNlV29ya2VycyBmbGFnIGluaXRpYWxpemF0aW9uIGZyb20gdGhlIGNhbGwgc2l0 ZSB0byBoZXJlIG5vdyB0aGF0IHdlIGhhdmUKKyAgICAgICAgbW9yZSB0aGFuIG9uZSBjYWxsIHNp dGUuIFRoaXMgd2FzIGp1c3Qgc29tZSBiYWQgZmFjdG9yaW5nLgorCisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6UGFnZVByb2Nlc3NPdmVycmlkZSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6flBh Z2VQcm9jZXNzT3ZlcnJpZGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp0ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2Vz cyk6CisgICAgICAgIEFkZCB1dGlsaXR5IGNsYXNzIHRvIHRlbXBvcmFyaWx5IG92ZXJyaWRlIHRo ZSBXZWJQYWdlUHJveHkncyBtX3Byb2Nlc3Mgd2l0aCB0aGUgcHJvdmlzaW9uYWwgb25lIHdoZW4K KyAgICAgICAgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGludGVyYWN0cyB3aXRoIHRoZSBXZWJQ YWdlUHJveHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQg Y29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OnVwZGF0ZUJhY2tGb3J3 YXJkSXRlbSk6CisgICAgICAgIEJlZm9yZSB1cGRhdGluZyBhIEJhY2tGb3J3YXJkTGlzdEl0ZW0s IHdlIG5vcm1hbGx5IG1ha2Ugc3VyZSB0aGUgcHJvY2VzcyBoYXMgYSBXZWJQYWdlUHJveHkgd2l0 aCB0aGUKKyAgICAgICAgaXRlbSdzIHBhZ2VJRC4gV2UgaGF2ZSB0byB0d2VhayB0aGUgbG9naWMg YmVjYXVzZSB0aGVyZSBtYXkgbm93IGJlIG5vIFdlYlBhZ2VQcm94eSB3aXRoIHRoaXMgcGFnZUlE CisgICAgICAgIGFzc29jaWF0ZWQgd2l0aCB0aGlzIHByb2Nlc3MgeWV0LCBiZWNhdXNlIGl0IGlz IHN0aWxsIGEgUHJvdmlzaW9uYWxQYWdlUHJveHkuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzc1Byb3h5OjpjYW5UZXJtaW5hdGVDaGlsZFByb2Nlc3MpOgorICAgICAgICBEbyBub3QgdGVy bWluYXRlIHRoZSBXZWJQcm9jZXNzIGlmIHRoZXJlIGFyZSBQcm92aXNpb25hbFBhZ2VQcm94eSBv YmplY3RzIHVzaW5nIGl0LgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5o OgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OmFkZFByb3Zpc2lvbmFsUGFnZVBy b3h5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpyZW1vdmVQcm92aXNpb25h bFBhZ2VQcm94eSk6CisKKyAgICAgICAgKiBXZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv ajoKKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHA6CisgICAgICAg IChXZWJLaXQ6OnRvUG9saWN5QWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWU6OmRp ZFJlY2VpdmVQb2xpY3lEZWNpc2lvbik6CisgICAgICAgIFN0b3AgZGVhbGluZyB3aXRoIFdlYlBv bGljeUFjdGlvbjo6U3VzcGVuZCBhcyBpdCBubyBsb25nZXIgZXhpc3RzLgorCisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl OjpyZWluaXRpYWxpemVXZWJQYWdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZGlkUmVj ZWl2ZVBvbGljeURlY2lzaW9uKToKKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRJc1N1 c3BlbmRlZCk6CisgICAgICAgIFN1c3BlbmQgdGhlIFBhZ2Ugd2hlbiBzZXRJc1N1c3BlbmRlZCh0 cnVlKSBpcyBjYWxsZWQsIG5vdyB0aGF0IHRoZXJlIGlzIG5vIGxvbmdlciBhIFdlYlBvbGljeUFj dGlvbjo6U3VzcGVuZC4KKyAgICAgICAgc2V0SXNTdXNwZW5kZWQodHJ1ZSkgSVBDIGlzIHNlbnQg d2hlbiB3ZSBhY3R1YWxseSBjb21taXQgdGhlIHByb3Zpc2lvbmFsIHBhZ2UuCisKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1t OgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6VGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEpOgorCiAyMDE5LTAxLTEwICBBbGV4IENocmlzdGVuc2Vu ICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjM5ODE1 KSBodHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9zZXJ2aWNld29ya2VyLXByaXZhdGUtYnJvd3Np bmcuaHR0cHMuaHRtbCB0ZXN0IHRpbWVzIG91dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5jcHAKaW5kZXggNGMyNmE2OTgxYjQ2NGRhNTkxNmYwNWViNzM1OTY2OTE1N2VlOWZmZS4uZWJm OTUwYmE2YzJlZDkxZjYyMzJiZDJiNWVmYjlmNzk1NTdhYjU4ZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0yMDMyLDExICsyMDMyLDExIEBAIHZvaWQgRnJhbWVMb2Fk ZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCgpCiAKICAgICAgICAgT3B0aW9uYWw8SGFzSW5zZWN1 cmVDb250ZW50PiBoYXNJbnNlY3VyZUNvbnRlbnQgPSBjYWNoZWRQYWdlLT5jYWNoZWRNYWluRnJh bWUoKS0+aGFzSW5zZWN1cmVDb250ZW50KCk7CiAKKyAgICAgICAgZGlzcGF0Y2hEaWRDb21taXRM b2FkKGhhc0luc2VjdXJlQ29udGVudCk7CisKICAgICAgICAgLy8gRklYTUU6IFRoaXMgQVBJIHNo b3VsZCBiZSB0dXJuZWQgYXJvdW5kIHNvIHRoYXQgd2UgZ3JvdW5kIENhY2hlZFBhZ2UgaW50byB0 aGUgUGFnZS4KICAgICAgICAgY2FjaGVkUGFnZS0+cmVzdG9yZSgqbV9mcmFtZS5wYWdlKCkpOwog Ci0gICAgICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOwotCiAj aWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICAgICAgbV9mcmFtZS5wYWdlKCktPmNocm9tZSgp LnNldERpc3BhdGNoVmlld3BvcnREYXRhRGlkQ2hhbmdlU3VwcHJlc3NlZChmYWxzZSk7CiAgICAg ICAgIG1fZnJhbWUucGFnZSgpLT5jaHJvbWUoKS5kaXNwYXRjaFZpZXdwb3J0UHJvcGVydGllc0Rp ZENoYW5nZShtX2ZyYW1lLnBhZ2UoKS0+dmlld3BvcnRBcmd1bWVudHMoKSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcCBiL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCmluZGV4IGNh MmRmNDBlZTFkZDJjYTM2ZjNhNDhhMDQ3NTdmOTdiZGJiNjM2NDcuLjZkMDdjMDNhZDhjOTI3ZTU0 NTNjNWZkYTk1OTY3MDlhNzcyNjFlMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVk L1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVk L1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCkBAIC03Myw3ICs3Myw3IEBAIHZvaWQgV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKElQQzo6RW5jb2RlciYgZW5jb2RlcikgY29u c3QKICAgICBlbmNvZGVyLmVuY29kZUVudW0obGF5ZXJIb3N0aW5nTW9kZSk7CiAgICAgZW5jb2Rl ciA8PCBtaW1lVHlwZXNXaXRoQ3VzdG9tQ29udGVudFByb3ZpZGVyczsKICAgICBlbmNvZGVyIDw8 IGNvbnRyb2xsZWRCeUF1dG9tYXRpb247Ci0gICAgZW5jb2RlciA8PCBpc1N3YXBGcm9tU3VzcGVu ZGVkOworICAgIGVuY29kZXIgPDwgaXNQcm9jZXNzU3dhcDsKIAogI2lmIFBMQVRGT1JNKE1BQykK ICAgICBlbmNvZGVyIDw8IGNvbG9yU3BhY2U7CkBAIC0yMjcsNyArMjI3LDcgQEAgT3B0aW9uYWw8 V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycz4gV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZGVj b2RlKElQQzo6RGVjb2QKICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKICAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuY29udHJvbGxlZEJ5QXV0b21hdGlvbikpCiAgICAgICAg IHJldHVybiBXVEY6Om51bGxvcHQ7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJz LmlzU3dhcEZyb21TdXNwZW5kZWQpKQorICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVy cy5pc1Byb2Nlc3NTd2FwKSkKICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAogI2lmIFBM QVRGT1JNKE1BQykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVh dGlvblBhcmFtZXRlcnMuaCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBh cmFtZXRlcnMuaAppbmRleCBhZTQzMjVjYmQ1ZjFlNTY3NjE2NTg2ZjVlOWZhNzNlZTViMzViOTM3 Li5iMzgyY2VlZGQ0NDlhOGQ5YTBmODY5NDczNWYyNmMwNTk1ZGRlY2Q4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgKKysrIGIvU291 cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCkBAIC0xMjksNyAr MTI5LDcgQEAgc3RydWN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMgewogICAgIFZlY3RvcjxT dHJpbmc+IG1pbWVUeXBlc1dpdGhDdXN0b21Db250ZW50UHJvdmlkZXJzOwogCiAgICAgYm9vbCBj b250cm9sbGVkQnlBdXRvbWF0aW9uOwotICAgIGJvb2wgaXNTd2FwRnJvbVN1c3BlbmRlZCB7IGZh bHNlIH07CisgICAgYm9vbCBpc1Byb2Nlc3NTd2FwIHsgZmFsc2UgfTsKIAogI2lmIFBMQVRGT1JN KE1BQykKICAgICBDb2xvclNwYWNlRGF0YSBjb2xvclNwYWNlOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9X ZWJQb2xpY3lBY3Rpb24uaAppbmRleCAxNDJhNTE4ZGYwOTdlNWVmMmZhMTgwNDg0ZTA5ZDAzMzNj MTA1YjgxLi4zOTcxNzk1YzQ2YTUxYjM4ODE4YzU1Yjc2ZDY1M2EzNGI1Mjg5ZTljIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaApAQCAtMjksMTEgKzI5LDExIEBACiAKIG5h bWVzcGFjZSBXZWJLaXQgewogCisvLyBGSVhNRTogUmVtb3ZlIHRoaXMgdHlwZSBhbmQgdXNlIFdl YkNvcmU6OlBvbGljeUFjdGlvbiBpbnN0ZWFkLgogZW51bSBjbGFzcyBXZWJQb2xpY3lBY3Rpb24g OiB1aW50OF90IHsKICAgICBVc2UsCiAgICAgRG93bmxvYWQsCi0gICAgSWdub3JlLAotICAgIFN1 c3BlbmQKKyAgICBJZ25vcmUKIH07CiAKIH0KQEAgLTQ1LDggKzQ1LDcgQEAgdGVtcGxhdGU8PiBz dHJ1Y3QgRW51bVRyYWl0czxXZWJLaXQ6OldlYlBvbGljeUFjdGlvbj4gewogICAgICAgICBXZWJL aXQ6OldlYlBvbGljeUFjdGlvbiwKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OlVz ZSwKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OkRvd25sb2FkLAotICAgICAgICBX ZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6SWdub3JlLAotICAgICAgICBXZWJLaXQ6OldlYlBvbGlj eUFjdGlvbjo6U3VzcGVuZAorICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6SWdub3Jl CiAgICAgPjsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQgYi9T b3VyY2UvV2ViS2l0L1NvdXJjZXMudHh0CmluZGV4IGEwYjZmNzI4NDYwNDFjMjYzYTU0NzY3MTBl YWM5ODdmZWQxZDE2MDQuLjhhZWNiODY0NzI1MDJkMDI3YTM0YWYzNzE5ZGQ4MjhiMDA3ZGIxMTYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQKKysrIGIvU291cmNlL1dlYktp dC9Tb3VyY2VzLnR4dApAQCAtMjMwLDYgKzIzMCw3IEBAIFVJUHJvY2Vzcy9JbnNwZWN0b3JUYXJn ZXRQcm94eS5jcHAKIFVJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmNwcAogVUlQcm9jZXNzL1Byb2Nl c3NBc3NlcnRpb24uY3BwCiBVSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5jcHAKK1VJUHJvY2Vz cy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAKIFVJUHJvY2Vzcy9SZW1vdGVXZWJJbnNwZWN0b3JQ cm94eS5jcHAKIFVJUHJvY2Vzcy9SZXNwb25zaXZlbmVzc1RpbWVyLmNwcAogVUlQcm9jZXNzL1Nl cnZpY2VXb3JrZXJQcm9jZXNzUHJveHkuY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCBjZjE5MTljOTNhNzM4NTMwNzU5ZTM3ZjMzZGJi MTBiNGNkMDQ1ODc4Li5jNzlmY2IyMTBiNTE1NTUwODhlMWRmODZmY2E5NjU1MWM2MzJhOGQ1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAg LTQ0LDYgKzQ0LDcgQEAKICNpbXBvcnQgIk5hdmlnYXRpb25TdGF0ZS5oIgogI2ltcG9ydCAiT2Jq Q09iamVjdEdyYXBoLmgiCiAjaW1wb3J0ICJQYWdlQ2xpZW50LmgiCisjaW1wb3J0ICJQcm92aXNp b25hbFBhZ2VQcm94eS5oIgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJUcmVlU2Nyb2xsaW5nUGVyZm9y bWFuY2VEYXRhLmgiCiAjaW1wb3J0ICJSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5oIgogI2lt cG9ydCAiUmVtb3RlT2JqZWN0UmVnaXN0cnkuaCIKQEAgLTQ2NjQsNiArNDY2NSwxMSBAQCAtICh2 b2lkKV9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0YXRlCiB7CiAgICAgUmVmPFdlYktp dDo6V2ViUHJvY2Vzc1Byb3h5PiBwcm90ZWN0ZWRQcm9jZXNzUHJveHkoX3BhZ2UtPnByb2Nlc3Mo KSk7CiAgICAgcHJvdGVjdGVkUHJvY2Vzc1Byb3h5LT5yZXF1ZXN0VGVybWluYXRpb24oV2ViS2l0 OjpQcm9jZXNzVGVybWluYXRpb25SZWFzb246OlJlcXVlc3RlZEJ5Q2xpZW50KTsKKworICAgIGlm IChhdXRvKiBwcm92aXNpb25hbFBhZ2VQcm94eSA9IF9wYWdlLT5wcm92aXNpb25hbFBhZ2VQcm94 eSgpKSB7CisgICAgICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nlc3NQcm94eT4gcHJvdGVjdGVkUHJv Y2Vzc1Byb3h5KHByb3Zpc2lvbmFsUGFnZVByb3h5LT5wcm9jZXNzKCkpOworICAgICAgICBwcm90 ZWN0ZWRQcm9jZXNzUHJveHktPnJlcXVlc3RUZXJtaW5hdGlvbihXZWJLaXQ6OlByb2Nlc3NUZXJt aW5hdGlvblJlYXNvbjo6UmVxdWVzdGVkQnlDbGllbnQpOworICAgIH0KIH0KIAogI2lmIFBMQVRG T1JNKE1BQykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VDbGllbnQu aCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAppbmRleCAwYjg1OGM0NmVl NDc0ZDY5NmRkYzNkNDM1YmQ1NGMxMzIzMDAzYzJkLi42ZjNkZjg0NTJiMzFlMzRlYjdmYWY0YWNk MGZkN2UwNDdlZTlmMDc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdl Q2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCkBAIC00 OCw2ICs0OCw3IEBACiAKIE9CSkNfQ0xBU1MgQ0FMYXllcjsKIE9CSkNfQ0xBU1MgTlNGaWxlV3Jh cHBlcjsKK09CSkNfQ0xBU1MgTlNNZW51OwogT0JKQ19DTEFTUyBOU1NldDsKIE9CSkNfQ0xBU1Mg V0tEcmF3aW5nVmlldzsKIE9CSkNfQ0xBU1MgX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uYTY2OWY0NDBiM2ViZjQyMDc3MDIwNmY4YTI5YWZiZjRlYzNjNDUyZQotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmNw cApAQCAtMCwwICsxLDI4OCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxOSBBcHBsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBz b3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24s IGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAq IGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRh aW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0 aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25z IGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBw cm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQ Uk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICog QU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9U IExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElU WSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVE LiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJF IExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVY RU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9U IExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJ Q0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVS UlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBX SEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVE SU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBP RiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNp bmNsdWRlICJQcm92aXNpb25hbFBhZ2VQcm94eS5oIgorCisjaW5jbHVkZSAiQVBJTmF2aWdhdGlv bi5oIgorI2luY2x1ZGUgIkRyYXdpbmdBcmVhUHJveHkuaCIKKyNpbmNsdWRlICJMb2dnaW5nLmgi CisjaW5jbHVkZSAiUGFnZUNsaWVudC5oIgorI2luY2x1ZGUgIldlYkJhY2tGb3J3YXJkTGlzdC5o IgorI2luY2x1ZGUgIldlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uaCIKKyNpbmNsdWRlICJXZWJFcnJv cnMuaCIKKyNpbmNsdWRlICJXZWJOYXZpZ2F0aW9uU3RhdGUuaCIKKyNpbmNsdWRlICJXZWJQYWdl TWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQYWdlUHJveHkuaCIKKyNpbmNsdWRlICJXZWJQYWdl UHJveHlNZXNzYWdlcy5oIgorI2luY2x1ZGUgIldlYlByb2Nlc3NNZXNzYWdlcy5oIgorI2luY2x1 ZGUgIldlYlByb2Nlc3NQcm94eS5oIgorI2luY2x1ZGUgPFdlYkNvcmUvU2hvdWxkVHJlYXRBc0Nv bnRpbnVpbmdMb2FkLmg+CisKK25hbWVzcGFjZSBXZWJLaXQgeworCisjZGVmaW5lIFJFTEVBU0Vf TE9HX0lGX0FMTE9XRUQoY2hhbm5lbCwgZm10LCAuLi4pIFJFTEVBU0VfTE9HX0lGKG1fcGFnZS5p c0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQoKSwgY2hhbm5lbCwgIiVwIC0gUHJvdmlzaW9uYWxQYWdl UHJveHk6OiIgZm10LCB0aGlzLCAjI19fVkFfQVJHU19fKQorCitQcm92aXNpb25hbFBhZ2VQcm94 eTo6UHJvdmlzaW9uYWxQYWdlUHJveHkoV2ViUGFnZVByb3h5JiBwYWdlLCBSZWY8V2ViUHJvY2Vz c1Byb3h5PiYmIHByb2Nlc3MsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+IHN1 c3BlbmRlZFBhZ2UsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgYm9vbCBpc1NlcnZlclJlZGlyZWN0 LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFByb2Nlc3NTd2FwUmVx dWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCkKKyAgICA6IG1fcGFn ZShwYWdlKQorICAgICwgbV9wcm9jZXNzKFdURk1vdmUocHJvY2VzcykpCisgICAgLCBtX25hdmln YXRpb25JRChuYXZpZ2F0aW9uSUQpCisgICAgLCBtX2lzU2VydmVyUmVkaXJlY3QoaXNTZXJ2ZXJS ZWRpcmVjdCkKKyAgICAsIG1fcmVxdWVzdChyZXF1ZXN0KQorICAgICwgbV9wcm9jZXNzU3dhcFJl cXVlc3RlZEJ5Q2xpZW50KHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpCisjaWYgUExBVEZP Uk0oSU9TX0ZBTUlMWSkKKyAgICAsIG1fc3VzcGVuc2lvblRva2VuKG1fcHJvY2Vzcy0+dGhyb3R0 bGVyKCkuYmFja2dyb3VuZEFjdGl2aXR5VG9rZW4oKSkKKyNlbmRpZgoreworICAgIG1fcHJvY2Vz cy0+YWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNl aXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpLCAqdGhpcyk7CisgICAgbV9wcm9jZXNzLT5hZGRQ cm92aXNpb25hbFBhZ2VQcm94eSgqdGhpcyk7CisKKyAgICBpbml0aWFsaXplV2ViUGFnZSgpOwor CisgICAgLy8gSWYgd2UgYXJlIHJlYXR0YWNoaW5nIHRvIGEgU3VzcGVuZGVkUGFnZSwgdGhlbiB0 aGUgV2ViUHJvY2VzcycgV2ViUGFnZSBhbHJlYWR5IGV4aXN0cyBhbmQKKyAgICAvLyBXZWJQYWdl UHJveHk6OmRpZENyZWF0ZU1haW5GcmFtZSgpIHdpbGwgbm90IGJlIGNhbGxlZCB0byBpbml0aWFs aXplIG1fbWFpbkZyYW1lLiBJbiBzdWNoCisgICAgLy8gY2FzZSwgd2UgbmVlZCB0byBpbml0aWFs aXplIG1fbWFpbkZyYW1lIHRvIHJlZmxlY3QgdGhlIGZhY3QgdGhlIHRoZSBXZWJQcm9jZXNzJyBX ZWJQYWdlCisgICAgLy8gYWxyZWFkeSBleGlzdHMgYW5kIGFscmVhZHkgaGFzIGEgbWFpbiBmcmFt ZS4KKyAgICBpZiAoc3VzcGVuZGVkUGFnZSkgeworICAgICAgICBBU1NFUlQoJnN1c3BlbmRlZFBh Z2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpOworICAgICAgICBzdXNwZW5kZWRQYWdl LT51bnN1c3BlbmQoKTsKKyAgICAgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5OjpjcmVh dGUobV9wYWdlLCBzdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpKTsKKyAgICAgICAgbV9wcm9j ZXNzLT5mcmFtZUNyZWF0ZWQoc3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSwgKm1fbWFpbkZy YW1lKTsKKyAgICB9Cit9CisKK1Byb3Zpc2lvbmFsUGFnZVByb3h5Ojp+UHJvdmlzaW9uYWxQYWdl UHJveHkoKQoreworICAgIG1fcHJvY2Vzcy0+cmVtb3ZlUHJvdmlzaW9uYWxQYWdlUHJveHkoKnRo aXMpOworCisgICAgaWYgKG1fd2FzQ29tbWl0dGVkKQorICAgICAgICByZXR1cm47CisKKyAgICBt X3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5Ojpt ZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgbV9wcm9jZXNzLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpDbG9zZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAg aWYgKG1fZHJhd2luZ0FyZWEpIHsKKyAgICAgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0g bV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgICAgIG1f ZHJhd2luZ0FyZWEgPSBudWxscHRyOworICAgIH0KKworICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNw YXRjaChbcHJvY2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCldIHsKKyAgICAgICAgcHJvY2Vzcy0+ bWF5YmVTaHV0RG93bigpOworICAgIH0pOworfQorCitzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0Fy ZWFQcm94eT4gUHJvdmlzaW9uYWxQYWdlUHJveHk6OnRha2VEcmF3aW5nQXJlYSgpCit7CisgICAg cmV0dXJuIFdURk1vdmUobV9kcmF3aW5nQXJlYSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdl UHJveHk6OmNhbmNlbCgpCit7CisgICAgLy8gSWYgdGhlIHByb3Zpc2lvbmFsIGxvYWQgc3RhcnRl ZCwgdGhlbiBpbmRpY2F0ZSB0aGF0IGl0IGZhaWxlZCBkdWUgdG8gY2FuY2VsbGF0aW9uIGJ5IGNh bGxpbmcgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKCkuCisgICAgaWYgKG1fcHJvdmlz aW9uYWxMb2FkVVJMLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJjYW5jZWw6IFNpbXVsYXRpbmcgYSBkaWRG YWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUgZm9yIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wYWdl LnBhZ2VJRCgpKTsKKyAgICBBU1NFUlQobV9tYWluRnJhbWUpOworICAgIGF1dG8gZXJyb3IgPSBX ZWJLaXQ6OmNhbmNlbGxlZEVycm9yKG1fcmVxdWVzdCk7CisgICAgZXJyb3Iuc2V0VHlwZShXZWJD b3JlOjpSZXNvdXJjZUVycm9yOjpUeXBlOjpDYW5jZWxsYXRpb24pOworICAgIGRpZEZhaWxQcm92 aXNpb25hbExvYWRGb3JGcmFtZShtX21haW5GcmFtZS0+ZnJhbWVJRCgpLCB7IH0sIG1fbmF2aWdh dGlvbklELCBtX3Byb3Zpc2lvbmFsTG9hZFVSTCwgZXJyb3IsIFVzZXJEYXRhIHsgfSk7IC8vIFdp bGwgZGVsZXRlIHx0aGlzfC4KK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6aW5pdGlh bGl6ZVdlYlBhZ2UoKQoreworICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50 ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgIG1fZHJhd2luZ0FyZWEg PSBtX3BhZ2UucGFnZUNsaWVudCgpLmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKKworICAgIGF1 dG8gcGFyYW1ldGVycyA9IG1fcGFnZS5jcmVhdGlvblBhcmFtZXRlcnMoKTsKKyAgICBwYXJhbWV0 ZXJzLmlzUHJvY2Vzc1N3YXAgPSB0cnVlOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUHJvY2Vzczo6Q3JlYXRlV2ViUGFnZShtX3BhZ2UucGFnZUlEKCksIHBhcmFtZXRlcnMpLCAw KTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6bG9hZERhdGFXaXRoTmF2aWdhdGlv bihBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYg ZGF0YSwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZywgY29u c3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIE9wdGlvbmFsPFdlYnNp dGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQoreworICAgIGF1dG8gcGFnZVByb2Nl c3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3Mp OworICAgIG1fcGFnZS5sb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIGRhdGEsIE1J TUVUeXBlLCBlbmNvZGluZywgYmFzZVVSTCwgdXNlckRhdGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0 QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOworfQorCit2 b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6 TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVz dCwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSBzaG91bGRPcGVuRXh0ZXJu YWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIE9wdGlvbmFsPFdlYnNpdGVQb2xp Y2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQoreworICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVy cmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAg IG1fcGFnZS5sb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIFdURk1vdmUocmVx dWVzdCksIHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIHVzZXJEYXRhLCBXZWJDb3JlOjpT aG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMp KTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6Z29Ub0JhY2tGb3J3YXJkSXRlbShB UEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mIGl0ZW0s IE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQoreworICAg IGF1dG8gaXRlbVN0YXRlcyA9IG1fcGFnZS5iYWNrRm9yd2FyZExpc3QoKS5maWx0ZXJlZEl0ZW1T dGF0ZXMoW3RoaXMsIHRhcmdldEl0ZW0gPSAmaXRlbV0oYXV0byYgaXRlbSkgeworICAgICAgICBp ZiAoYXV0byogcGFnZSA9IGl0ZW0uc3VzcGVuZGVkUGFnZSgpKSB7CisgICAgICAgICAgICBpZiAo JnBhZ2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpCisgICAgICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgICAgICB9CisgICAgICAgIHJldHVybiAmaXRlbSAhPSB0YXJnZXRJdGVt OworICAgIH0pOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6VXBkYXRl QmFja0ZvcndhcmRMaXN0Rm9yUmVhdHRhY2goV1RGTW92ZShpdGVtU3RhdGVzKSksIG1fcGFnZS5w YWdlSUQoKSk7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHb1RvQmFj a0ZvcndhcmRJdGVtKG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIGl0ZW0uaXRlbUlEKCksICpu YXZpZ2F0aW9uLmJhY2tGb3J3YXJkRnJhbWVMb2FkVHlwZSgpLCBXZWJDb3JlOjpTaG91bGRUcmVh dEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKSwgbV9wYWdl LnBhZ2VJRCgpKTsKKyAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS5zdGFydCgp OworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUodWlu dDY0X3QgZnJhbWVJRCkKK3sKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2Fw cGluZywgImRpZENyZWF0ZU1haW5GcmFtZTogcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQg PSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSwgZnJhbWVJRCk7CisgICAgQVNTRVJUKCFtX21h aW5GcmFtZSk7CisKKyAgICBtX21haW5GcmFtZSA9IFdlYkZyYW1lUHJveHk6OmNyZWF0ZShtX3Bh Z2UsIGZyYW1lSUQpOworCisgICAgLy8gQWRkIHRoZSBmcmFtZSB0byB0aGUgcHJvY2VzcyB3aWRl IG1hcC4KKyAgICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChmcmFtZUlELCAqbV9tYWluRnJhbWUp OworCisgICAgLy8gVGhpcyBuYXZpZ2F0aW9uIHdhcyBkZXN0cm95ZWQgc28gbm8gbmVlZCB0byBu b3RpZnkgb2YgcmVkaXJlY3QuCisgICAgaWYgKCFtX3BhZ2UubmF2aWdhdGlvblN0YXRlKCkuaGFz TmF2aWdhdGlvbihtX25hdmlnYXRpb25JRCkpCisgICAgICAgIHJldHVybjsKKworICAgIC8vIFJl c3RvcmUgdGhlIG1haW4gZnJhbWUncyBjb21taXR0ZWQgVVJMIGFzIHNvbWUgY2xpZW50cyBtYXkg cmVseSBvbiBpdCB1bnRpbCB0aGUgbmV4dCBsb2FkIGlzIGNvbW1pdHRlZC4KKyAgICBpZiAoYXV0 byogbWFpbkZyYW1lID0gbV9wYWdlLm1haW5GcmFtZSgpKQorICAgICAgICBtX21haW5GcmFtZS0+ ZnJhbWVMb2FkU3RhdGUoKS5zZXRVUkwobWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLnVybCgp KTsKKworICAgIC8vIE5vcm1hbGx5LCBub3RpZmljYXRpb24gb2YgYSBzZXJ2ZXIgcmVkaXJlY3Qg Y29tZXMgZnJvbSB0aGUgV2ViQ29udGVudCBwcm9jZXNzLgorICAgIC8vIElmIHdlIGFyZSBwcm9j ZXNzIHN3YXBwaW5nIGluIHJlc3BvbnNlIHRvIGEgc2VydmVyIHJlZGlyZWN0IHRoZW4gdGhhdCBu b3RpZmljYXRpb24gd2lsbCBub3QgY29tZSBmcm9tIHRoZSBuZXcgV2ViQ29udGVudCBwcm9jZXNz LgorICAgIC8vIEluIHRoaXMgY2FzZSB3ZSBoYXZlIHRoZSBVSVByb2Nlc3Mgc3ludGhlc2l6ZSB0 aGUgcmVkaXJlY3Qgbm90aWZpY2F0aW9uIGF0IHRoZSBhcHByb3ByaWF0ZSB0aW1lLgorICAgIGlm IChtX2lzU2VydmVyUmVkaXJlY3QpIHsKKyAgICAgICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0 YXRlKCkuZGlkU3RhcnRQcm92aXNpb25hbExvYWQobV9yZXF1ZXN0LnVybCgpKTsKKworICAgICAg ICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVBy b2Nlc3MobV9wcm9jZXNzKTsKKyAgICAgICAgbV9wYWdlLmRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVj dEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKG1fbWFpbkZyYW1lLT5mcmFtZUlEKCksIG1fbmF2 aWdhdGlvbklELCBXVEZNb3ZlKG1fcmVxdWVzdCksIHsgfSk7CisgICAgfQorfQorCit2b2lkIFBy b3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2 NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYgdXJsLCBVUkwmJiB1bnJl YWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAgIC8vIElmIHRoZSBw cmV2aW91cyBwcm92aXNpb25hbCBsb2FkIHVzZWQgdGhlIHNhbWUgcHJvY2Vzcywgd2UgbWF5IHJl Y2VpdmUgSVBDIGZvciB0aGlzIHByZXZpb3VzIHByb3Zpc2lvbmFsJ3MgbWFpbiBmcmFtZSB0aGF0 IHdlIG5lZWQgdG8gaWdub3JlLgorICAgIGlmICghbV9tYWluRnJhbWUgfHwgbV9tYWluRnJhbWUt PmZyYW1lSUQoKSAhPSBmcmFtZUlEKQorICAgICAgICByZXR1cm47CisKKyAgICBSRUxFQVNFX0xP R19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9y RnJhbWU6IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIG5hdmln YXRpb25JRCA9ICUiIFBSSXU2NCwgbV9wYWdlLnBhZ2VJRCgpLCBmcmFtZUlELCBuYXZpZ2F0aW9u SUQpOworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFsTG9hZFVSTC5pc051bGwoKSk7CisgICAgbV9w cm92aXNpb25hbExvYWRVUkwgPSB1cmw7CisKKyAgICAvLyBNZXJlbHkgZm9sbG93aW5nIGEgc2Vy dmVyIHNpZGUgcmVkaXJlY3Qgc28gdGhlcmUgaXMgbm8gbmVlZCB0byBzZW5kIGEgZGlkU3RhcnRQ cm92aXNpb25hbExvYWQgYWdhaW4uCisgICAgaWYgKG1faXNTZXJ2ZXJSZWRpcmVjdCkKKyAgICAg ICAgcmV0dXJuOworCisgICAgLy8gQ2xpZW50cyBleHBlY3QgdGhlIFBhZ2UncyBtYWluIGZyYW1l J3MgZXhwZWN0ZWRVUkwgdG8gYmUgdGhlIHByb3Zpc2lvbmFsIG9uZSB3aGVuIGEgcHJvdmlzaW9u YWwgbG9hZCBpcyBzdGFydGVkLgorICAgIGlmIChhdXRvKiBwYWdlTWFpbkZyYW1lID0gbV9wYWdl Lm1haW5GcmFtZSgpKQorICAgICAgICBwYWdlTWFpbkZyYW1lLT5kaWRTdGFydFByb3Zpc2lvbmFs TG9hZCh1cmwpOworCisgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBv cmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgbV9wYWdlLmRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUoZnJhbWVJRCwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKHVybCks IFdURk1vdmUodW5yZWFjaGFibGVVUkwpLCB1c2VyRGF0YSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9u YWxQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFt ZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmln aW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwg Y29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYgZXJyb3IsIGNvbnN0IFVzZXJEYXRhJiB1c2Vy RGF0YSkKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJp bHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9X RUQoUHJvY2Vzc1N3YXBwaW5nLCAiZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOiBwYWdl SUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgPSAl IiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSwgZnJhbWVJRCwgbmF2aWdhdGlvbklEKTsKKyAgICBt X3Byb3Zpc2lvbmFsTG9hZFVSTCA9IHsgfTsKKworICAgIC8vIE1ha2Ugc3VyZSB0aGUgUGFnZSdz IG1haW4gZnJhbWUncyBleHBlY3RlZFVSTCBnZXRzIGNsZWFyZWQgc2luY2Ugd2UgdXBkYXRlZCBp dCBpbiBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZC4KKyAgICBpZiAoYXV0byogcGFnZU1haW5GcmFt ZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAgICAgcGFnZU1haW5GcmFtZS0+ZGlkRmFpbFBy b3Zpc2lvbmFsTG9hZCgpOworCisgICAgbV9wYWdlLmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JG cmFtZShmcmFtZUlELCBmcmFtZVNlY3VyaXR5T3JpZ2luLCBuYXZpZ2F0aW9uSUQsIHByb3Zpc2lv bmFsVVJMLCBlcnJvciwgdXNlckRhdGEpOyAvLyBXaWxsIGRlbGV0ZSB8dGhpc3wuCit9CisKK3Zv aWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZSh1aW50NjRfdCBm cmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJv b2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90IGZyYW1lTG9hZFR5cGUs IGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYgY2VydGlmaWNhdGVJbmZvLCBib29sIGNv bnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVu dD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCit7 CisgICAgLy8gSWYgdGhlIHByZXZpb3VzIHByb3Zpc2lvbmFsIGxvYWQgdXNlZCB0aGUgc2FtZSBw cm9jZXNzLCB3ZSBtYXkgcmVjZWl2ZSBJUEMgZm9yIHRoaXMgcHJldmlvdXMgcHJvdmlzaW9uYWwn cyBtYWluIGZyYW1lIHRoYXQgd2UgbmVlZCB0byBpZ25vcmUuCisgICAgaWYgKCFtX21haW5GcmFt ZSB8fCBtX21haW5GcmFtZS0+ZnJhbWVJRCgpICE9IGZyYW1lSUQpCisgICAgICAgIHJldHVybjsK KworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiZGlkQ29tbWl0 TG9hZEZvckZyYW1lOiBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAi LCBuYXZpZ2F0aW9uSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSwgZnJhbWVJRCwgbmF2 aWdhdGlvbklEKTsKKyAgICBtX3Byb3Zpc2lvbmFsTG9hZFVSTCA9IHsgfTsKKyAgICBtX3Byb2Nl c3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdl UmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisKKyAgICBtX3dhc0NvbW1pdHRlZCA9 IHRydWU7CisgICAgbV9wYWdlLmNvbW1pdFByb3Zpc2lvbmFsUGFnZShmcmFtZUlELCBuYXZpZ2F0 aW9uSUQsIG1pbWVUeXBlLCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgZnJhbWVMb2Fk VHlwZSwgY2VydGlmaWNhdGVJbmZvLCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBmb3JjZWRIYXNJ bnNlY3VyZUNvbnRlbnQsIHVzZXJEYXRhKTsgLy8gV2lsbCBkZWxldGUgfHRoaXN8LgorfQorCit2 b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rp b24mIGNvbm5lY3Rpb24sIElQQzo6RGVjb2RlciYgZGVjb2RlcikKK3sKKyAgICBBU1NFUlQoZGVj b2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVz c2FnZVJlY2VpdmVyTmFtZSgpKTsKKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0g TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU3RhcnRQcm9ncmVzczo6bmFtZSgpCisgICAgICAg IHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRD aGFuZ2VQcm9ncmVzczo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9 PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpCYWNrRm9yd2FyZEFkZEl0ZW06Om5hbWUoKQorICAg ICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6 TG9nRGlhZ25vc3RpY01lc3NhZ2U6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VO YW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6TG9nRGlhZ25vc3RpY01lc3NhZ2VXaXRo RW5oYW5jZWRQcml2YWN5OjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgp ID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNldE5ldHdvcmtSZXF1ZXN0c0luUHJvZ3Jlc3M6 Om5hbWUoKQorI2lmIFBMQVRGT1JNKENPQ09BKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VO YW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UmVnaXN0ZXJXZWJQcm9jZXNzQWNjZXNz aWJpbGl0eVRva2VuOjpuYW1lKCkKKyNlbmRpZgorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VO YW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlv bkFjdGlvbkFzeW5jOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09 IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlN0YXJ0VVJMU2NoZW1lVGFzazo6bmFtZSgpCisgICAg ICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpE ZWNpZGVQb2xpY3lGb3JSZXNwb25zZTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2Fn ZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRQZXJmb3JtQ2xpZW50UmVkaXJl Y3Q6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6RGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZTo6bmFtZSgpCisg ICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjpEaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YTo6bmFtZSgpKQorICAgIHsKKyAgICAgICAg YXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9j ZXNzKG1fcHJvY2Vzcyk7CisgICAgICAgIG1fcGFnZS5kaWRSZWNlaXZlTWVzc2FnZShjb25uZWN0 aW9uLCBkZWNvZGVyKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkZWNvZGVy Lm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ3JlYXRlTWFpbkZy YW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQ YWdlUHJveHk6OkRpZENyZWF0ZU1haW5GcmFtZT4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFs UGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAgfQor CisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjpEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBD OjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFN0YXJ0UHJvdmlzaW9u YWxMb2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlk U3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisK KyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 OkRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6 aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRGYWlsUHJvdmlzaW9uYWxM b2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkRmFp bFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAg IGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlk Q29tbWl0TG9hZEZvckZyYW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdl PE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENvbW1pdExvYWRGb3JGcmFtZT4oZGVjb2Rlciwg dGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUpOworICAg ICAgICByZXR1cm47CisgICAgfQorCisgICAgTE9HKFByb2Nlc3NTd2FwcGluZywgIlVuaGFuZGxl ZCBtZXNzYWdlICVzOjolcyBmcm9tIHByb3Zpc2lvbmFsIHByb2Nlc3MiLCBkZWNvZGVyLm1lc3Nh Z2VSZWNlaXZlck5hbWUoKS50b1N0cmluZygpLmRhdGEoKSwgZGVjb2Rlci5tZXNzYWdlTmFtZSgp LnRvU3RyaW5nKCkuZGF0YSgpKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlk UmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgSVBDOjpEZWNv ZGVyJiBkZWNvZGVyLCBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVyPiYgZW5jb2RlcikKK3sK KyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 OkJhY2tGb3J3YXJkSXRlbUF0SW5kZXg6Om5hbWUoKSB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkg PT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6QmFja0ZvcndhcmRHb1RvSXRlbTo6bmFtZSgpKSB7 CisgICAgICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92 ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgICAgICBtX3BhZ2UuZGlkUmVjZWl2ZVN5bmNN ZXNzYWdlKGNvbm5lY3Rpb24sIGRlY29kZXIsIGVuY29kZXIpOworICAgICAgICByZXR1cm47Cisg ICAgfQorCisgICAgTE9HKFByb2Nlc3NTd2FwcGluZywgIlVuaGFuZGxlZCBzeW5jIG1lc3NhZ2Ug JXM6OiVzIGZyb20gcHJvdmlzaW9uYWwgcHJvY2VzcyIsIGRlY29kZXIubWVzc2FnZVJlY2VpdmVy TmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgpLCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkudG9TdHJpbmco KS5kYXRhKCkpOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmVkYzE0MTU1NDli Y2I1OGU5NzhkMzYxYTg3NDAyMWFhYzYxZTQ4NzAKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oCkBAIC0wLDAgKzEsODkgQEAK Ky8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9y bXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3Zp ZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVk aXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmln aHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0 IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBk b2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlz dHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5D LiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJ TVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhF IElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEg UEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwg QVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJF Q1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05T RVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJF TUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERB VEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FV U0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJB Q1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9U SEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KKyAqLworCisjcHJhZ21hIG9uY2UKKworI2luY2x1ZGUgIk1lc3NhZ2VSZWNlaXZlci5o IgorCituYW1lc3BhY2UgV2ViQ29yZSB7CitjbGFzcyBSZXNvdXJjZVJlcXVlc3Q7Cit9CisKK25h bWVzcGFjZSBXZWJLaXQgeworCitjbGFzcyBEcmF3aW5nQXJlYVByb3h5OworY2xhc3MgU3VzcGVu ZGVkUGFnZVByb3h5OworY2xhc3MgV2ViRnJhbWVQcm94eTsKK2NsYXNzIFdlYlBhZ2VQcm94eTsK K2NsYXNzIFdlYlByb2Nlc3NQcm94eTsKKworY2xhc3MgUHJvdmlzaW9uYWxQYWdlUHJveHkgOiBw dWJsaWMgSVBDOjpNZXNzYWdlUmVjZWl2ZXIgeworICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVE OworcHVibGljOgorICAgIFByb3Zpc2lvbmFsUGFnZVByb3h5KFdlYlBhZ2VQcm94eSYsIFJlZjxX ZWJQcm9jZXNzUHJveHk+JiYsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+LCB1 aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGJvb2wgaXNTZXJ2ZXJSZWRpcmVjdCwgY29uc3QgV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0JiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCk7CisgICAg flByb3Zpc2lvbmFsUGFnZVByb3h5KCk7CisKKyAgICBXZWJQYWdlUHJveHkmIHBhZ2UoKSB7IHJl dHVybiBtX3BhZ2U7IH0KKyAgICBXZWJGcmFtZVByb3h5KiBtYWluRnJhbWUoKSBjb25zdCB7IHJl dHVybiBtX21haW5GcmFtZS5nZXQoKTsgfQorICAgIFdlYlByb2Nlc3NQcm94eSYgcHJvY2Vzcygp IHsgcmV0dXJuIG1fcHJvY2Vzcy5nZXQoKTsgfQorICAgIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlD bGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fcHJv Y2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDsgfQorICAgIHVpbnQ2NF90IG5hdmlnYXRpb25JRCgp IGNvbnN0IHsgcmV0dXJuIG1fbmF2aWdhdGlvbklEOyB9CisKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8 RHJhd2luZ0FyZWFQcm94eT4gdGFrZURyYXdpbmdBcmVhKCk7CisKKyAgICB2b2lkIGxvYWREYXRh V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNl JiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZywgY29uc3Qg U3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIE9wdGlvbmFsPFdlYnNpdGVQ b2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOworICAgIHZvaWQgbG9hZFJlcXVlc3RXaXRo TmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwg V2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgQVBJOjpPYmplY3QqIHVzZXJE YXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKKyAg ICB2b2lkIGdvVG9CYWNrRm9yd2FyZEl0ZW0oQVBJOjpOYXZpZ2F0aW9uJiwgV2ViQmFja0Zvcndh cmRMaXN0SXRlbSYsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYpOworICAgIHZvaWQg Y2FuY2VsKCk7CisKK3ByaXZhdGU6CisgICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKKyAgICB2 b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIGZp bmFsOworICAgIHZvaWQgZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQ Qzo6RGVjb2RlciYsIHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+JikgZmluYWw7CisKKyAg ICB2b2lkIGRpZENyZWF0ZU1haW5GcmFtZSh1aW50NjRfdCBmcmFtZUlEKTsKKyAgICB2b2lkIGRp ZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3Qg bmF2aWdhdGlvbklELCBVUkwmJiwgVVJMJiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJEYXRh Jik7CisgICAgdm9pZCBkaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWlu dDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFz Q3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJD b3JlOjpDZXJ0aWZpY2F0ZUluZm8mLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlv bmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50 LCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYg ZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcm IHByb3Zpc2lvbmFsVVJMLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgY29uc3QgVXNl ckRhdGEmKTsKKworICAgIHZvaWQgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsKKworICAgIFdlYlBhZ2VQ cm94eSYgbV9wYWdlOworICAgIFJlZjxXZWJQcm9jZXNzUHJveHk+IG1fcHJvY2VzczsKKyAgICBz dGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gbV9kcmF3aW5nQXJlYTsKKyAgICBSZWZQ dHI8V2ViRnJhbWVQcm94eT4gbV9tYWluRnJhbWU7CisgICAgdWludDY0X3QgbV9uYXZpZ2F0aW9u SUQ7CisgICAgYm9vbCBtX2lzU2VydmVyUmVkaXJlY3Q7CisgICAgV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0IG1fcmVxdWVzdDsKKyAgICBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IG1fcHJv Y2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDsKKyAgICBib29sIG1fd2FzQ29tbWl0dGVkIHsgZmFs c2UgfTsKKyAgICBVUkwgbV9wcm92aXNpb25hbExvYWRVUkw7CisKKyNpZiBQTEFURk9STShJT1Nf RkFNSUxZKQorICAgIFByb2Nlc3NUaHJvdHRsZXI6OkJhY2tncm91bmRBY3Rpdml0eVRva2VuIG1f c3VzcGVuc2lvblRva2VuOworI2VuZGlmCit9OworCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwCmluZGV4IGYx OThhODE1MzNmNzZiMmU4ZTJiZjcxZDRhM2I5ZDI3NDBjOTUwNzguLmZmNzZkOWY3Zjk3YWM2ZmE0 ZmJiMzAyZjY0NjY2MWQxNjc4YWUyNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv U3VzcGVuZGVkUGFnZVByb3h5LmNwcApAQCAtMTAwLDcgKzEwMCw5IEBAIFN1c3BlbmRlZFBhZ2VQ cm94eTo6flN1c3BlbmRlZFBhZ2VQcm94eSgpCiAgICAgLy8gSWYgdGhlIHN1c3BlbmRlZCBwYWdl IHdhcyBub3QgY29uc3VtZWQgYmVmb3JlIGdldHRpbmcgZGVzdHJveWVkLCB0aGVuIGNsb3NlIHRo ZSBjb3JyZXNwb25kaW5nIHBhZ2UKICAgICAvLyBvbiB0aGUgV2ViUHJvY2VzcyBzaWRlLgogICAg IG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9wYWdlLnBhZ2VJ RCgpKTsKLSAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisKKyAg ICBpZiAobV9zdXNwZW5zaW9uU3RhdGUgPT0gU3VzcGVuc2lvblN0YXRlOjpTdXNwZW5kaW5nKQor ICAgICAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CiAKICAgICAv LyBXZSBjYWxsIG1heWJlU2h1dERvd24oKSBhc3luY2hyb25vdXNseSBzaW5jZSB0aGUgU3VzcGVu ZGVkUGFnZSBpcyBjdXJyZW50bHkgYmVpbmcgcmVtb3ZlZCBmcm9tIHRoZSBXZWJQcm9jZXNzUG9v bAogICAgIC8vIGFuZCB3ZSB3YW50IHRvIGF2b2lkIHJlLWVudGVyaW5nIFdlYlByb2Nlc3NQb29s IG1ldGhvZHMuCkBAIC0xMzQsNyArMTM2LDYgQEAgdm9pZCBTdXNwZW5kZWRQYWdlUHJveHk6OnVu c3VzcGVuZCgpCiAgICAgQVNTRVJUKG1fc3VzcGVuc2lvblN0YXRlID09IFN1c3BlbnNpb25TdGF0 ZTo6U3VzcGVuZGVkKTsKIAogICAgIG1fc3VzcGVuc2lvblN0YXRlID0gU3VzcGVuc2lvblN0YXRl OjpSZXN1bWVkOwotICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsK ICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldElzU3VzcGVuZGVkKGZh bHNlKSwgbV9wYWdlLnBhZ2VJRCgpKTsKIH0KIApAQCAtMTUxLDYgKzE1Miw4IEBAIHZvaWQgU3Vz cGVuZGVkUGFnZVByb3h5OjpkaWRQcm9jZXNzUmVxdWVzdFRvU3VzcGVuZChTdXNwZW5zaW9uU3Rh dGUgbmV3U3VzcGVuc2lvCiAgICAgbV9zdXNwZW5zaW9uVG9rZW4gPSBudWxscHRyOwogI2VuZGlm CiAKKyAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisKICAgICBp ZiAobV9yZWFkeVRvVW5zdXNwZW5kSGFuZGxlcikKICAgICAgICAgbV9yZWFkeVRvVW5zdXNwZW5k SGFuZGxlcih0aGlzKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YkZyYW1lUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5j cHAKaW5kZXggYzc3YTI2Yjc0MjdjMzFjODI4ZTJlYWEyMjFmODA3MGI3N2FkZDI2Mi4uNTNjNzE5 NmMyYWEwYTMzZDIyMDc1ODE5MGNkNGJkOTVhNWNkMDI1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJXZWJG cmFtZVByb3h5LmgiCiAKICNpbmNsdWRlICJBUElOYXZpZ2F0aW9uLmgiCisjaW5jbHVkZSAiUHJv dmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbmNsdWRlICJXZWJDZXJ0aWZpY2F0ZUluZm8uaCIKICNp bmNsdWRlICJXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkuaCIKICNpbmNsdWRlICJXZWJQYWdl TWVzc2FnZXMuaCIKQEAgLTc0LDcgKzc1LDcgQEAgYm9vbCBXZWJGcmFtZVByb3h5Ojppc01haW5G cmFtZSgpIGNvbnN0CiAgICAgaWYgKCFtX3BhZ2UpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAot ICAgIHJldHVybiB0aGlzID09IG1fcGFnZS0+bWFpbkZyYW1lKCk7CisgICAgcmV0dXJuIHRoaXMg PT0gbV9wYWdlLT5tYWluRnJhbWUoKSB8fCAobV9wYWdlLT5wcm92aXNpb25hbFBhZ2VQcm94eSgp ICYmIHRoaXMgPT0gbV9wYWdlLT5wcm92aXNpb25hbFBhZ2VQcm94eSgpLT5tYWluRnJhbWUoKSk7 CiB9CiAKIHZvaWQgV2ViRnJhbWVQcm94eTo6bG9hZFVSTChjb25zdCBVUkwmIHVybCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDM5Mjc0M2JkNTY3OWNiZDIy NjdhMmMxMGVjY2UxOTVhNjFjMzNkMjkuLjc3YWQ2MGMyYWQ3ZDI1Y2Y2NDlmNDM3NzAxYWVkMmVm ODJjNjQzNmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAt NzcsNiArNzcsNyBAQAogI2luY2x1ZGUgIlBsdWdpbkluZm9ybWF0aW9uLmgiCiAjaW5jbHVkZSAi UGx1Z2luUHJvY2Vzc01hbmFnZXIuaCIKICNpbmNsdWRlICJQcmludEluZm8uaCIKKyNpbmNsdWRl ICJQcm92aXNpb25hbFBhZ2VQcm94eS5oIgogI2luY2x1ZGUgIlNhZmVCcm93c2luZ1dhcm5pbmcu aCIKICNpbmNsdWRlICJTaGFyZVNoZWV0Q2FsbGJhY2tJRC5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1 ZmZlckRhdGFSZWZlcmVuY2UuaCIKQEAgLTc2OCwzOCArNzY5LDI1IEBAIGJvb2wgV2ViUGFnZVBy b3h5OjpzdXNwZW5kQ3VycmVudFBhZ2VJZlBvc3NpYmxlKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdh dGlvbiwgT3B0CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojpzd2Fw VG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2Vzcywgc3RkOjp1bmlxdWVf cHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UsIElzU3dh cEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1c3BlbmRlZCkKK3ZvaWQgV2ViUGFnZVByb3h5Ojpz d2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2Vzcywgc3RkOjp1bmlx dWVfcHRyPERyYXdpbmdBcmVhUHJveHk+JiYgZHJhd2luZ0FyZWEsIFJlZlB0cjxXZWJGcmFtZVBy b3h5PiYmIG1haW5GcmFtZSkKIHsKICAgICBBU1NFUlQoIW1faXNDbG9zZWQpOwogICAgIFJFTEVB U0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgInN3YXBUb1dlYlByb2Nlc3M6IHdlYlBJRCA9ICVp LCBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9w YWdlSUQpOwogCiAgICAgbV9wcm9jZXNzID0gV1RGTW92ZShwcm9jZXNzKTsKKyAgICBBU1NFUlQo IW1fZHJhd2luZ0FyZWEpOworICAgIG1fZHJhd2luZ0FyZWEgPSBXVEZNb3ZlKGRyYXdpbmdBcmVh KTsKKyAgICBBU1NFUlQoIW1fbWFpbkZyYW1lKTsKKyAgICBtX21haW5GcmFtZSA9IFdURk1vdmUo bWFpbkZyYW1lKTsKICAgICBtX2lzVmFsaWQgPSB0cnVlOwogCi0gICAgLy8gSWYgd2UgYXJlIHJl YXR0YWNoaW5nIHRvIGEgU3VzcGVuZGVkUGFnZSwgdGhlbiB0aGUgV2ViUHJvY2VzcycgV2ViUGFn ZSBhbHJlYWR5IGV4aXN0cyBhbmQKLSAgICAvLyBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZU1haW5G cmFtZSgpIHdpbGwgbm90IGJlIGNhbGxlZCB0byBpbml0aWFsaXplIG1fbWFpbkZyYW1lLiBJbiBz dWNoCi0gICAgLy8gY2FzZSwgd2UgbmVlZCB0byBpbml0aWFsaXplIG1fbWFpbkZyYW1lIHRvIHJl ZmxlY3QgdGhlIGZhY3QgdGhlIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdlCi0gICAgLy8gYWxyZWFk eSBleGlzdHMgYW5kIGFscmVhZHkgaGFzIGEgbWFpbiBmcmFtZS4KLSAgICBpZiAoZGVzdGluYXRp b25TdXNwZW5kZWRQYWdlKSB7Ci0gICAgICAgIGlmICghZGVzdGluYXRpb25TdXNwZW5kZWRQYWdl LT5mYWlsZWRUb1N1c3BlbmQoKSkgewotICAgICAgICAgICAgQVNTRVJUKCFtX21haW5GcmFtZSk7 Ci0gICAgICAgICAgICBBU1NFUlQoJmRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZS0+cHJvY2Vzcygp ID09IG1fcHJvY2Vzcy5wdHIoKSk7Ci0gICAgICAgICAgICBkZXN0aW5hdGlvblN1c3BlbmRlZFBh Z2UtPnVuc3VzcGVuZCgpOwotICAgICAgICAgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5 OjpjcmVhdGUoKnRoaXMsIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSk7 Ci0gICAgICAgICAgICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChkZXN0aW5hdGlvblN1c3BlbmRl ZFBhZ2UtPm1haW5GcmFtZUlEKCksICptX21haW5GcmFtZSk7Ci0gICAgICAgIH0gZWxzZSB7Ci0g ICAgICAgICAgICAvLyBXZSBmYWlsZWQgdG8gc3VzcGVuZCB0aGUgcGFnZSBzbyBkZXN0cm95IGl0 IG5vdyBhbmQgbWVyZWx5IHJldXNlIGl0cyBXZWJDb250ZW50IHByb2Nlc3MuCi0gICAgICAgICAg ICBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UgPSBudWxscHRyOwotICAgICAgICB9Ci0gICAgfQot CiAgICAgbV9wcm9jZXNzLT5hZGRFeGlzdGluZ1dlYlBhZ2UoKnRoaXMsIG1fcGFnZUlELCBXZWJQ cm9jZXNzUHJveHk6OkJlZ2luc1VzaW5nRGF0YVN0b3JlOjpObyk7CiAgICAgbV9wcm9jZXNzLT5h ZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVy TmFtZSgpLCBtX3BhZ2VJRCwgKnRoaXMpOwogCi0gICAgZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9j ZXNzKGlzU3dhcEZyb21TdXNwZW5kZWQpOworICAgIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2Vz cygpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNz KElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1c3BlbmRlZCkKK3ZvaWQgV2ViUGFnZVBy b3h5OjpmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoKQogewogICAgIEFTU0VSVChtX3Byb2Nl c3MtPnN0YXRlKCkgIT0gQ2hpbGRQcm9jZXNzUHJveHk6OlN0YXRlOjpUZXJtaW5hdGVkKTsKIApA QCAtODM1LDcgKzgyMyw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hpbmdUb1dl YlByb2Nlc3MoSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzCiAgICAgbV9lZGl0YWJs ZUltYWdlQ29udHJvbGxlciA9IHN0ZDo6bWFrZV91bmlxdWU8RWRpdGFibGVJbWFnZUNvbnRyb2xs ZXI+KCp0aGlzKTsKICNlbmRpZgogCi0gICAgaW5pdGlhbGl6ZVdlYlBhZ2UoaXNTd2FwRnJvbVN1 c3BlbmRlZCk7CisgICAgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsKIAogICAgIG1faW5zcGVjdG9yLT51 cGRhdGVGb3JOZXdQYWdlUHJvY2Vzcyh0aGlzKTsKIApAQCAtOTAwLDEyICs4ODgsMTQgQEAgUmVm UHRyPEFQSTo6TmF2aWdhdGlvbj4gV2ViUGFnZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2Vzc1dp dGhJdGVtKFdlYkJhY2tGb3J3YXIKICAgICByZXR1cm4gV1RGTW92ZShuYXZpZ2F0aW9uKTsKIH0K IAotdm9pZCBXZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKElzU3dhcEZyb21TdXNwZW5k ZWQgaXNTd2FwRnJvbVN1c3BlbmRlZCkKK3ZvaWQgV2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2Vi UGFnZSgpCiB7CiAgICAgQVNTRVJUKGlzVmFsaWQoKSk7CiAKLSAgICBtX2RyYXdpbmdBcmVhID0g cGFnZUNsaWVudCgpLmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKLSAgICBBU1NFUlQobV9kcmF3 aW5nQXJlYSk7CisgICAgaWYgKCFtX2RyYXdpbmdBcmVhKSB7CisgICAgICAgIG1fZHJhd2luZ0Fy ZWEgPSBwYWdlQ2xpZW50KCkuY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpOworICAgICAgICBBU1NF UlQobV9kcmF3aW5nQXJlYSk7CisgICAgfQogCiAjaWYgRU5BQkxFKEFTWU5DX1NDUk9MTElORykg JiYgUExBVEZPUk0oQ09DT0EpCiAgICAgaWYgKG1fZHJhd2luZ0FyZWEtPnR5cGUoKSA9PSBEcmF3 aW5nQXJlYVR5cGVSZW1vdGVMYXllclRyZWUpIHsKQEAgLTkxNywxNCArOTA3LDcgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2Fw RnJvbVN1c3BlbmRlZCkKICAgICB9CiAjZW5kaWYKIAotICAgIGF1dG8gcGFyYW1ldGVycyA9IGNy ZWF0aW9uUGFyYW1ldGVycygpOwotICAgIHBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCA9 IGlzU3dhcEZyb21TdXNwZW5kZWQgPT0gSXNTd2FwRnJvbVN1c3BlbmRlZDo6WWVzOwotCi0jaWYg RU5BQkxFKFNFUlZJQ0VfV09SS0VSKQotICAgIHBhcmFtZXRlcnMuaGFzUmVnaXN0ZXJlZFNlcnZp Y2VXb3JrZXJzID0gcHJvY2VzcygpLnByb2Nlc3NQb29sKCkubWF5SGF2ZVJlZ2lzdGVyZWRTZXJ2 aWNlV29ya2VycyhtX3dlYnNpdGVEYXRhU3RvcmUpOwotI2VuZGlmCi0KLSAgICBwcm9jZXNzKCku c2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6Q3JlYXRlV2ViUGFnZShtX3BhZ2VJRCwgcGFyYW1l dGVycyksIDApOworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpDcmVh dGVXZWJQYWdlKG1fcGFnZUlELCBjcmVhdGlvblBhcmFtZXRlcnMoKSksIDApOwogCiAgICAgbV9u ZWVkc1RvRmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCA9IHRydWU7 CiAgICAgZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCgpOwpAQCAt MTA3Niw3ICsxMDU5LDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRSZXF1ZXN0V2l0aE5hdmln YXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBSZXNvdXIKICAgICBhdXRvIHRyYW5z YWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CiAKICAgICBhdXRvIHVybCA9 IHJlcXVlc3QudXJsKCk7Ci0gICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1ZXN0 VVJMKHRyYW5zYWN0aW9uLCB1cmwpOworICAgIGlmIChzaG91bGRUcmVhdEFzQ29udGludWluZ0xv YWQgIT0gU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMpCisgICAgICAgIG1fcGFnZUxv YWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFuc2FjdGlvbiwgdXJsKTsKIAogICAg IGlmICghaXNWYWxpZCgpKQogICAgICAgICByZWF0dGFjaFRvV2ViUHJvY2VzcygpOwpAQCAtMjY5 Nyw3ICsyNjgxLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdhdGlvblBvbGlj eURlY2lzaW9uKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24KICAgICAgICAgfQogCiAgICAg ICAgIGlmIChwcm9jZXNzRm9yTmF2aWdhdGlvbi5wdHIoKSAhPSAmcHJvY2VzcygpKSB7Ci0gICAg ICAgICAgICBwb2xpY3lBY3Rpb24gPSBpc1BhZ2VPcGVuZWRCeURPTVNob3dpbmdJbml0aWFsRW1w dHlEb2N1bWVudCgpID8gV2ViUG9saWN5QWN0aW9uOjpJZ25vcmUgOiBXZWJQb2xpY3lBY3Rpb246 OlN1c3BlbmQ7CisgICAgICAgICAgICBwb2xpY3lBY3Rpb24gPSBXZWJQb2xpY3lBY3Rpb246Okln bm9yZTsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5n LCAiZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiwgc3dhcHBpbmcgcHJvY2VzcyAlaSB3 aXRoIHByb2Nlc3MgJWkgZm9yIG5hdmlnYXRpb24sIHJlYXNvbjogJXtwdWJsaWN9cyIsIHByb2Nl c3NJZGVudGlmaWVyKCksIHByb2Nlc3NGb3JOYXZpZ2F0aW9uLT5wcm9jZXNzSWRlbnRpZmllcigp LCByZWFzb24udXRmOCgpLmRhdGEoKSk7CiAgICAgICAgICAgICBMT0coUHJvY2Vzc1N3YXBwaW5n LCAiKFByb2Nlc3NTd2FwcGluZykgU3dpdGNoaW5nIGZyb20gcHJvY2VzcyAlaSB0byBuZXcgcHJv Y2VzcyAoJWkpIGZvciBuYXZpZ2F0aW9uICUiIFBSSXU2NCAiICclcyciLCBwcm9jZXNzSWRlbnRp ZmllcigpLCBwcm9jZXNzRm9yTmF2aWdhdGlvbi0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbmF2aWdh dGlvbi0+bmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24tPmxvZ2dpbmdTdHJpbmcoKSk7CiAgICAg ICAgIH0gZWxzZQpAQCAtMjcwNiw4ICsyNjkwLDE0IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNl aXZlZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbihXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9u CiAgICAgICAgIGJvb2wgc2hvdWxkUHJvY2Vzc1N3YXAgPSBwcm9jZXNzRm9yTmF2aWdhdGlvbi5w dHIoKSAhPSAmcHJvY2VzcygpOwogICAgICAgICByZWNlaXZlZFBvbGljeURlY2lzaW9uKHBvbGlj eUFjdGlvbiwgbmF2aWdhdGlvbi5wdHIoKSwgc2hvdWxkUHJvY2Vzc1N3YXAgPyBXVEY6Om51bGxv cHQgOiBXVEZNb3ZlKGRhdGEpLCBXVEZNb3ZlKHNlbmRlcikpOwogCi0gICAgICAgIGlmIChzaG91 bGRQcm9jZXNzU3dhcCkKLSAgICAgICAgICAgIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2Vz cyhuYXZpZ2F0aW9uLCBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UgPyBwcm9jZXNzKCkucHJvY2Vz c1Bvb2woKS50YWtlU3VzcGVuZGVkUGFnZSgqZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlKSA6IG51 bGxwdHIsIFdURk1vdmUocHJvY2Vzc0Zvck5hdmlnYXRpb24pLCBwcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50LCBXVEZNb3ZlKGRhdGEpKTsKKyAgICAgICAgaWYgKCFzaG91bGRQcm9jZXNzU3dh cCkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBhdXRvIHN1c3BlbmRlZFBhZ2UgPSBk ZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UgPyBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS50YWtlU3Vz cGVuZGVkUGFnZSgqZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlKSA6IG51bGxwdHI7CisgICAgICAg IGlmIChzdXNwZW5kZWRQYWdlICYmIHN1c3BlbmRlZFBhZ2UtPmZhaWxlZFRvU3VzcGVuZCgpKQor ICAgICAgICAgICAgc3VzcGVuZGVkUGFnZSA9IG51bGxwdHI7CisKKyAgICAgICAgY29udGludWVO YXZpZ2F0aW9uSW5OZXdQcm9jZXNzKG5hdmlnYXRpb24sIFdURk1vdmUoc3VzcGVuZGVkUGFnZSks IFdURk1vdmUocHJvY2Vzc0Zvck5hdmlnYXRpb24pLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xp ZW50LCBXVEZNb3ZlKGRhdGEpKTsKICAgICB9KTsKIH0KIApAQCAtMjc0MywyNCArMjczMyw0NSBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihXZWJQb2xpY3lBY3Rp b24gYWN0aW9uLCBBUEk6Ok5hdmlnYXRpbwogICAgIHNlbmRlci0+c2VuZChhY3Rpb24sIG5hdmln YXRpb24gPyBuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSA6IDAsIGRvd25sb2FkSUQsIFdURk1v dmUod2Vic2l0ZVBvbGljaWVzKSk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojpjb250aW51ZU5h dmlnYXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBzdGQ6OnVu aXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmIHN1c3BlbmRlZFBhZ2VQcm94eSwgUmVmPFdl YlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHBy b2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+ JiYgd2Vic2l0ZVBvbGljaWVzKQordm9pZCBXZWJQYWdlUHJveHk6OmNvbW1pdFByb3Zpc2lvbmFs UGFnZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmlu ZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90 IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYgY2VydGlmaWNh dGVJbmZvLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhh c0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0 YSYgdXNlckRhdGEpCiB7Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiY29u dGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJ dTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKLSAgICBMT0co TG9hZGluZywgIkNvbnRpbnVpbmcgbmF2aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMnIGluIGEgbmV3 IHdlYiBwcm9jZXNzIiwgbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi5sb2dn aW5nU3RyaW5nKCkpOworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFnZSk7CisgICAgUkVMRUFT RV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiY29tbWl0UHJvdmlzaW9uYWxQYWdlOiBwcmV2aW91 c1BJRCA9ICVpLCBuZXdQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnBy b2Nlc3NJZGVudGlmaWVyKCksIG1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCkucHJvY2Vzc0lk ZW50aWZpZXIoKSwgbV9wYWdlSUQpOwogCi0gICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gcHJldmlv dXNQcm9jZXNzID0gbV9wcm9jZXNzLmNvcHlSZWYoKTsKICAgICBPcHRpb25hbDx1aW50NjRfdD4g bWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcyA9IG1fbWFpbkZyYW1lID8gbWFrZU9wdGlvbmFs KG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkpIDogV1RGOjpudWxsb3B0OwotICAgIGF1dG8gbWFpbkZy YW1lVVJMID0gbV9tYWluRnJhbWUgPyBtX21haW5GcmFtZS0+dXJsKCkgOiBVUkwoKTsKIAotICAg IEFTU0VSVChtX3Byb2Nlc3MucHRyKCkgIT0gcHJvY2Vzcy5wdHIoKSk7CisgICAgQVNTRVJUKG1f cHJvY2Vzcy5wdHIoKSAhPSAmbV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3MoKSk7CiAKICAgICBw cm9jZXNzRGlkVGVybWluYXRlKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbjo6TmF2aWdhdGlvblN3 YXApOwogCiAgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2VJRCk7Ci0gICAgYm9vbCBk aWRTdXNwZW5kUHJldmlvdXNQYWdlID0gc3VzcGVuZEN1cnJlbnRQYWdlSWZQb3NzaWJsZShuYXZp Z2F0aW9uLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzLCBwcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50KTsKKyAgICBhdXRvKiBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0YXRlKCkubmF2 aWdhdGlvbihtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkpOworICAgIGJvb2wgZGlk U3VzcGVuZFByZXZpb3VzUGFnZSA9IG5hdmlnYXRpb24gPyBzdXNwZW5kQ3VycmVudFBhZ2VJZlBv c3NpYmxlKCpuYXZpZ2F0aW9uLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzLCBtX3Byb3Zp c2lvbmFsUGFnZS0+cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCgpKSA6IGZhbHNlOwogICAg IG1fcHJvY2Vzcy0+cmVtb3ZlV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQsIFdlYlByb2Nlc3NQcm94 eTo6RW5kc1VzaW5nRGF0YVN0b3JlOjpObyk7CiAKLSAgICBzd2FwVG9XZWJQcm9jZXNzKFdURk1v dmUocHJvY2VzcyksIFdURk1vdmUoc3VzcGVuZGVkUGFnZVByb3h5KSwgZGlkU3VzcGVuZFByZXZp b3VzUGFnZSA/IElzU3dhcEZyb21TdXNwZW5kZWQ6OlllcyA6IElzU3dhcEZyb21TdXNwZW5kZWQ6 Ok5vKTsKKyAgICAvLyBUaGVyZSBpcyBubyB3YXkgd2UnbGwgYmUgYWJsZSB0byByZXR1cm4gdG8g dGhlIHBhZ2UgaW4gdGhlIHByZXZpb3VzIHBhZ2Ugc28gY2xvc2UgaXQuCisgICAgaWYgKCFkaWRT dXNwZW5kUHJldmlvdXNQYWdlKQorICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6Oldl YlBhZ2U6OkNsb3NlKCksIHBhZ2VJRCgpKTsKKworICAgIHN3YXBUb1dlYlByb2Nlc3MobV9wcm92 aXNpb25hbFBhZ2UtPnByb2Nlc3MoKSwgbV9wcm92aXNpb25hbFBhZ2UtPnRha2VEcmF3aW5nQXJl YSgpLCBtX3Byb3Zpc2lvbmFsUGFnZS0+bWFpbkZyYW1lKCkpOworCisgICAgZGlkQ29tbWl0TG9h ZEZvckZyYW1lKGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgbWltZVR5cGUsIGZyYW1lSGFzQ3VzdG9t Q29udGVudFByb3ZpZGVyLCBmcmFtZUxvYWRUeXBlLCBjZXJ0aWZpY2F0ZUluZm8sIGNvbnRhaW5z UGx1Z2luRG9jdW1lbnQsIGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgdXNlckRhdGEpOworCisg ICAgbV9wcm92aXNpb25hbFBhZ2UgPSBudWxscHRyOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6 Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlv biwgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiBzdXNwZW5kZWRQYWdlUHJv eHksIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgbmV3UHJvY2VzcywgUHJvY2Vzc1N3YXBSZXF1ZXN0 ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBPcHRpb25hbDxXZWJzaXRl UG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBSRUxFQVNFX0xPR19JRl9B TExPV0VEKExvYWRpbmcsICJjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3M6IHdlYlBJRCA9 ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwg bV9wYWdlSUQpOworICAgIExPRyhMb2FkaW5nLCAiQ29udGludWluZyBuYXZpZ2F0aW9uICUiIFBS SXU2NCAiICclcycgaW4gYSBuZXcgd2ViIHByb2Nlc3MiLCBuYXZpZ2F0aW9uLm5hdmlnYXRpb25J RCgpLCBuYXZpZ2F0aW9uLmxvZ2dpbmdTdHJpbmcoKSk7CisKKyAgICBpZiAobV9wcm92aXNpb25h bFBhZ2UpIHsKKyAgICAgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSAh PSBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpKQorICAgICAgICAgICAgbV9wcm92aXNpb25hbFBh Z2UtPmNhbmNlbCgpOworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7CisgICAg fQorCisgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBzdGQ6Om1ha2VfdW5pcXVlPFByb3Zpc2lvbmFs UGFnZVByb3h5PigqdGhpcywgbmV3UHJvY2Vzcy5jb3B5UmVmKCksIFdURk1vdmUoc3VzcGVuZGVk UGFnZVByb3h5KSwgbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi5jdXJyZW50 UmVxdWVzdElzUmVkaXJlY3QoKSwgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpLCBwcm9jZXNz U3dhcFJlcXVlc3RlZEJ5Q2xpZW50KTsKIAogICAgIGlmIChhdXRvKiBpdGVtID0gbmF2aWdhdGlv bi50YXJnZXRJdGVtKCkpIHsKICAgICAgICAgTE9HKExvYWRpbmcsICJXZWJQYWdlUHJveHkgJXAg Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzIHRvIGJhY2sgaXRlbSBVUkwgJXMiLCB0aGlz LCBpdGVtLT51cmwoKS51dGY4KCkuZGF0YSgpKTsKQEAgLTI3NjgsNjcgKzI3NzksMjIgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhBUEk6Ok5hdmln YXRpb24mIG5hdmlnYXRpb24sIHMKICAgICAgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFnZUxv YWRTdGF0ZS50cmFuc2FjdGlvbigpOwogICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0UGVuZGlu Z0FQSVJlcXVlc3RVUkwodHJhbnNhY3Rpb24sIGl0ZW0tPnVybCgpKTsKIAotICAgICAgICBhdXRv IGl0ZW1TdGF0ZXMgPSBtX2JhY2tGb3J3YXJkTGlzdC0+ZmlsdGVyZWRJdGVtU3RhdGVzKFt0aGlz LCB0YXJnZXRJdGVtID0gaXRlbV0oV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYgaXRlbSkgewotICAg ICAgICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBpdGVtLnN1c3BlbmRlZFBhZ2UoKSkgewotICAgICAg ICAgICAgICAgIGlmICgmcGFnZS0+cHJvY2VzcygpID09IG1fcHJvY2Vzcy5wdHIoKSkKLSAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgfQotICAgICAgICAgICAg cmV0dXJuICZpdGVtICE9IHRhcmdldEl0ZW07Ci0gICAgICAgIH0pOwotICAgICAgICBtX3Byb2Nl c3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlVwZGF0ZUJhY2tGb3J3YXJkTGlzdEZvclJlYXR0 YWNoKFdURk1vdmUoaXRlbVN0YXRlcykpLCBtX3BhZ2VJRCk7Ci0gICAgICAgIG1fcHJvY2Vzcy0+ c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uLm5h dmlnYXRpb25JRCgpLCBpdGVtLT5pdGVtSUQoKSwgKm5hdmlnYXRpb24uYmFja0ZvcndhcmRGcmFt ZUxvYWRUeXBlKCksIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdl YnNpdGVQb2xpY2llcykpLCBtX3BhZ2VJRCk7Ci0gICAgICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2 ZW5lc3NUaW1lcigpLnN0YXJ0KCk7Ci0KKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UtPmdvVG9C YWNrRm9yd2FyZEl0ZW0obmF2aWdhdGlvbiwgKml0ZW0sIFdURk1vdmUod2Vic2l0ZVBvbGljaWVz KSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBpZiAobV9iYWNrRm9yd2FyZExpc3Qt PmN1cnJlbnRJdGVtKCkgJiYgKG5hdmlnYXRpb24ubG9ja0JhY2tGb3J3YXJkTGlzdCgpID09IExv Y2tCYWNrRm9yd2FyZExpc3Q6OlllcyB8fCBuYXZpZ2F0aW9uLmxvY2tIaXN0b3J5KCkgPT0gTG9j a0hpc3Rvcnk6OlllcykpIHsKICAgICAgICAgLy8gSWYgV2ViQ29yZSBpcyBzdXBwb3NlZCB0byBs b2NrIHRoZSBoaXN0b3J5IGZvciB0aGlzIGxvYWQsIHRoZW4gdGhlIG5ldyBwcm9jZXNzIG5lZWRz IHRvIGtub3cgYWJvdXQgdGhlIGN1cnJlbnQgaGlzdG9yeSBpdGVtIHNvIGl0IGNhbiB1cGRhdGUK ICAgICAgICAgLy8gaXQgaW5zdGVhZCBvZiBjcmVhdGluZyBhIG5ldyBvbmUuCi0gICAgICAgIG1f cHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0Q3VycmVudEhpc3RvcnlJdGVtRm9y UmVhdHRhY2gobV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCktPml0ZW1TdGF0ZSgpKSwg bV9wYWdlSUQpOworICAgICAgICBuZXdQcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpT ZXRDdXJyZW50SGlzdG9yeUl0ZW1Gb3JSZWF0dGFjaChtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVu dEl0ZW0oKS0+aXRlbVN0YXRlKCkpLCBtX3BhZ2VJRCk7CiAgICAgfQogCiAgICAgLy8gRklYTUU6 IFdvcmsgb3V0IHRpbWluZyBvZiByZXNwb25kaW5nIHdpdGggdGhlIGxhc3QgcG9saWN5IGRlbGVn YXRlLCBldGMKICAgICBBU1NFUlQoIW5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKS5pc0VtcHR5 KCkpOwogICAgIGlmIChhdXRvJiBzdWJzdGl0dXRlRGF0YSA9IG5hdmlnYXRpb24uc3Vic3RpdHV0 ZURhdGEoKSkKLSAgICAgICAgbG9hZERhdGFXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCB7IHN1 YnN0aXR1dGVEYXRhLT5jb250ZW50LmRhdGEoKSwgc3Vic3RpdHV0ZURhdGEtPmNvbnRlbnQuc2l6 ZSgpIH0sIHN1YnN0aXR1dGVEYXRhLT5NSU1FVHlwZSwgc3Vic3RpdHV0ZURhdGEtPmVuY29kaW5n LCBzdWJzdGl0dXRlRGF0YS0+YmFzZVVSTCwgc3Vic3RpdHV0ZURhdGEtPnVzZXJEYXRhLmdldCgp LCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNp ZXMpKTsKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UtPmxvYWREYXRhV2l0aE5hdmlnYXRpb24o bmF2aWdhdGlvbiwgeyBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5kYXRhKCksIHN1YnN0aXR1dGVE YXRhLT5jb250ZW50LnNpemUoKSB9LCBzdWJzdGl0dXRlRGF0YS0+TUlNRVR5cGUsIHN1YnN0aXR1 dGVEYXRhLT5lbmNvZGluZywgc3Vic3RpdHV0ZURhdGEtPmJhc2VVUkwsIHN1YnN0aXR1dGVEYXRh LT51c2VyRGF0YS5nZXQoKSwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKICAgICBlbHNlCi0g ICAgICAgIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgUmVzb3VyY2VSZXF1 ZXN0IHsgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpIH0sIFdlYkNvcmU6OlNob3VsZE9wZW5F eHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZEFsbG93RXh0ZXJuYWxTY2hlbWVzLCBudWxscHRyLCBT aG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMp KTsKLQotICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOwotICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25I YW5kbGVyID0gW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCBuYXZpZ2F0aW9u SUQgPSBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCByZXF1ZXN0ID0gIG5hdmlnYXRpb24uY3Vy cmVudFJlcXVlc3QoKSwgbWFpbkZyYW1lVVJMLCBpc1NlcnZlclJlZGlyZWN0ID0gbmF2aWdhdGlv bi5jdXJyZW50UmVxdWVzdElzUmVkaXJlY3QoKV0oKSBtdXRhYmxlIHsKLSAgICAgICAgaWYgKCF3 ZWFrVGhpcykKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBBU1NFUlQobV9tYWluRnJh bWUpOwotICAgICAgICAvLyBUaGlzIG5hdmlnYXRpb24gd2FzIGRlc3Ryb3llZCBzbyBubyBuZWVk IHRvIG5vdGlmeSBvZiByZWRpcmVjdC4KLSAgICAgICAgaWYgKCFuYXZpZ2F0aW9uU3RhdGUoKS5u YXZpZ2F0aW9uKG5hdmlnYXRpb25JRCkpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAg Ly8gUmVzdG9yZSB0aGUgbWFpbiBmcmFtZSdzIGNvbW1pdHRlZCBVUkwgYXMgc29tZSBjbGllbnRz IG1heSByZWx5IG9uIGl0IHVudGlsIHRoZSBuZXh0IGxvYWQgaXMgY29tbWl0dGVkLgotICAgICAg ICBtX21haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5zZXRVUkwobWFpbkZyYW1lVVJMKTsKLQot ICAgICAgICAvLyBOb3JtYWxseSwgbm90aWZpY2F0aW9uIG9mIGEgc2VydmVyIHJlZGlyZWN0IGNv bWVzIGZyb20gdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KLSAgICAgICAgLy8gSWYgd2UgYXJlIHBy b2Nlc3Mgc3dhcHBpbmcgaW4gcmVzcG9uc2UgdG8gYSBzZXJ2ZXIgcmVkaXJlY3QgdGhlbiB0aGF0 IG5vdGlmaWNhdGlvbiB3aWxsIG5vdCBjb21lIGZyb20gdGhlIG5ldyBXZWJDb250ZW50IHByb2Nl c3MuCi0gICAgICAgIC8vIEluIHRoaXMgY2FzZSB3ZSBoYXZlIHRoZSBVSVByb2Nlc3Mgc3ludGhl c2l6ZSB0aGUgcmVkaXJlY3Qgbm90aWZpY2F0aW9uIGF0IHRoZSBhcHByb3ByaWF0ZSB0aW1lLgot ICAgICAgICBpZiAoaXNTZXJ2ZXJSZWRpcmVjdCkgewotICAgICAgICAgICAgbV9tYWluRnJhbWUt PmZyYW1lTG9hZFN0YXRlKCkuZGlkU3RhcnRQcm92aXNpb25hbExvYWQocmVxdWVzdC51cmwoKSk7 Ci0gICAgICAgICAgICBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRG b3JGcmFtZShtX21haW5GcmFtZS0+ZnJhbWVJRCgpLCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUocmVx dWVzdCksIHsgfSk7Ci0gICAgICAgIH0KLSAgICB9OwotCi0gICAgaWYgKCFtX3Byb2Nlc3MtPnBy b2Nlc3NQb29sKCkuY29uZmlndXJhdGlvbigpLnByb2Nlc3NTd2Fwc09uV2luZG93T3BlbldpdGhP cGVuZXIoKSB8fCAhaXNQYWdlT3BlbmVkQnlET01TaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQo KSB8fCAhbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcykgewotICAgICAgICAvLyBUaGVyZSBp cyBubyB3YXkgd2UnbGwgYmUgYWJsZSB0byByZXR1cm4gdG8gdGhlIHBhZ2UgaW4gdGhlIHByZXZp b3VzIHBhZ2Ugc28gY2xvc2UgaXQuCi0gICAgICAgIGlmICghZGlkU3VzcGVuZFByZXZpb3VzUGFn ZSkKLSAgICAgICAgICAgIHByZXZpb3VzUHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6 Q2xvc2UoKSwgbV9wYWdlSUQpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgbV9tYWlu RnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIgPSBbdGhpcywgcHJldmlvdXNQcm9jZXNzID0gV1RG TW92ZShwcmV2aW91c1Byb2Nlc3MpLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzID0gKm1h aW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3NdKGNvbnN0IEdsb2JhbFdpbmRvd0lkZW50aWZpZXIm IHdpbmRvd0lkZW50aWZpZXIpIHsKLSAgICAgICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKLSAgICAg ICAgR2xvYmFsRnJhbWVJZGVudGlmaWVyIG5hdmlnYXRlZEZyYW1lSWRlbnRpZmllckluTmV3UHJv Y2VzcyB7IHBhZ2VJRCgpLCBtX21haW5GcmFtZS0+ZnJhbWVJRCgpIH07Ci0gICAgICAgIHByZXZp b3VzUHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RnJhbWVCZWNhbWVSZW1vdGUobWFp bkZyYW1lSURJblByZXZpb3VzUHJvY2VzcywgbmF2aWdhdGVkRnJhbWVJZGVudGlmaWVySW5OZXdQ cm9jZXNzLCB3aW5kb3dJZGVudGlmaWVyKSwgcGFnZUlEKCkpOwotICAgIH07CisgICAgICAgIG1f cHJvdmlzaW9uYWxQYWdlLT5sb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIFJl c291cmNlUmVxdWVzdCB7IG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKSB9LCBXZWJDb3JlOjpT aG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGRBbGxvd0V4dGVybmFsU2NoZW1lcywg bnVsbHB0ciwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKIH0KIAogYm9vbCBXZWJQYWdlUHJv eHk6OmlzUGFnZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgY29uc3QK QEAgLTM2OTMsMTEgKzM2NTksNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZy YW1lKHVpbnQ2NF90IGZyYW1lSUQpCiAKICAgICAvLyBBZGQgdGhlIGZyYW1lIHRvIHRoZSBwcm9j ZXNzIHdpZGUgbWFwLgogICAgIG1fcHJvY2Vzcy0+ZnJhbWVDcmVhdGVkKGZyYW1lSUQsICptX21h aW5GcmFtZSk7Ci0KLSAgICBpZiAobV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIpIHsKLSAgICAg ICAgbV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIoKTsKLSAgICAgICAgbV9tYWluRnJhbWVDcmVh dGlvbkhhbmRsZXIgPSBudWxscHRyOwotICAgIH0KIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmRp ZENyZWF0ZVN1YmZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCkBAIC0zNzIyLDEwICszNjgzLDYgQEAg dm9pZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVN1YmZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCiAK IHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVXaW5kb3codWludDY0X3QgZnJhbWVJRCwgR2xv YmFsV2luZG93SWRlbnRpZmllciYmIHdpbmRvd0lkZW50aWZpZXIpCiB7Ci0gICAgaWYgKG1fbWFp bkZyYW1lICYmIG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkgPT0gZnJhbWVJRCkgewotICAgICAgICBp ZiAoYXV0byBtYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIgPSBXVEZNb3ZlKG1fbWFpbkZy YW1lV2luZG93Q3JlYXRpb25IYW5kbGVyKSkKLSAgICAgICAgICAgIG1haW5GcmFtZVdpbmRvd0Ny ZWF0aW9uSGFuZGxlcih3aW5kb3dJZGVudGlmaWVyKTsKLSAgICB9CiB9CiAKIGRvdWJsZSBXZWJQ YWdlUHJveHk6OmVzdGltYXRlZFByb2dyZXNzKCkgY29uc3QKQEAgLTM3NzgsNiArMzczNSwxMCBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRGVzdHJveU5hdmlnYXRpb24odWludDY0X3QgbmF2aWdh dGlvbklEKQogewogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQo KSk7CiAKKyAgICAvLyBPbiBwcm9jZXNzLXN3YXAsIHRoZSBwcmV2aW91cyBwcm9jZXNzIHRyaWVz IHRvIGRlc3Ryb3kgdGhlIG5hdmlnYXRpb24gYnV0IHRoZSBwcm92aXNpb25hbCBwcm9jZXNzIGlz IGFjdHVhbGx5IHRha2luZyBvdmVyIHRoZSBuYXZpZ2F0aW9uLgorICAgIGlmIChtX3Byb3Zpc2lv bmFsUGFnZSAmJiBtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkgPT0gbmF2aWdhdGlv bklEKQorICAgICAgICByZXR1cm47CisKICAgICAvLyBGSVhNRTogTWVzc2FnZSBjaGVjayB0aGUg bmF2aWdhdGlvbklELgogICAgIG1fbmF2aWdhdGlvblN0YXRlLT5kaWREZXN0cm95TmF2aWdhdGlv bihuYXZpZ2F0aW9uSUQpOwogfQpAQCAtMzc5NSwxNCArMzc1Niw2IEBAIHZvaWQgV2ViUGFnZVBy b3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVp bnQ2NF90IG5hCiAgICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpICYmIG5hdmlnYXRpb25JRCkK ICAgICAgICAgbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRpb24obmF2aWdh dGlvbklEKTsKIAotICAgIC8vIElmIHRoaXMgc2VlbWluZ2x5IG5ldyBsb2FkIGlzIGFjdHVhbGx5 IGNvbnRpbnVpbmcgYSBzZXJ2ZXIgcmVkaXJlY3QgZm9yIGEgcHJldmlvdXMgbmF2aWdhdGlvbiBp biBhIG5ldyBwcm9jZXNzLAotICAgIC8vIHRoZW4gd2UgaWdub3JlIHRoaXMgbm90aWZpY2F0aW9u LgotICAgIGlmIChuYXZpZ2F0aW9uICYmIG5hdmlnYXRpb24tPmN1cnJlbnRSZXF1ZXN0SXNSZWRp cmVjdCgpKSB7Ci0gICAgICAgIGF1dG8gbmF2aWdhdGlvblByb2Nlc3NJZGVudGlmaWVyID0gbmF2 aWdhdGlvbi0+Y3VycmVudFJlcXVlc3RQcm9jZXNzSWRlbnRpZmllcigpOwotICAgICAgICBpZiAo bmF2aWdhdGlvblByb2Nlc3NJZGVudGlmaWVyICYmICpuYXZpZ2F0aW9uUHJvY2Vzc0lkZW50aWZp ZXIgIT0gbV9wcm9jZXNzLT5jb3JlUHJvY2Vzc0lkZW50aWZpZXIoKSkKLSAgICAgICAgICAgIHJl dHVybjsKLSAgICB9Ci0KICAgICBMT0coTG9hZGluZywgIldlYlBhZ2VQcm94eSAlIiBQUkl1NjQg IiBpbiBwcm9jZXNzIHBpZCAlaSBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lIHRvIGZy YW1lSUQgJSIgUFJJdTY0ICIsIG5hdmlnYXRpb25JRCAlIiBQUkl1NjQgIiwgdXJsICVzIiwgbV9w YWdlSUQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgZnJhbWVJRCwgbmF2aWdhdGlv bklELCB1cmwuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgUkVMRUFTRV9MT0dfSUZfQUxM T1dFRChMb2FkaW5nLCAiZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTogd2ViUElEID0g JWksIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3Mt PnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlELCBmcmFtZUlEKTsKIApAQCAtMzkxMCw2ICsz ODYzLDExIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJh bWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2VjdXJpCiAKICAgICBQYWdlQ2xpZW50UHJvdGVj dG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdl ICYmIG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSA9PSBuYXZpZ2F0aW9uSUQgJiYg Jm1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCkgIT0gbV9wcm9jZXNzLnB0cigpKSB7CisgICAg ICAgIC8vIFRoZSBsb2FkIGRpZCBub3QgZmFpbCwgaXQgbWVyZWx5IGhhcHBlbmluZyBpbiBhIG5l dyBwcm92aXNpb25hbCBwcm9jZXNzLgorICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgV2Vi RnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwogICAgIE1F U1NBR0VfQ0hFQ0soZnJhbWUpOwogCkBAIC0zOTQ4LDYgKzM5MDYsMTAgQEAgdm9pZCBXZWJQYWdl UHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBj b25zdCBTZWN1cmkKICAgICB9CiAKICAgICBtX2ZhaWxpbmdQcm92aXNpb25hbExvYWRVUkwgPSB7 IH07CisKKyAgICAvLyBJZiB0aGUgcHJvdmlzaW9uYWwgcGFnZSdzIGxvYWQgZmFpbHMgdGhlbiB3 ZSBkZXN0cm95IHRoZSBwcm92aXNpb25hbCBwYWdlLgorICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFn ZSAmJiBtX3Byb3Zpc2lvbmFsUGFnZS0+bWFpbkZyYW1lKCkgPT0gZnJhbWUpCisgICAgICAgIG1f cHJvdmlzaW9uYWxQYWdlID0gbnVsbHB0cjsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmNsZWFy TG9hZERlcGVuZGVudENhbGxiYWNrcygpCkBAIC00MzM5LDggKzQzMDEsOCBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jKHVpbnQ2NF90IGZy YW1lSUQsIFdlYkNvcgogICAgIGF1dG8qIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFt ZUlEKTsKICAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKIAotICAgIGRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb24oKmZyYW1lLCBXVEZNb3ZlKGZyYW1lU2VjdXJpdHlPcmlnaW4pLCBuYXZp Z2F0aW9uSUQsIFdURk1vdmUobmF2aWdhdGlvbkFjdGlvbkRhdGEpLCBXVEZNb3ZlKGZyYW1lSW5m b0RhdGEpLCBvcmlnaW5hdGluZ1BhZ2VJRCwgb3JpZ2luYWxSZXF1ZXN0LCBXVEZNb3ZlKHJlcXVl c3QpLCBXVEZNb3ZlKHJlcXVlc3RCb2R5KSwgV1RGTW92ZShyZWRpcmVjdFJlc3BvbnNlKSwgdXNl ckRhdGEsIFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMg PSBtYWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRF0gKGF1dG8uLi4gYXJncykgewot ICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xp Y3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQpOworICAg IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oKmZyYW1lLCBXVEZNb3ZlKGZyYW1lU2Vj dXJpdHlPcmlnaW4pLCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUobmF2aWdhdGlvbkFjdGlvbkRhdGEp LCBXVEZNb3ZlKGZyYW1lSW5mb0RhdGEpLCBvcmlnaW5hdGluZ1BhZ2VJRCwgb3JpZ2luYWxSZXF1 ZXN0LCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKHJlcXVlc3RCb2R5KSwgV1RGTW92ZShyZWRp cmVjdFJlc3BvbnNlKSwgdXNlckRhdGEsIFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3Ro aXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRCwg cHJvY2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCldIChhdXRvLi4uIGFyZ3MpIHsKKyAgICAgICAg cHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9u KGZyYW1lSUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CiAgICAgfSkpOwogfQog CkBAIC00NTc0LDEyICs0NTM2LDEyIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lG b3JSZXNwb25zZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cml0eU9yaWdpCiAgICAgTUVT U0FHRV9DSEVDS19VUkwocmVzcG9uc2UudXJsKCkpOwogCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdh dGlvbj4gbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25JRCA/IG1fbmF2aWdhdGlvblN0YXRlLT5uYXZp Z2F0aW9uKG5hdmlnYXRpb25JRCkgOiBudWxscHRyOwotICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtl UmVmKGZyYW1lLT5zZXRVcFBvbGljeUxpc3RlbmVyUHJveHkoW3RoaXMsIHByb3RlY3RlZFRoaXMg PSBtYWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRCwgbmF2aWdhdGlvbiA9IFdURk1v dmUobmF2aWdhdGlvbildIChXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCBBUEk6OldlYnNp dGVQb2xpY2llcyosIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1 ZXN0ZWRCeUNsaWVudCwgUmVmUHRyPFNhZmVCcm93c2luZ1dhcm5pbmc+JiYgc2FmZUJyb3dzaW5n V2FybmluZykgbXV0YWJsZSB7CisgICAgYXV0byBsaXN0ZW5lciA9IG1ha2VSZWYoZnJhbWUtPnNl dFVwUG9saWN5TGlzdGVuZXJQcm94eShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRo aXMpLCBmcmFtZUlELCBsaXN0ZW5lcklELCBuYXZpZ2F0aW9uID0gV1RGTW92ZShuYXZpZ2F0aW9u KSwgcHJvY2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCldIChXZWJQb2xpY3lBY3Rpb24gcG9saWN5 QWN0aW9uLCBBUEk6OldlYnNpdGVQb2xpY2llcyosIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGll bnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgUmVmUHRyPFNhZmVCcm93c2luZ1dhcm5p bmc+JiYgc2FmZUJyb3dzaW5nV2FybmluZykgbXV0YWJsZSB7CiAgICAgICAgIC8vIEZJWE1FOiBB c3NlcnQgdGhlIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiBpcyBudWxscHRyIGhlcmUgb25jZSBjbGll bnRzIG9mIFdLRnJhbWVQb2xpY3lMaXN0ZW5lclVzZVdpdGhQb2xpY2llcyBnbyBhd2F5LgogICAg ICAgICBSRUxFQVNFX0FTU0VSVChwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50ID09IFByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQ6Ok5vKTsKICAgICAgICAgQVNTRVJUX1VOVVNFRChzYWZl QnJvd3NpbmdXYXJuaW5nLCAhc2FmZUJyb3dzaW5nV2FybmluZyk7Ci0gICAgICAgIHJlY2VpdmVk UG9saWN5RGVjaXNpb24ocG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uLmdldCgpLCBXVEY6Om51bGxv cHQsIFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBX VEZNb3ZlKHByb3RlY3RlZFRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklEXSAoYXV0by4uLiBhcmdz KSB7Ci0gICAgICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJl Y2VpdmVQb2xpY3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdl SUQpOworICAgICAgICByZWNlaXZlZFBvbGljeURlY2lzaW9uKHBvbGljeUFjdGlvbiwgbmF2aWdh dGlvbi5nZXQoKSwgV1RGOjpudWxsb3B0LCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0 aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKSwgZnJhbWVJRCwgbGlz dGVuZXJJRCwgcHJvY2VzcyA9IFdURk1vdmUocHJvY2VzcyldIChhdXRvLi4uIGFyZ3MpIHsKKyAg ICAgICAgICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xp Y3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQpOwogICAg ICAgICB9KSk7CiAgICAgfSwgU2hvdWxkRXhwZWN0U2FmZUJyb3dzaW5nUmVzdWx0OjpObykpOwog CkBAIC02NDg2LDggKzY0NDgsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cHJvY2Vzc1dpbGxCZWNv bWVGb3JlZ3JvdW5kKCkKIHZvaWQgV2ViUGFnZVByb3h5OjpyZXNldFN0YXRlKFJlc2V0U3RhdGVS ZWFzb24gcmVzZXRTdGF0ZVJlYXNvbikKIHsKICAgICBtX21haW5GcmFtZSA9IG51bGxwdHI7Ci0g ICAgbV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIgPSBudWxscHRyOwotICAgIG1fbWFpbkZyYW1l V2luZG93Q3JlYXRpb25IYW5kbGVyID0gbnVsbHB0cjsKIAogI2lmIFBMQVRGT1JNKENPQ09BKQog ICAgIG1fc2Nyb2xsaW5nUGVyZm9ybWFuY2VEYXRhID0gbnVsbHB0cjsKQEAgLTY3NzgsNiArNjcz OCwxMCBAQCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25Q YXJhbWV0ZXJzKCkKICAgICBwYXJhbWV0ZXJzLmFwcGxpY2F0aW9uTWFuaWZlc3QgPSBtX2NvbmZp Z3VyYXRpb24tPmFwcGxpY2F0aW9uTWFuaWZlc3QoKSA/IE9wdGlvbmFsPFdlYkNvcmU6OkFwcGxp Y2F0aW9uTWFuaWZlc3Q+KG1fY29uZmlndXJhdGlvbi0+YXBwbGljYXRpb25NYW5pZmVzdCgpLT5h cHBsaWNhdGlvbk1hbmlmZXN0KCkpIDogV1RGOjpudWxsb3B0OwogI2VuZGlmCiAKKyNpZiBFTkFC TEUoU0VSVklDRV9XT1JLRVIpCisgICAgcGFyYW1ldGVycy5oYXNSZWdpc3RlcmVkU2VydmljZVdv cmtlcnMgPSBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS5tYXlIYXZlUmVnaXN0ZXJlZFNlcnZpY2VX b3JrZXJzKG1fd2Vic2l0ZURhdGFTdG9yZSk7CisjZW5kaWYKKwogICAgIHBhcmFtZXRlcnMubmVl ZHNGb250QXR0cmlidXRlcyA9IG1fbmVlZHNGb250QXR0cmlidXRlczsKIAogICAgIG1fcHJvY2Vz cy0+YWRkV2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJveHkobV91c2VyQ29udGVudENvbnRyb2xs ZXIsIHBhcmFtZXRlcnMpOwpAQCAtODUzOSw2ICs4NTAzLDIxIEBAIHZvaWQgV2ViUGFnZVByb3h5 OjpzaW11bGF0ZURldmljZU9yaWVudGF0aW9uQ2hhbmdlKGRvdWJsZSBhbHBoYSwgZG91YmxlIGJl dGEsIGRvCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTaW11bGF0ZURl dmljZU9yaWVudGF0aW9uQ2hhbmdlKGFscGhhLCBiZXRhLCBnYW1tYSksIG1fcGFnZUlEKTsKIH0K IAorV2ViUGFnZVByb3h5OjpQYWdlUHJvY2Vzc092ZXJyaWRlOjpQYWdlUHJvY2Vzc092ZXJyaWRl KFdlYlBhZ2VQcm94eSYgcGFnZSwgV2ViUHJvY2Vzc1Byb3h5JiBuZXdQcm9jZXNzKQorICAgIDog bV9wYWdlKCZwYWdlKQorICAgICwgbV9wcmV2aW91c1Byb2Nlc3MocGFnZS5wcm9jZXNzKCkpCit7 CisgICAgcGFnZS5tX3Byb2Nlc3MgPSBuZXdQcm9jZXNzOworfQorCitXZWJQYWdlUHJveHk6OlBh Z2VQcm9jZXNzT3ZlcnJpZGU6OlBhZ2VQcm9jZXNzT3ZlcnJpZGUoUGFnZVByb2Nlc3NPdmVycmlk ZSYmKSA9IGRlZmF1bHQ7CisKK1dlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6flBh Z2VQcm9jZXNzT3ZlcnJpZGUoKQoreworICAgIGlmIChtX3BhZ2UpCisgICAgICAgIG1fcGFnZS0+ bV9wcm9jZXNzID0gV1RGTW92ZShtX3ByZXZpb3VzUHJvY2Vzcyk7Cit9CisKICNpZiBFTkFCTEUo REFUQV9ERVRFQ1RJT04pCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkZXRlY3REYXRhSW5BbGxGcmFt ZXMoV2ViQ29yZTo6RGF0YURldGVjdG9yVHlwZXMgdHlwZXMsIENvbXBsZXRpb25IYW5kbGVyPHZv aWQoY29uc3QgRGF0YURldGVjdGlvblJlc3VsdCYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBjZDgwMWI4MDhjNDZlNDUwZDhj ZGFkNDk3MDhmNDdmOGYwMTM3MDI5Li5jNjY2ZmRiNmZiMDRkNzc4YjIzYmViMTlmNjVhMTFhOWQ2 NWM0MmJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMjI1LDYg KzIyNSw3IEBAIGNsYXNzIE5hdGl2ZVdlYktleWJvYXJkRXZlbnQ7CiBjbGFzcyBOYXRpdmVXZWJN b3VzZUV2ZW50OwogY2xhc3MgTmF0aXZlV2ViV2hlZWxFdmVudDsKIGNsYXNzIFBhZ2VDbGllbnQ7 CitjbGFzcyBQcm92aXNpb25hbFBhZ2VQcm94eTsKIGNsYXNzIFJlbW90ZUxheWVyVHJlZUhvc3Q7 CiBjbGFzcyBSZW1vdGVMYXllclRyZWVTY3JvbGxpbmdQZXJmb3JtYW5jZURhdGE7CiBjbGFzcyBS ZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjsKQEAgLTQ1OCw4ICs0NTksNyBAQCBwdWJsaWM6CiAg ICAgQVBJOjpJY29uTG9hZGluZ0NsaWVudCYgaWNvbkxvYWRpbmdDbGllbnQoKSB7IHJldHVybiAq bV9pY29uTG9hZGluZ0NsaWVudDsgfQogICAgIHZvaWQgc2V0SWNvbkxvYWRpbmdDbGllbnQoc3Rk Ojp1bmlxdWVfcHRyPEFQSTo6SWNvbkxvYWRpbmdDbGllbnQ+JiYpOwogCi0gICAgZW51bSBjbGFz cyBJc1N3YXBGcm9tU3VzcGVuZGVkIHsgTm8sIFllcyB9OwotICAgIHZvaWQgaW5pdGlhbGl6ZVdl YlBhZ2UoSXNTd2FwRnJvbVN1c3BlbmRlZCA9IElzU3dhcEZyb21TdXNwZW5kZWQ6Ok5vKTsKKyAg ICB2b2lkIGluaXRpYWxpemVXZWJQYWdlKCk7CiAKICAgICBXZWFrUHRyPFNlY0tleVByb3h5U3Rv cmU+IHNlY0tleVByb3h5U3RvcmUoY29uc3QgV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVu Z2UmKTsKICAgICAgICAgCkBAIC0xMDI1LDYgKzEwMjUsMTkgQEAgcHVibGljOgogICAgIFdlYlBy b2Nlc3NQcm94eSYgcHJvY2VzcygpIHsgcmV0dXJuIG1fcHJvY2VzczsgfQogICAgIFByb2Nlc3NJ RCBwcm9jZXNzSWRlbnRpZmllcigpIGNvbnN0OwogCisgICAgY2xhc3MgUGFnZVByb2Nlc3NPdmVy cmlkZSB7CisgICAgcHVibGljOgorICAgICAgICBQYWdlUHJvY2Vzc092ZXJyaWRlKFdlYlBhZ2VQ cm94eSYsIFdlYlByb2Nlc3NQcm94eSYgbmV3UHJvY2Vzcyk7CisgICAgICAgIFBhZ2VQcm9jZXNz T3ZlcnJpZGUoUGFnZVByb2Nlc3NPdmVycmlkZSYmKTsKKyAgICAgICAgflBhZ2VQcm9jZXNzT3Zl cnJpZGUoKTsKKworICAgIHByaXZhdGU6CisgICAgICAgIFJlZlB0cjxXZWJQYWdlUHJveHk+IG1f cGFnZTsKKyAgICAgICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gbV9wcmV2aW91c1Byb2Nlc3M7Cisg ICAgfTsKKworICAgIFBhZ2VQcm9jZXNzT3ZlcnJpZGUgdGVtcG9yYXJpbHlPdmVycmlkZVByb2Nl c3MoV2ViUHJvY2Vzc1Byb3h5JiBuZXdQcm9jZXNzKSB7IHJldHVybiBQYWdlUHJvY2Vzc092ZXJy aWRlKCp0aGlzLCBuZXdQcm9jZXNzKTsgfQorCiAgICAgV2ViUHJlZmVyZW5jZXMmIHByZWZlcmVu Y2VzKCkgeyByZXR1cm4gbV9wcmVmZXJlbmNlczsgfQogICAgIHZvaWQgc2V0UHJlZmVyZW5jZXMo V2ViUHJlZmVyZW5jZXMmKTsKIApAQCAtMTQxNCw2ICsxNDI3LDIxIEBAIHB1YmxpYzoKICAgICBF ZGl0YWJsZUltYWdlQ29udHJvbGxlciYgZWRpdGFibGVJbWFnZUNvbnRyb2xsZXIoKSB7IHJldHVy biAqbV9lZGl0YWJsZUltYWdlQ29udHJvbGxlcjsgfQogI2VuZGlmCiAKKyAgICBQcm92aXNpb25h bFBhZ2VQcm94eSogcHJvdmlzaW9uYWxQYWdlUHJveHkoKSBjb25zdCB7IHJldHVybiBtX3Byb3Zp c2lvbmFsUGFnZS5nZXQoKTsgfQorICAgIHZvaWQgY29tbWl0UHJvdmlzaW9uYWxQYWdlKHVpbnQ2 NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlw ZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVMb2Fk VHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiwgYm9vbCBjb250YWluc1BsdWdp bkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhh c0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmKTsKKworICAgIHZvaWQgZGlkU3RhcnRQ cm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0 aW9uSUQsIFVSTCYmLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmKTsKKyAg ICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBj b25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVp bnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRS ZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBm cmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYm LCBjb25zdCBVc2VyRGF0YSYpOworCisgICAgdm9pZCBsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKEFQ STo6TmF2aWdhdGlvbiYsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYsIGNvbnN0IFN0cmluZyYg TUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwg QVBJOjpPYmplY3QqIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xv YWQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOworICAg IHZvaWQgbG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QmJiwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGlj eSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWlu Z0xvYWQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOwor CisgICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKKyAgICAvLyBJbXBsZW1lbnRlZCBpbiBnZW5l cmF0ZWQgV2ViUGFnZVByb3h5TWVzc2FnZVJlY2VpdmVyLmNwcAorICAgIHZvaWQgZGlkUmVjZWl2 ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgb3ZlcnJpZGU7CisgICAg dm9pZCBkaWRSZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVy Jiwgc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mKSBvdmVycmlkZTsKKwogcHJpdmF0ZToK ICAgICBXZWJQYWdlUHJveHkoUGFnZUNsaWVudCYsIFdlYlByb2Nlc3NQcm94eSYsIHVpbnQ2NF90 IHBhZ2VJRCwgUmVmPEFQSTo6UGFnZUNvbmZpZ3VyYXRpb24+JiYpOwogICAgIHZvaWQgcGxhdGZv cm1Jbml0aWFsaXplKCk7CkBAIC0xNDM4LDEyICsxNDY2LDYgQEAgcHJpdmF0ZToKIAogICAgIHZv aWQgc2V0VXNlckFnZW50KFN0cmluZyYmKTsKIAotICAgIC8vIElQQzo6TWVzc2FnZVJlY2VpdmVy Ci0gICAgLy8gSW1wbGVtZW50ZWQgaW4gZ2VuZXJhdGVkIFdlYlBhZ2VQcm94eU1lc3NhZ2VSZWNl aXZlci5jcHAKLSAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQ Qzo6RGVjb2RlciYpIG92ZXJyaWRlOwotICAgIHZvaWQgZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQ Qzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYsIHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29k ZXI+Jikgb3ZlcnJpZGU7Ci0KLQogICAgIC8vIElQQzo6TWVzc2FnZVNlbmRlcgogICAgIGJvb2wg c2VuZE1lc3NhZ2Uoc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4sIE9wdGlvblNldDxJUEM6 OlNlbmRPcHRpb24+KSBvdmVycmlkZTsKICAgICBJUEM6OkNvbm5lY3Rpb24qIG1lc3NhZ2VTZW5k ZXJDb25uZWN0aW9uKCkgb3ZlcnJpZGU7CkBAIC0xNDY1LDEyICsxNDg3LDkgQEAgcHJpdmF0ZToK ICAgICB2b2lkIGRpZENyZWF0ZVN1YmZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpOwogICAgIHZvaWQg ZGlkQ3JlYXRlV2luZG93KHVpbnQ2NF90IGZyYW1lSUQsIFdlYkNvcmU6Okdsb2JhbFdpbmRvd0lk ZW50aWZpZXImJik7CiAKLSAgICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUo dWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiwgVVJMJiYgdW5y ZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJEYXRhJik7Ci0gICAgdm9pZCBkaWRSZWNlaXZlU2VydmVy UmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50 NjRfdCBuYXZpZ2F0aW9uSUQsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBjb25zdCBVc2Vy RGF0YSYpOwogICAgIHZvaWQgd2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdEZvckZyYW1lKHVpbnQ2 NF90IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgdXJsLCBkb3VibGUgZGVsYXksIFdlYkNvcmU6Okxv Y2tCYWNrRm9yd2FyZExpc3QpOwogICAgIHZvaWQgZGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3RGb3JG cmFtZSh1aW50NjRfdCBmcmFtZUlEKTsKICAgICB2b2lkIGRpZENoYW5nZVByb3Zpc2lvbmFsVVJM Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJik7 Ci0gICAgdm9pZCBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJ RCwgY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2lu LCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNv bnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQg ZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRp b25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQ cm92aWRlciwgdWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNh dGVJbmZvJiwgYm9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpI YXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRh dGEmKTsKICAgICB2b2lkIGRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZy YW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2b2lk IGRpZEZpbmlzaExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0 aW9uSUQsIGNvbnN0IFVzZXJEYXRhJik7CkBAIC0xNTc0LDE4ICsxNTkzLDE1IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBzZXRDYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMoYm9vbCBj YW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMpIHsgbV9jYW5TaG9ydENpcmN1aXRI b3Jpem9udGFsV2hlZWxFdmVudHMgPSBjYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVu dHM7IH0KIAogICAgIHZvaWQgcmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsKLSAgICB2b2lkIHN3YXBU b1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiwgc3RkOjp1bmlxdWVfcHRyPFN1c3Bl bmRlZFBhZ2VQcm94eT4mJiwgSXNTd2FwRnJvbVN1c3BlbmRlZCk7CisgICAgdm9pZCBzd2FwVG9X ZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5n QXJlYVByb3h5PiYmLCBSZWZQdHI8V2ViRnJhbWVQcm94eT4mJiBtYWluRnJhbWUpOwogICAgIHZv aWQgZGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAoKTsKICAgICB2b2lkIGRpZFN1c3Bl bmRBZnRlclByb2Nlc3NTd2FwKCk7CiAKLSAgICB2b2lkIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJv Y2VzcyhJc1N3YXBGcm9tU3VzcGVuZGVkID0gSXNTd2FwRnJvbVN1c3BlbmRlZDo6Tm8pOworICAg IHZvaWQgZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKCk7CiAKICAgICBSZWZQdHI8QVBJOjpO YXZpZ2F0aW9uPiByZWF0dGFjaFRvV2ViUHJvY2Vzc0ZvclJlbG9hZCgpOwogICAgIFJlZlB0cjxB UEk6Ok5hdmlnYXRpb24+IHJlYXR0YWNoVG9XZWJQcm9jZXNzV2l0aEl0ZW0oV2ViQmFja0Zvcndh cmRMaXN0SXRlbSYpOwogCi0gICAgdm9pZCBsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2 aWdhdGlvbiYsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYsIGNvbnN0IFN0cmluZyYgTUlNRVR5 cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpP YmplY3QqIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIE9w dGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOwotICAgIHZvaWQg bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QmJiwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgQVBJ OjpPYmplY3QqIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQs IE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOwotCiAgICAg dm9pZCByZXF1ZXN0Tm90aWZpY2F0aW9uUGVybWlzc2lvbih1aW50NjRfdCBub3RpZmljYXRpb25J RCwgY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcpOwogICAgIHZvaWQgc2hvd05vdGlmaWNhdGlv bihjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIGJvZHksIGNvbnN0IFN0cmluZyYg aWNvblVSTCwgY29uc3QgU3RyaW5nJiB0YWcsIGNvbnN0IFN0cmluZyYgbGFuZywgV2ViQ29yZTo6 Tm90aWZpY2F0aW9uRGlyZWN0aW9uLCBjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZywgdWludDY0 X3Qgbm90aWZpY2F0aW9uSUQpOwogICAgIHZvaWQgY2FuY2VsTm90aWZpY2F0aW9uKHVpbnQ2NF90 IG5vdGlmaWNhdGlvbklEKTsKQEAgLTE5NTEsOCArMTk2Nyw2IEBAIHByaXZhdGU6CiAgICAgUmVm PFdlYnNpdGVEYXRhU3RvcmU+IG1fd2Vic2l0ZURhdGFTdG9yZTsKIAogICAgIFJlZlB0cjxXZWJG cmFtZVByb3h5PiBtX21haW5GcmFtZTsKLSAgICBGdW5jdGlvbjx2b2lkKCk+IG1fbWFpbkZyYW1l Q3JlYXRpb25IYW5kbGVyOwotICAgIEZ1bmN0aW9uPHZvaWQoY29uc3QgV2ViQ29yZTo6R2xvYmFs V2luZG93SWRlbnRpZmllciYpPiBtX21haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlcjsKIAog ICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5PiBtX2ZvY3VzZWRGcmFtZTsKICAgICBSZWZQdHI8V2Vi RnJhbWVQcm94eT4gbV9mcmFtZVNldExhcmdlc3RGcmFtZTsKQEAgLTIzMjIsNiArMjMzNiw4IEBA IHByaXZhdGU6CiAgICAgYm9vbCBtX25lZWRzRm9udEF0dHJpYnV0ZXMgeyBmYWxzZSB9OwogICAg IGJvb2wgbV9tYXlIYXZlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5zaW9uIHsgZmFsc2Ug fTsKIAorICAgIHN0ZDo6dW5pcXVlX3B0cjxQcm92aXNpb25hbFBhZ2VQcm94eT4gbV9wcm92aXNp b25hbFBhZ2U7CisKICNpZiBIQVZFKFBFTkNJTEtJVCkKICAgICBzdGQ6OnVuaXF1ZV9wdHI8RWRp dGFibGVJbWFnZUNvbnRyb2xsZXI+IG1fZWRpdGFibGVJbWFnZUNvbnRyb2xsZXI7CiAjZW5kaWYK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCmluZGV4IGRiMWZk NThiOTNkZmY1ODY1ZDEzZmM1NDFiNmU1ZDg3NDZlYjhlMGEuLjBhOTY5ZGZiZjQ2NWQ2ZjE5YTU1 OWJlNzAyZTMwZmM3OWVkMTczOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Byb3h5LmNwcApAQCAtMzQsNiArMzQsNyBAQAogI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNp bmNsdWRlICJQbHVnaW5JbmZvU3RvcmUuaCIKICNpbmNsdWRlICJQbHVnaW5Qcm9jZXNzTWFuYWdl ci5oIgorI2luY2x1ZGUgIlByb3Zpc2lvbmFsUGFnZVByb3h5LmgiCiAjaW5jbHVkZSAiVGV4dENo ZWNrZXIuaCIKICNpbmNsdWRlICJUZXh0Q2hlY2tlclN0YXRlLmgiCiAjaW5jbHVkZSAiVUlNZXNz YWdlUG9ydENoYW5uZWxQcm92aWRlci5oIgpAQCAtNDM2LDcgKzQzNyw3IEBAIFJlZjxXZWJQYWdl UHJveHk+IFdlYlByb2Nlc3NQcm94eTo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50JiBwYWdlQ2xp ZW50LCBSZWY8QVBJCiB2b2lkIFdlYlByb2Nlc3NQcm94eTo6YWRkRXhpc3RpbmdXZWJQYWdlKFdl YlBhZ2VQcm94eSYgd2ViUGFnZSwgdWludDY0X3QgcGFnZUlELCBCZWdpbnNVc2luZ0RhdGFTdG9y ZSBiZWdpbnNVc2luZ0RhdGFTdG9yZSkKIHsKICAgICBBU1NFUlQoIW1fcGFnZU1hcC5jb250YWlu cyhwYWdlSUQpKTsKLSAgICBBU1NFUlQoIWdsb2JhbFBhZ2VNYXAoKS5jb250YWlucyhwYWdlSUQp KTsKKyAgICBBU1NFUlQoIWdsb2JhbFBhZ2VNYXAoKS5jb250YWlucyhwYWdlSUQpLyogfHwgZ2xv YmFsUGFnZU1hcCgpLmdldChwYWdlSUQpID09ICZ3ZWJQYWdlKi8pOwogCiAgICAgaWYgKGJlZ2lu c1VzaW5nRGF0YVN0b3JlID09IEJlZ2luc1VzaW5nRGF0YVN0b3JlOjpZZXMpCiAgICAgICAgIG1f cHJvY2Vzc1Bvb2wtPnBhZ2VCZWdpblVzaW5nV2Vic2l0ZURhdGFTdG9yZSh3ZWJQYWdlKTsKQEAg LTU4NCw2ICs1ODUsMTUgQEAgYm9vbCBXZWJQcm9jZXNzUHJveHk6OmZ1bGxLZXlib2FyZEFjY2Vz c0VuYWJsZWQoKQogfQogI2VuZGlmCiAKK2Jvb2wgV2ViUHJvY2Vzc1Byb3h5OjpoYXNQcm92aXNp b25hbFBhZ2VXaXRoSUQodWludDY0X3QgcGFnZUlEKSBjb25zdAoreworICAgIGZvciAoYXV0byog cHJvdmlzaW9uYWxQYWdlIDogbV9wcm92aXNpb25hbFBhZ2VzKSB7CisgICAgICAgIGlmIChwcm92 aXNpb25hbFBhZ2UtPnBhZ2UoKS5wYWdlSUQoKSA9PSBwYWdlSUQpCisgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorCiB2b2lkIFdlYlByb2Nlc3NQ cm94eTo6dXBkYXRlQmFja0ZvcndhcmRJdGVtKGNvbnN0IEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0 ZSYgaXRlbVN0YXRlKQogewogICAgIGlmIChhdXRvKiBpdGVtID0gV2ViQmFja0ZvcndhcmRMaXN0 SXRlbTo6aXRlbUZvcklEKGl0ZW1TdGF0ZS5pZGVudGlmaWVyKSkgewpAQCAtNTkxLDcgKzYwMSw3 IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojp1cGRhdGVCYWNrRm9yd2FyZEl0ZW0oY29uc3QgQmFj a0ZvcndhcmRMaXN0SXRlbVN0YXRlJiBpdGVtCiAgICAgICAgIC8vIHRoZSBiYWNrL2ZvcndhcmQg aXRlbXMgcGFnZS4KICAgICAgICAgLy8gZS5nLiBUaGUgb2xkIHdlYiBwcm9jZXNzIGlzIG5hdmln YXRpbmcgdG8gYWJvdXQ6YmxhbmsgZm9yIHN1c3BlbnNpb24uCiAgICAgICAgIC8vIFdlIGlnbm9y ZSB0aGVzZSB1cGRhdGVzLgotICAgICAgICBpZiAobV9wYWdlTWFwLmNvbnRhaW5zKGl0ZW0tPnBh Z2VJRCgpKSkKKyAgICAgICAgaWYgKG1fcGFnZU1hcC5jb250YWlucyhpdGVtLT5wYWdlSUQoKSkg fHwgaGFzUHJvdmlzaW9uYWxQYWdlV2l0aElEKGl0ZW0tPnBhZ2VJRCgpKSkKICAgICAgICAgICAg IGl0ZW0tPnNldFBhZ2VTdGF0ZShpdGVtU3RhdGUucGFnZVN0YXRlKTsKICAgICB9CiB9CkBAIC04 NzMsNyArODgzLDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6Om1heWJlU2h1dERvd24oKQogCiBi b29sIFdlYlByb2Nlc3NQcm94eTo6Y2FuVGVybWluYXRlQ2hpbGRQcm9jZXNzKCkKIHsKLSAgICBp ZiAoIW1fcGFnZU1hcC5pc0VtcHR5KCkgfHwgbV9wcm9jZXNzUG9vbC0+aGFzU3VzcGVuZGVkUGFn ZUZvcigqdGhpcykpCisgICAgaWYgKCFtX3BhZ2VNYXAuaXNFbXB0eSgpIHx8IG1fcHJvY2Vzc1Bv b2wtPmhhc1N1c3BlbmRlZFBhZ2VGb3IoKnRoaXMpIHx8ICFtX3Byb3Zpc2lvbmFsUGFnZXMuaXNF bXB0eSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAoIW1fcHJvY2Vzc1Bvb2wt PnNob3VsZFRlcm1pbmF0ZSh0aGlzKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Byb3h5LmgKaW5kZXggNzVmNjVhN2Y3ZWIxYWNjODE5OTkxY2U0ZjlmNjk4NmM5NWI2MWZmMy4u NTA0MjYzMGRlMzcxZDg1YTgyODM3NDM0OGFhOTY5MTczOWM5Y2Q3MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKQEAgLTcwLDYgKzcwLDcgQEAgbmFtZXNwYWNl IFdlYktpdCB7CiBjbGFzcyBOZXR3b3JrUHJvY2Vzc1Byb3h5OwogY2xhc3MgT2JqQ09iamVjdEdy YXBoOwogY2xhc3MgUGFnZUNsaWVudDsKK2NsYXNzIFByb3Zpc2lvbmFsUGFnZVByb3h5OwogY2xh c3MgVXNlck1lZGlhQ2FwdHVyZU1hbmFnZXJQcm94eTsKIGNsYXNzIFZpc2l0ZWRMaW5rU3RvcmU7 CiBjbGFzcyBXZWJCYWNrRm9yd2FyZExpc3RJdGVtOwpAQCAtMTI0LDYgKzEyNSw5IEBAIHB1Ymxp YzoKICAgICBlbnVtIGNsYXNzIEVuZHNVc2luZ0RhdGFTdG9yZSA6IGJvb2wgeyBObywgWWVzIH07 CiAgICAgdm9pZCByZW1vdmVXZWJQYWdlKFdlYlBhZ2VQcm94eSYsIHVpbnQ2NF90IHBhZ2VJRCwg RW5kc1VzaW5nRGF0YVN0b3JlKTsKIAorICAgIHZvaWQgYWRkUHJvdmlzaW9uYWxQYWdlUHJveHko UHJvdmlzaW9uYWxQYWdlUHJveHkmIHByb3Zpc2lvbmFsUGFnZSkgeyBBU1NFUlQoIW1fcHJvdmlz aW9uYWxQYWdlcy5jb250YWlucygmcHJvdmlzaW9uYWxQYWdlKSk7IG1fcHJvdmlzaW9uYWxQYWdl cy5hZGQoJnByb3Zpc2lvbmFsUGFnZSk7IH0KKyAgICB2b2lkIHJlbW92ZVByb3Zpc2lvbmFsUGFn ZVByb3h5KFByb3Zpc2lvbmFsUGFnZVByb3h5JiBwcm92aXNpb25hbFBhZ2UpIHsgQVNTRVJUKG1f cHJvdmlzaW9uYWxQYWdlcy5jb250YWlucygmcHJvdmlzaW9uYWxQYWdlKSk7IG1fcHJvdmlzaW9u YWxQYWdlcy5yZW1vdmUoJnByb3Zpc2lvbmFsUGFnZSk7IH0KKwogICAgIHR5cGVuYW1lIFdlYlBh Z2VQcm94eU1hcDo6VmFsdWVzQ29uc3RJdGVyYXRvclJhbmdlIHBhZ2VzKCkgY29uc3QgeyByZXR1 cm4gbV9wYWdlTWFwLnZhbHVlcygpOyB9CiAgICAgdW5zaWduZWQgcGFnZUNvdW50KCkgY29uc3Qg eyByZXR1cm4gbV9wYWdlTWFwLnNpemUoKTsgfQogICAgIHVuc2lnbmVkIHZpc2libGVQYWdlQ291 bnQoKSBjb25zdCB7IHJldHVybiBtX3Zpc2libGVQYWdlQ291bnRlci52YWx1ZSgpOyB9CkBAIC0z MzAsNiArMzM0LDggQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgbG9nRGlhZ25vc3RpY01lc3NhZ2VG b3JSZXNvdXJjZUxpbWl0VGVybWluYXRpb24oY29uc3QgU3RyaW5nJiBsaW1pdEtleSk7CiAKKyAg ICBib29sIGhhc1Byb3Zpc2lvbmFsUGFnZVdpdGhJRCh1aW50NjRfdCBwYWdlSUQpIGNvbnN0Owor CiAgICAgZW51bSBjbGFzcyBJc1dlYWsgeyBObywgWWVzIH07CiAgICAgdGVtcGxhdGU8dHlwZW5h bWUgVD4gY2xhc3MgV2Vha09yU3Ryb25nUHRyIHsKICAgICBwdWJsaWM6CkBAIC0zNzMsNiArMzc5 LDcgQEAgcHJpdmF0ZToKIAogICAgIFdlYlBhZ2VQcm94eU1hcCBtX3BhZ2VNYXA7CiAgICAgV2Vi RnJhbWVQcm94eU1hcCBtX2ZyYW1lTWFwOworICAgIEhhc2hTZXQ8UHJvdmlzaW9uYWxQYWdlUHJv eHkqPiBtX3Byb3Zpc2lvbmFsUGFnZXM7CiAgICAgVXNlckluaXRpYXRlZEFjdGlvbk1hcCBtX3Vz ZXJJbml0aWF0ZWRBY3Rpb25NYXA7CiAKICAgICBIYXNoU2V0PFZpc2l0ZWRMaW5rU3RvcmUqPiBt X3Zpc2l0ZWRMaW5rU3RvcmVzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oKaW5kZXggNTA3ZWRiNzNlNzRjM2E1N2Y0ZWY0NzJmNWI1NDZjYjJkYjA2 N2FhOS4uNzA3OWIyNjk4ODVkZjY3YTBlODE5MDkxNmYwYmEwNTg2YmEzMTIwYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9T b3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0zMDk1LDYg KzMwOTUsOCBAQAogCQk0NjZCQzAzODFGQTI2NkM5MDAyRkE5QzEgLyogV2ViU1dDb250ZXh0TWFu YWdlckNvbm5lY3Rpb24uY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0g V2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQk0NjZCQzAzOTFGQTI2NkM5MDAyRkE5QzEgLyogV2ViU1dDb250ZXh0TWFuYWdlckNv bm5lY3Rpb24uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViU1dDb250ZXh0 TWFuYWdlckNvbm5lY3Rpb24uaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDY2QkMw M0ExRkEyNjZDOTAwMkZBOUMxIC8qIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLm1lc3Nh Z2VzLmluICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0 aW9uLm1lc3NhZ2VzLmluOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk0NjgzNTY5QTIx RTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQYWdlUHJveHkuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gUHJvdmlzaW9uYWxQYWdlUHJveHkuaDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKKwkJNDY4MzU2OUIyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFsUGFn ZVByb3h5LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFByb3Zpc2lv bmFsUGFnZVByb3h5LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDZBMkI2MDYx RTU2NzVBMjAwQzNERURBIC8qIEJhY2tncm91bmRQcm9jZXNzUmVzcG9uc2l2ZW5lc3NUaW1lci5j cHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBCYWNrZ3JvdW5kUHJvY2Vz c1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0 NkEyQjYwNzFFNTY3NUEyMDBDM0RFREEgLyogQmFja2dyb3VuZFByb2Nlc3NSZXNwb25zaXZlbmVz c1RpbWVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEJhY2tncm91bmRQcm9j ZXNzUmVzcG9uc2l2ZW5lc3NUaW1lci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0 NkRGMDYzOTFGMzkwNUU1MDAxOTgwQkIgLyogTmV0d29ya0NPUlNQcmVmbGlnaHRDaGVja2VyLmNw cCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IE5ldHdvcmtDT1JTUHJlZmxp Z2h0Q2hlY2tlci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC03MzUwLDYgKzcz NTIsOCBAQAogCQkJCTg2RTY3QTIyMTkwRjQxMTgwMDAwNEFCNyAvKiBQcm9jZXNzVGhyb3R0bGVy LmNwcCAqLywKIAkJCQk4NkU2N0EyMTE5MEY0MTE4MDAwMDRBQjcgLyogUHJvY2Vzc1Rocm90dGxl ci5oICovLAogCQkJCTgzMDQ4QUU1MUFDQTQ1REMwMDgyQzgzMiAvKiBQcm9jZXNzVGhyb3R0bGVy Q2xpZW50LmggKi8sCisJCQkJNDY4MzU2OUIyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFs UGFnZVByb3h5LmNwcCAqLywKKwkJCQk0NjgzNTY5QTIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlz aW9uYWxQYWdlUHJveHkuaCAqLywKIAkJCQlBNTVCQTgxQjFCQTI1QjFFMDA3Q0QzM0QgLyogUmVt b3RlV2ViSW5zcGVjdG9yUHJveHkuY3BwICovLAogCQkJCUE1NUJBODE5MUJBMjVCMUUwMDdDRDMz RCAvKiBSZW1vdGVXZWJJbnNwZWN0b3JQcm94eS5oICovLAogCQkJCUE1NUJBODFBMUJBMjVCMUUw MDdDRDMzRCAvKiBSZW1vdGVXZWJJbnNwZWN0b3JQcm94eS5tZXNzYWdlcy5pbiAqLywKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcCBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcAppbmRleCAwMDc0OWI0 NzdhMjRjZThjY2M4MjUwMWQ5NGUwOGI2MGVlMWE2MjYzLi5mZmVkMDBjODIwNmE5NGYwZTRmZmM3 ZmYzYThhOWRmZjg2MTNmYWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJGcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViRnJhbWUuY3BwCkBAIC0yNjMsOCArMjYzLDYgQEAgc3RhdGljIFdlYkNvcmU6OlBvbGlj eUFjdGlvbiB0b1BvbGljeUFjdGlvbihXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uKQogICAg ICAgICByZXR1cm4gV2ViQ29yZTo6UG9saWN5QWN0aW9uOjpJZ25vcmU7CiAgICAgY2FzZSBXZWJQ b2xpY3lBY3Rpb246OkRvd25sb2FkOgogICAgICAgICByZXR1cm4gV2ViQ29yZTo6UG9saWN5QWN0 aW9uOjpEb3dubG9hZDsKLSAgICBjYXNlIFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZDoKLSAgICAg ICAgYnJlYWs7CiAgICAgfQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIHJldHVybiBX ZWJDb3JlOjpQb2xpY3lBY3Rpb246Oklnbm9yZTsKQEAgLTI3MiwxMSArMjcwLDggQEAgc3RhdGlj IFdlYkNvcmU6OlBvbGljeUFjdGlvbiB0b1BvbGljeUFjdGlvbihXZWJQb2xpY3lBY3Rpb24gcG9s aWN5QWN0aW9uKQogCiB2b2lkIFdlYkZyYW1lOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24odWlu dDY0X3QgbGlzdGVuZXJJRCwgV2ViUG9saWN5QWN0aW9uIGFjdGlvbiwgdWludDY0X3QgbmF2aWdh dGlvbklELCBEb3dubG9hZElEIGRvd25sb2FkSUQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0Rh dGE+JiYgd2Vic2l0ZVBvbGljaWVzKQogewotICAgIGlmICghbV9jb3JlRnJhbWUgfHwgIW1fcG9s aWN5TGlzdGVuZXJJRCB8fCBsaXN0ZW5lcklEICE9IG1fcG9saWN5TGlzdGVuZXJJRCB8fCAhbV9w b2xpY3lGdW5jdGlvbikgewotICAgICAgICBpZiAoYWN0aW9uID09IFdlYlBvbGljeUFjdGlvbjo6 U3VzcGVuZCkKLSAgICAgICAgICAgIHBhZ2UoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjpEaWRGYWlsVG9TdXNwZW5kQWZ0ZXJQcm9jZXNzU3dhcCgpKTsKKyAgICBpZiAoIW1fY29yZUZy YW1lIHx8ICFtX3BvbGljeUxpc3RlbmVySUQgfHwgbGlzdGVuZXJJRCAhPSBtX3BvbGljeUxpc3Rl bmVySUQgfHwgIW1fcG9saWN5RnVuY3Rpb24pCiAgICAgICAgIHJldHVybjsKLSAgICB9CiAKICAg ICBGcmFtZVBvbGljeUZ1bmN0aW9uIGZ1bmN0aW9uID0gV1RGTW92ZShtX3BvbGljeUZ1bmN0aW9u KTsKICAgICBib29sIGZvck5hdmlnYXRpb25BY3Rpb24gPSBtX3BvbGljeUZ1bmN0aW9uRm9yTmF2 aWdhdGlvbkFjdGlvbiA9PSBGb3JOYXZpZ2F0aW9uQWN0aW9uOjpZZXM7CkBAIC0yOTIsMTYgKzI4 Nyw3IEBAIHZvaWQgV2ViRnJhbWU6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1aW50NjRfdCBs aXN0ZW5lcklELCBXZWJQb2xpY3lBY3Rpb24gYWN0CiAgICAgICAgICAgICBkb2N1bWVudExvYWRl ci0+c2V0TmF2aWdhdGlvbklEKG5hdmlnYXRpb25JRCk7CiAgICAgfQogCi0gICAgYm9vbCBzaG91 bGRTdXNwZW5kID0gZmFsc2U7Ci0gICAgaWYgKGFjdGlvbiA9PSBXZWJQb2xpY3lBY3Rpb246OlN1 c3BlbmQpIHsKLSAgICAgICAgc2hvdWxkU3VzcGVuZCA9IHRydWU7Ci0gICAgICAgIGFjdGlvbiA9 IFdlYlBvbGljeUFjdGlvbjo6SWdub3JlOwotICAgIH0KLQogICAgIGZ1bmN0aW9uKHRvUG9saWN5 QWN0aW9uKGFjdGlvbikpOwotCi0gICAgaWYgKHNob3VsZFN1c3BlbmQpCi0gICAgICAgIHBhZ2Uo KS0+c3VzcGVuZEZvclByb2Nlc3NTd2FwKCk7CiB9CiAKIHZvaWQgV2ViRnJhbWU6OnN0YXJ0RG93 bmxvYWQoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBTdHJp bmcmIHN1Z2dlc3RlZE5hbWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCmluZGV4IDI1ZDZkZmI3MWQwM2E0OTY2NDRjNjIzMmY2ZmI0MjE4ZmE4ZDJmYmIu LmU0OTE4MjQ3YTY3NjZkNjQyY2JkMzYyZmMzNTM1MTU2MDljNjc2ZWEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC00MDEsNyArNDAxLDcgQEAg V2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnMmJiBwYXJhbWV0ZXJzKQogICAgICwgbV9vdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSB7 IHBhcmFtZXRlcnMub3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgfQogICAgICwgbV9jcHVM aW1pdChwYXJhbWV0ZXJzLmNwdUxpbWl0KQogI2lmIFBMQVRGT1JNKE1BQykKLSAgICAsIG1fc2hv dWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uKHBhcmFtZXRlcnMuaXNTd2FwRnJv bVN1c3BlbmRlZCkKKyAgICAsIG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0 aW9uKHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkKICNlbmRpZgogewogICAgIEFTU0VSVChtX3Bh Z2VJRCk7CkBAIC00NzEsNyArNDcxLDcgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdl SUQsIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQogICAgIG1fZHJhd2lu Z0FyZWEtPnNldFBhaW50aW5nRW5hYmxlZChmYWxzZSk7CiAgICAgbV9kcmF3aW5nQXJlYS0+c2V0 U2hvdWxkU2NhbGVWaWV3VG9GaXREb2N1bWVudChwYXJhbWV0ZXJzLnNob3VsZFNjYWxlVmlld1Rv Rml0RG9jdW1lbnQpOwogCi0gICAgaWYgKHBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCkK KyAgICBpZiAocGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwKQogICAgICAgICBmcmVlemVMYXllclRy ZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29uOjpTd2FwRnJvbVN1c3BlbmRlZCk7CiAKICNpZiBFTkFC TEUoQVNZTkNfU0NST0xMSU5HKQpAQCAtNjk2LDcgKzY5Niw3IEBAIHZvaWQgV2ViUGFnZTo6cmVp bml0aWFsaXplV2ViUGFnZShXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykK ICAgICAgICAgbV9kcmF3aW5nQXJlYS0+dXBkYXRlUHJlZmVyZW5jZXMocGFyYW1ldGVycy5zdG9y ZSk7CiAgICAgICAgIG1fZHJhd2luZ0FyZWEtPnNldFBhaW50aW5nRW5hYmxlZCh0cnVlKTsKICNp ZiBQTEFURk9STShNQUMpCi0gICAgICAgIG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VU cmFuc2l0aW9uID0gcGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkOworICAgICAgICBtX3No b3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNpdGlvbiA9IHBhcmFtZXRlcnMuaXNQcm9j ZXNzU3dhcDsKICNlbmRpZgogICAgICAgICB1bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVl emVSZWFzb246OlBhZ2VTdXNwZW5kZWQpOwogICAgIH0KQEAgLTMwNTMsMTIgKzMwNTMsNiBAQCB2 b2lkIFdlYlBhZ2U6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1aW50NjRfdCBmcmFtZUlELCB1 aW50NjRfdCBsaXN0ZW5lcklELCBXZQogICAgIFdlYkZyYW1lKiBmcmFtZSA9IFdlYlByb2Nlc3M6 OnNpbmdsZXRvbigpLndlYkZyYW1lKGZyYW1lSUQpOwogICAgIGlmICghZnJhbWUpCiAgICAgICAg IHJldHVybjsKLSAgICBpZiAocG9saWN5QWN0aW9uID09IFdlYlBvbGljeUFjdGlvbjo6U3VzcGVu ZCkgewotICAgICAgICBBU1NFUlQoZnJhbWUgPT0gbV9tYWluRnJhbWUpOwotICAgICAgICBzZXRJ c1N1c3BlbmRlZCh0cnVlKTsKLQotICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5zZW5k UHJld2FybUluZm9ybWF0aW9uKG1haW5XZWJGcmFtZSgpLT51cmwoKSk7Ci0gICAgfQogICAgIGZy YW1lLT5kaWRSZWNlaXZlUG9saWN5RGVjaXNpb24obGlzdGVuZXJJRCwgcG9saWN5QWN0aW9uLCBu YXZpZ2F0aW9uSUQsIGRvd25sb2FkSUQsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiB9CiAK QEAgLTYzMTIsNiArNjMwNiwxMCBAQCB2b2lkIFdlYlBhZ2U6OnNldElzU3VzcGVuZGVkKGJvb2wg c3VzcGVuZGVkKQogICAgIGlmIChtX2lzU3VzcGVuZGVkKSB7CiAgICAgICAgIC8vIFVuZnJvemVu IG9uIGRyYXdpbmcgYXJlYSByZXNldC4KICAgICAgICAgZnJlZXplTGF5ZXJUcmVlKExheWVyVHJl ZUZyZWV6ZVJlYXNvbjo6UGFnZVN1c3BlbmRlZCk7CisKKyAgICAgICAgV2ViUHJvY2Vzczo6c2lu Z2xldG9uKCkuc2VuZFByZXdhcm1JbmZvcm1hdGlvbihtYWluV2ViRnJhbWUoKS0+dXJsKCkpOwor CisgICAgICAgIHN1c3BlbmRGb3JQcm9jZXNzU3dhcCgpOwogICAgIH0gZWxzZQogICAgICAgICBt X3Nob3VsZFJlc2V0RHJhd2luZ0FyZWFBZnRlclN1c3BlbmQgPSB0cnVlOwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Rp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCmluZGV4IDkxYWQ3MWFkZTFiN2RiNGY5ZGNl NjRkNGYzMzA0NjdiMjJiODMzY2MuLjgzYjY1OTkyNzBiNTFjN2JiMThlZmU3MzdhNTkyZTAyNTcx YTI4MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9U aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KQEAgLTk3 LDcgKzk3LDcgQEAgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OlRpbGVkQ29yZUFuaW1h dGlvbkRyYXdpbmdBcmVhKFdlYlBhZ2UmIHdlYlBhZ2UsIGMKICAgICB1cGRhdGVMYXllckhvc3Rp bmdDb250ZXh0KCk7CiAgICAgc2V0Q29sb3JTcGFjZShwYXJhbWV0ZXJzLmNvbG9yU3BhY2UpOwog Ci0gICAgaWYgKCFwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQpCisgICAgaWYgKCFwYXJh bWV0ZXJzLmlzUHJvY2Vzc1N3YXApCiAgICAgICAgIGF0dGFjaCgpOwogfQogCmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2Q1ZjhlOWRhNTVmMGRi MzEwOTVhMzM3MTk1ODQ1NzVhYjVlM2Y1Yi4uNTVhZTJkMjg0NGQxMzhhYjA4NTA5Zjg4MDBjNWJk ZWI0NTdmNjY2MiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTAxLTE0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBh cHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBWaWV3IGJlY29tZXMgYmxhbmsg YWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQorICAgICAgICA8cmRhcjovL3By b2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkIEFQSSB0ZXN0IGNvdmVyYWdlLgorCisgICAgICAgICogVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbToKKyAgICAgICAg KC1bUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSB3ZWJWaWV3OmRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25SZXNwb25zZTpkZWNpc2lvbkhhbmRsZXI6XSk6CisKIDIwMTktMDEtMTAgIENvbW1pdCBRdWV1 ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxp bmcgb3V0IHIyMzk4MjUuCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQppbmRleCBmMzVk OGJhYTM1M2YwNzAyNGZkNDBlN2Q1Mjc0NTNhNzQyMTBjM2JhLi5kNWJkNWVjNzc2YmQ1ZTE3YjBi ZDljOTQwMDJjY2I1NDQ3Y2E1ZDA4IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCisrKyBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0K QEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE3IEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNy0yMDE5IEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwg YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAt NzIsNiArNzIsNyBAQCBzdGF0aWMgYm9vbCBzZXJ2ZXJSZWRpcmVjdGVkOwogc3RhdGljIEhhc2hT ZXQ8cGlkX3Q+IHNlZW5QSURzOwogc3RhdGljIGJvb2wgd2lsbFBlcmZvcm1DbGllbnRSZWRpcmVj dDsKIHN0YXRpYyBib29sIGRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdDsKK3N0YXRpYyBib29sIHNo b3VsZENvbnZlcnRUb0Rvd25sb2FkOwogc3RhdGljIFJldGFpblB0cjxOU1VSTD4gY2xpZW50UmVk aXJlY3RTb3VyY2VVUkw7CiBzdGF0aWMgUmV0YWluUHRyPE5TVVJMPiBjbGllbnRSZWRpcmVjdERl c3RpbmF0aW9uVVJMOwogCkBAIC0xMjgsNiArMTI5LDExIEBAIC0gKHZvaWQpd2ViVmlldzooV0tX ZWJWaWV3ICopd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOihXS05hdmln YXRpCiAgICAgZGlkUmVwb25kVG9Qb2xpY3lEZWNpc2lvbkNhbGwgPSB0cnVlOwogfQogCistICh2 b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlv blJlc3BvbnNlOihXS05hdmlnYXRpb25SZXNwb25zZSAqKW5hdmlnYXRpb25SZXNwb25zZSBkZWNp c2lvbkhhbmRsZXI6KHZvaWQgKF4pKFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5KSlkZWNpc2lv bkhhbmRsZXIKK3sKKyAgICBkZWNpc2lvbkhhbmRsZXIoc2hvdWxkQ29udmVydFRvRG93bmxvYWQg PyBfV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3lCZWNvbWVEb3dubG9hZCA6IFdLTmF2aWdhdGlv blJlc3BvbnNlUG9saWN5QWxsb3cpOworfQorCiAtICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAq KXdlYlZpZXcgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxOYXZpZ2F0aW9u OihXS05hdmlnYXRpb24gKiluYXZpZ2F0aW9uCiB7CiAgICAgc2VlblBJRHMuYWRkKFt3ZWJWaWV3 IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0pOwpAQCAtMTQwNSw3ICsxNDExLDcgQEAgVEVTVChQcm9j ZXNzU3dhcCwgU2VydmVyUmVkaXJlY3QpCiAKICAgICBFWFBFQ1RfRkFMU0Uoc2VydmVyUmVkaXJl Y3RlZCk7CiAgICAgRVhQRUNUX0VRKDMsIG51bWJlck9mRGVjaWRlUG9saWN5Q2FsbHMpOwotICAg IEVYUEVDVF9FUSgydSwgc2VlblBJRHMuc2l6ZSgpKTsKKyAgICBFWFBFQ1RfRVEoM3UsIHNlZW5Q SURzLnNpemUoKSk7CiB9CiAKIFRFU1QoUHJvY2Vzc1N3YXAsIFNlcnZlclJlZGlyZWN0MikKQEAg LTE0NjcsNiArMTQ3MywxMDkgQEAgVEVTVChQcm9jZXNzU3dhcCwgU2VydmVyUmVkaXJlY3QyKQog ICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluMS5odG1sIiwg W1t3ZWJWaWV3IFVSTF0gYWJzb2x1dGVTdHJpbmddKTsKIH0KIAorc3RhdGljIGNvbnN0IGNoYXIq IGxpbmtUb1dlYktpdEJ5dGVzID0gUiJQU09OUkVTT1VSQ0UoCis8Ym9keT4KKyAgPGEgaWQ9InRl c3RMaW5rIiBocmVmPSJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIj5MaW5rPC9hPgor PC9ib2R5PgorKVBTT05SRVNPVVJDRSI7CisKK1RFU1QoUHJvY2Vzc1N3YXAsIFBvbGljeUNhbmNl bEFmdGVyU2VydmVyUmVkaXJlY3QpCit7CisgICAgYXV0byBwcm9jZXNzUG9vbENvbmZpZ3VyYXRp b24gPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7 CisgICAgcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NTd2Fwc09uTmF2aWdh dGlvbiA9IFlFUzsKKyAgICBhdXRvIHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bv b2wgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9u LmdldCgpXSk7CisKKyAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dL V2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlld0NvbmZpZ3Vy YXRpb24gc2V0UHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0KCldOworICAgIGF1dG8gaGFuZGxl ciA9IGFkb3B0TlMoW1tQU09OU2NoZW1lIGFsbG9jXSBpbml0XSk7CisgICAgW2hhbmRsZXIgYWRk TWFwcGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1sIiB0 b0RhdGE6bGlua1RvV2ViS2l0Qnl0ZXNdOworICAgIFtoYW5kbGVyIGFkZFJlZGlyZWN0RnJvbVVS TFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiIHRvVVJMU3RyaW5nOkAi cHNvbjovL3d3dy5hcHBsZS5jb20vaWdub3JlLmh0bWwiXTsKKyAgICBbd2ViVmlld0NvbmZpZ3Vy YXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAInBz b24iXTsKKworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGlu aXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3ZWJW aWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIGF1dG8gbmF2aWdhdGlvbkRlbGVnYXRlID0g YWRvcHROUyhbW1BTT05OYXZpZ2F0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2Vi VmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6bmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpXTsKKwor ICAgIG5hdmlnYXRpb25EZWxlZ2F0ZS0+ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiA9 IF4oV0tOYXZpZ2F0aW9uQWN0aW9uICphY3Rpb24sIHZvaWQgKF5kZWNpc2lvbkhhbmRsZXIpKFdL TmF2aWdhdGlvbkFjdGlvblBvbGljeSkpIHsKKyAgICAgICAgaWYgKFthY3Rpb24ucmVxdWVzdC5V UkwuYWJzb2x1dGVTdHJpbmcgaGFzU3VmZml4OkAiaWdub3JlLmh0bWwiXSkgeworICAgICAgICAg ICAgZGVjaXNpb25IYW5kbGVyKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeUNhbmNlbCk7CisgICAg ICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgZGVjaXNpb25IYW5kbGVyKFdLTmF2 aWdhdGlvbkFjdGlvblBvbGljeUFsbG93KTsKKyAgICB9OworCisgICAgTlNVUkxSZXF1ZXN0ICpy ZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmlu ZzpAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiXV07CisgICAgW3dlYlZpZXcgbG9h ZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUp OworICAgIGRvbmUgPSBmYWxzZTsKKyAgICBhdXRvIHBpZEFmdGVyRmlyc3RMb2FkID0gW3dlYlZp ZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKworICAgIEVYUEVDVF9FUSgxLCBudW1iZXJPZkRl Y2lkZVBvbGljeUNhbGxzKTsKKworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAInRl c3RMaW5rLmNsaWNrKCkiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07CisKKyAgICBUZXN0V2ViS2l0 QVBJOjpVdGlsOjpydW4oJmZhaWxlZCk7CisgICAgZmFpbGVkID0gZmFsc2U7CisgICAgZG9uZSA9 IGZhbHNlOworCisgICAgRVhQRUNUX0VRKDMsIG51bWJlck9mRGVjaWRlUG9saWN5Q2FsbHMpOwor CisgICAgLy8gV2Ugc2hvdWxkIHN0aWxsIGJlIG9uIGdvb2dsZS5jb20uCisgICAgRVhQRUNUX0VR KHBpZEFmdGVyRmlyc3RMb2FkLCBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKKyAg ICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1sIiwgW1t3 ZWJWaWV3IFVSTF0gYWJzb2x1dGVTdHJpbmddKTsKKworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2 YVNjcmlwdDpAInRlc3RMaW5rLmlubmVyVGV4dCIgY29tcGxldGlvbkhhbmRsZXI6IFsmXSAoaWQg aW5uZXJUZXh0LCBOU0Vycm9yICplcnJvcikgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJM aW5rIiwgaW5uZXJUZXh0KTsKKyAgICAgICAgZG9uZSA9IHRydWU7CisgICAgfV07CisgICAgVGVz dFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7Cit9CisKK1RF U1QoUHJvY2Vzc1N3YXAsIENyb3NzU2l0ZURvd25sb2FkKQoreworICAgIGF1dG8gcHJvY2Vzc1Bv b2xDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbiBh bGxvY10gaW5pdF0pOworICAgIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKS5wcm9jZXNz U3dhcHNPbk5hdmlnYXRpb24gPSBZRVM7CisgICAgYXV0byBwcm9jZXNzUG9vbCA9IGFkb3B0TlMo W1tXS1Byb2Nlc3NQb29sIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOnByb2Nlc3NQb29s Q29uZmlndXJhdGlvbi5nZXQoKV0pOworCisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9 IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dl YlZpZXdDb25maWd1cmF0aW9uIHNldFByb2Nlc3NQb29sOnByb2Nlc3NQb29sLmdldCgpXTsKKyAg ICBhdXRvIGhhbmRsZXIgPSBhZG9wdE5TKFtbUFNPTlNjaGVtZSBhbGxvY10gaW5pdF0pOworICAg IFtoYW5kbGVyIGFkZE1hcHBpbmdGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy5nb29nbGUuY29t L21haW4uaHRtbCIgdG9EYXRhOmxpbmtUb1dlYktpdEJ5dGVzXTsKKyAgICBbaGFuZGxlciBhZGRN YXBwaW5nRnJvbVVSTFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiIHRv RGF0YToiSGVsbG8iXTsKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFu ZGxlcjpoYW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAInBzb24iXTsKKworICAgIGF1dG8gd2Vi VmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVj dCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQo KV0pOworICAgIGF1dG8gbmF2aWdhdGlvbkRlbGVnYXRlID0gYWRvcHROUyhbW1BTT05OYXZpZ2F0 aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVs ZWdhdGU6bmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpXTsKKworICAgIE5TVVJMUmVxdWVzdCAqcmVx dWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6 QCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1sIl1dOworICAgIFt3ZWJWaWV3IGxvYWRS ZXF1ZXN0OnJlcXVlc3RdOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsK KyAgICBkb25lID0gZmFsc2U7CisgICAgYXV0byBwaWRBZnRlckZpcnN0TG9hZCA9IFt3ZWJWaWV3 IF93ZWJQcm9jZXNzSWRlbnRpZmllcl07CisKKyAgICBzaG91bGRDb252ZXJ0VG9Eb3dubG9hZCA9 IHRydWU7CisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAidGVzdExpbmsuY2xpY2so KSIgY29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1 bigmZmFpbGVkKTsKKyAgICBmYWlsZWQgPSBmYWxzZTsKKyAgICBzaG91bGRDb252ZXJ0VG9Eb3du bG9hZCA9IGZhbHNlOworCisgICAgLy8gV2Ugc2hvdWxkIHN0aWxsIGJlIG9uIGdvb2dsZS5jb20u CisgICAgRVhQRUNUX0VRKHBpZEFmdGVyRmlyc3RMb2FkLCBbd2ViVmlldyBfd2ViUHJvY2Vzc0lk ZW50aWZpZXJdKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lmdvb2dsZS5jb20v bWFpbi5odG1sIiwgW1t3ZWJWaWV3IFVSTF0gYWJzb2x1dGVTdHJpbmddKTsKKworICAgIFt3ZWJW aWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAInRlc3RMaW5rLmlubmVyVGV4dCIgY29tcGxldGlvbkhh bmRsZXI6IFsmXSAoaWQgaW5uZXJUZXh0LCBOU0Vycm9yICplcnJvcikgeworICAgICAgICBFWFBF Q1RfV0tfU1RSRVEoQCJMaW5rIiwgaW5uZXJUZXh0KTsKKyAgICAgICAgZG9uZSA9IHRydWU7Cisg ICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0g ZmFsc2U7Cit9CisKIGVudW0gY2xhc3MgU2hvdWxkRW5hYmxlUFNPTiB7IE5vLCBZZXMgfTsKIHN0 YXRpYyB2b2lkIHJ1bkNsaWVudFNpZGVSZWRpcmVjdFRlc3QoU2hvdWxkRW5hYmxlUFNPTiBzaG91 bGRFbmFibGVQU09OKQogewpAQCAtMjIzMiwxMiArMjM0MSwyNyBAQCBURVNUKFByb2Nlc3NTd2Fw LCBQYWdlU2hvd0hpZGUpCiAKICAgICBFWFBFQ1RfRVEoN3UsIFtyZWNlaXZlZE1lc3NhZ2VzIGNv dW50XSk7CiAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4u aHRtbCAtIHBhZ2VzaG93IE5PVCBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzBd KTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1s IC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7Ci0gICAg RVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNo b3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOwotICAgIEVYUEVD VF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBl cnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10pOwotICAgIEVYUEVDVF9XS19TVFJF UShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQi LCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29u Oi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2 ZWRNZXNzYWdlcy5nZXQoKVs1XSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5h cHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdl cy5nZXQoKVs2XSk7CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdIGhhc1ByZWZp eDpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiXSkgeworICAgICAgICBFWFBFQ1Rf V0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVy c2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7CisgICAgICAgIEVYUEVDVF9XS19T VFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93IE5PVCBwZXJz aXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsKKyAgICB9IGVsc2UgeworICAgICAg ICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdl c2hvdyBOT1QgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7CisgICAgICAg IEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdl aGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsKKyAgICB9CisgICAg aWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdIGhhc1ByZWZpeDpAInBzb246Ly93d3cuYXBw bGUuY29tL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93 d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVz c2FnZXMuZ2V0KClbM10pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lndl YmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdl cy5nZXQoKVs0XSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNv bjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2Vp dmVkTWVzc2FnZXMuZ2V0KClbM10pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8v d3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1l c3NhZ2VzLmdldCgpWzRdKTsKKyAgICB9CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgp WzVdIGhhc1ByZWZpeDpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiXSkgeworICAg ICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0g cGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7CisgICAgICAg IEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2Vz aG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAgIH0gZWxzZSB7 CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRt bCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0pOworICAg ICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0g cGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7CisgICAgfQog fQogCiAvLyBEaXNhYmxpbmcgdGhlIHBhZ2UgY2FjaGUgZXhwbGljaXRseSBpcyAoZm9yIHNvbWUg cmVhc29uKSBub3QgYXZhaWxhYmxlIG9uIGlPUy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0No YW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyMWY3Nzg4MjVkNzFiN2Y2MTY1 OTJjMjZjMjk3M2EwMWRmOTgwNGZjLi43Y2Q3OTY0YmViMTc2M2U0MTY4OWE0OTc5MzE5N2M2ODEy ZGEzNWQ2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMDEtMTQgIENocmlzIER1bWV6ICA8 Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZWdyZXNzaW9uKFBTT04pIFZpZXcgYmVjb21l cyBibGFuayBhZnRlciBjbGljayBhIGNyb3NzLXNpdGUgZG93bmxvYWQgbGluaworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzMzYxCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS80NzA5OTU3Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBTa2lwIHRlc3QgdGVzdGluZyB0aGUgY3Jvc3MtcHJvY2VzcyBET01X aW5kb3cgQVBJIGFzIEkgYnJva2UgaXQgd2l0aCB0aGlzIHBhdGNoLgorICAgICAgICBUaGUgZmVh dHVyZSBpcyBmYXIgZnJvbSByZWFkeSBhbmQgb2ZmIGJ5IGRlZmF1bHQgYW55d2F5LiBJIHdpbGwg YWRkIHN1cHBvcnQgYmFjaworICAgICAgICBpbiBhIGZvbGxvdy11cC4KKworICAgICAgICAqIHBs YXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDE5LTAxLTEwICBDb21taXQgUXVldWUg IDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5n IG91dCByMjM5ODI1LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RF eHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucwpp bmRleCA4ZTk1OWVkYWZmZDg5MjdlZjljMmFhYzMxNmU5ZTMxMDBjZDE0MGNiLi45ZDkwYmU4YjQ4 ZTU3Yzk2MGJjZGE2ODZjZTI0NDBkNzEzOGJiMGY2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93 azIvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNzMzLDggKzczMyw4IEBAIGh0dHAvdGVzdHMvcmVzb3Vy Y2VMb2FkU3RhdGlzdGljcy9yZW1vdmUtYmxvY2tpbmctaW4tcmVkaXJlY3QuaHRtbCBbIFNraXAg XQogaHR0cC90ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL25vbi1wcmV2YWxlbnQtcmVzb3Vy Y2VzLWNhbi1hY2Nlc3MtY29va2llcy1pbi1hLXRoaXJkLXBhcnR5LWNvbnRleHQuaHRtbCBbIFNr aXAgXQogaHR0cC90ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL2NhcC1jYWNoZS1tYXgtYWdl LWZvci1wcmV2YWxlbnQtcmVzb3VyY2UuaHRtbCBbIFNraXAgXQogCi0jIFByb2Nlc3Mgc3dhcHBp bmcgaXMgb25seSBpbXBsZW1lbnRlZCBvbiBXZWJLaXQyLgotaHR0cC90ZXN0cy9uYXZpZ2F0aW9u L3Byb2Nlc3Mtc3dhcC13aW5kb3ctb3Blbi5odG1sIFsgUGFzcyBdCisjIFRoaXMgZmVhdHVyZSBp cyBjdXJyZW50bHkgZGlzYWJsZWQgYnkgZGVmYXVsdCBhbmQgdW5maW5pc2hlZCA8cmRhcjovL3By b2JsZW0vMzg5MjUwNzc+LgoraHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3Byb2Nlc3Mtc3dhcC13aW5k b3ctb3Blbi5odG1sIFsgU2tpcCBdCiAKICMgQ3Jvc3MtT3JpZ2luLVJlc291cmNlLVBvbGljeSBy ZXNwb25zZSBoZWFkZXIgaXMgb25seSBpbXBsZW1lbnRlZCBpbiBXZWJLaXQyLgogaHR0cC93cHQv Y3Jvc3Mtb3JpZ2luLXJlc291cmNlLXBvbGljeS8gWyBQYXNzIF0K 359086 2019-01-14 15:41:37 -0800 2019-01-14 15:49:41 -0800 Patch bug-193361-20190114154136.patch text/plain 99868 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5ODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Y4YjllNWYwMzU1YTQ0 MzU0Yjc4OTdlMTRhNjE0MDQwYzVmNWY0MC4uMzUwNjUyYjM0MzQ2YWUyYTU3MTkyODM2ZTZlMWI2 NGQ0MjI2MjhlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAxLTE0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBW aWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAg ICAgIFdoZW4gcmVzdG9yaW5nIGZyb20gUGFnZUNhY2hlLCBtYWtlIHN1cmUgd2Ugbm90aWZ5IHRo ZSBjbGllbnQgdGhhdCB0aGUgbG9hZCB3YXMgY29tbWl0dGVkCisgICAgICAgICpiZWZvcmUqIHdl IHRlbGwgaXQgdGhhdCB0aGUgbmF2aWdhdGlvbiBpcyBjb21wbGV0ZS4gVGhpcyB3b3VsZCBjb25m dXNlIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eQorICAgICAgICBsb2dpYyBpbiB0aGUgVUlQcm9j ZXNzLgorCiAyMDE5LTAxLTEwICBKdXN0aW4gRmFuICA8anVzdGluX2ZhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW1dlYkdQVV0gQWRkIEJpbmRHcm91cEJpbmRpbmcsIEJpbmRHcm91cERlc2NyaXB0 b3IsIGFuZCBCdWZmZXJCaW5kaW5nIGRpY3Rpb25hcmllcyBmcm9tIEFQSQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAw ZjAwYWJjZDhkYzUyZGViNmE3ZWViMTc2NmU4YjAxNjIxMDY1OGU2Li42NTg2NThhOTA1MDY3NzA2 OTdmM2IyNThlYTUzZjA3NjZkOWZiMDE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwMSBAQAorMjAx OS0wMS0xNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFJlZ3Jl c3Npb24oUFNPTikgVmlldyBiZWNvbWVzIGJsYW5rIGFmdGVyIGNsaWNrIGEgY3Jvc3Mtc2l0ZSBk b3dubG9hZCBsaW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTMzNjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBpc3N1ZSB0cmFja2Vk IGJ5IHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczIGlzIHRoYXQgYSBwcm92aXNpb25hbCBsb2FkIG1h eSBnZXQKKyAgICAgICAgY2FuY2VsZWQgKG9yIGNvbnZlcnRlZCBpbnRvIGEgZG93bmxvYWQpICph ZnRlciogd2UndmUgZGVjaWRlZCB0byBwcm9jZXNzLXN3YXAuCisgICAgICAgIEluIHN1Y2ggY2Fz ZXMsIHRoZSB2aWV3IHNob3VsZCBrZWVwIGRpc3BsYXlpbmcgdGhlIGN1cnJlbnQgc2l0ZSBhbmQg aXQgc2hvdWxkCisgICAgICAgIHN0aWxsIGJlIGludGVyYWN0aXZlLiBIb3dldmVyLCB3aXRoIHRo ZSBwcmV2aW91cyBQU09OIG1vZGVsLCB0aGUgdmlldyAocGFnZVByb3h5KQorICAgICAgICB3b3Vs ZCBoYXZlIGFscmVhZHkgc3dhcHBlZCB0byB0aGUgbmV3IHByb2Nlc3MgYW5kIHdvdWxkIGVuZCB1 cCBkaXNwbGF5aW5nIHRoZQorICAgICAgICBpbml0aWFsbHkgZW1wdHkgZG9jdW1lbnQuCisKKyAg ICAgICAgVG8gYWRkcmVzcyB0aGUgaXNzdWUsIHRoaXMgcGF0Y2ggaW50cm9kdWNlcyB0aGUgY29u Y2VwdCBvZiBhIHByb3Zpc2lvbmFsIGxvYWQKKyAgICAgICAgaW4gdGhlIFVJUHJvY2VzcywgaGFu ZGxlZCBieSBhIFByb3Zpc2lvbmFsUGFnZVByb3h5IHdoaWNoIGhhcyBpdHMgb3duIHByaXZpc2lv bmFsCisgICAgICAgIHByb2Nlc3MuIFRoZSBXZWJQYWdlUHJveHkgb3ducyB0aGUgUHJvdmlzaW9u YWxQYWdlUHJveHkgYnV0IHdlIGRvIG5vdCBjb21taXQgdGhlCisgICAgICAgIHByb3Zpc2lvbmFs IHBhZ2UgdW50aWwgYWZ0ZXIgdGhlIGxvYWQgd2FzIGNvbW1pdHRlZCBpbiB0aGUgbmV3IHByb2Nl c3MuIFRoaXMgbWVhbnMKKyAgICAgICAgdGhhdCB0aGUgdmlldyAvIFdlYlBhZ2VQcm94eSBrZWVw cyB1c2luZyB0aGUgb2xkIHByb2Nlc3MgYW5kIGRpc3BsYXlzIHRoZSBjdXJyZW50CisgICAgICAg IGNvbnRlbnQgdW50aWwgYSBsb2FkIGhhcyBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHBh Z2UuIElmIG5vIGxvYWQgY29tbWl0cworICAgICAgICBpbiB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vz cyAoZS5nLiBiZWNhdXNlIHRoZSBsb2FkIGlzIGNhbmNlbGxlZCBvciBjb252ZXJ0ZWQgaW50bwor ICAgICAgICBhIGRvd25sb2FkKSwgdGhlbiB3ZSBtZXJlbHkgZGVzdHJveSB0aGUgUHJvdmlzaW9u YWxQYWdlUHJveHkgYW5kIHRlcm1pbmF0ZSBpdHMKKyAgICAgICAgcHJvY2Vzcywgd2l0aG91dCBp bXBhY3RpbmcgdGhlIFdlYlBhZ2VQcm94eS4KKworICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVyczo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVycy5oOgorICAgICAgICBSZW5hbWUgaXNTd2FwRnJvbVN1c3BlbmRlZCB0byBpc1Byb2Nl c3NTd2FwIGZvciBjbGFyaXR5IGFzIHdlIGFsd2F5cyB3YW50IHRvCisgICAgICAgIGRlbGF5IGF0 dGFjaGluZyB0aGUgZHJhd2luZyBhcmVhIGluIGNhc2Ugb2YgYSBwcm9jZXNzLXN3YXAsIG5vIG1h dHRlciB3aGF0CisgICAgICAgIG5vdyB0aGF0IHRoZSBwcmV2aW91cyBwcm9jZXNzIGlzIGtlcHQg YWxpdmUgdW50aWwgdGhlIHByb3Zpc2lvbmFsIGxvYWQgaXMKKyAgICAgICAgY29tbWl0dGVkIGlu IHRoZSBuZXcgcHJvY2Vzcy4KKworICAgICAgICAqIFNoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaDoK KyAgICAgICAgRHJvcCBTdXNwZW5kIHBvbGljeSBhY3Rpb24uIEF0IGRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb24gdGltZSwgaW4gY2FzZSBvZgorICAgICAgICBwcm9jZXNzLXN3YXAsIHdl IG5vdyB0ZWxsIHRoZSBwcmV2aW91cyBwcm9jZXNzIHRvIHNpbXBseSBpZ25vcmUgdGhlIGxvYWQs IHdoaWxlCisgICAgICAgIHdlIGNyZWF0ZSBhIFByb3Zpc2lvbmFsUGFnZVByb3h5IHRvIGRvIHRo ZSBuZXcgbG9hZCBpbiBhIG5ldyBwcm9jZXNzLgorICAgICAgICBTdXNwZW5zaW9uIG9mIHRoZSBw cmV2aW91cyBwYWdlIGluIHRoZSBvbGQgcHJvY2VzcywgaGFwcGVucyBsYXRlciwgd2hlbiBhIGxv YWQKKyAgICAgICAgaXMgYWN0dWFsbHkgY29tbWl0dGVkIGluIHRoZSBuZXcgcHJvY2Vzcy4KKwor ICAgICAgICAqIFNvdXJjZXMudHh0OgorICAgICAgICBBZGQgbmV3IFByb3Zpc2lvbmFsUGFnZVBy b3h5IGZpbGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToK KyAgICAgICAgKC1bV0tXZWJWaWV3IF9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0YXRl XSk6CisgICAgICAgIFdoZW4gY2FsbGluZyBfa2lsbFdlYkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRT dGF0ZSBvbiBhIFdLV2ViVmlldywga2lsbCBib3RoIHRoZSBjdXJyZW50CisgICAgICAgIHByb2Nl c3MgYW5kIHRoZSBwcm92aXNpb25hbCBvbmUsIHRvIG1haW50YWluIHByZXZpb3VzIGJlaGF2aW9y IGluIG91ciBBUEkgdGVzdHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUNsaWVudC5oOgor ICAgICAgICBUaW55IGJ1aWxkIGZpeC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Qcm92aXNpb25h bFBhZ2VQcm94eS5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQ cm94eTo6UHJvdmlzaW9uYWxQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25h bFBhZ2VQcm94eTo6flByb3Zpc2lvbmFsUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OnRha2VEcmF3aW5nQXJlYSk6CisgICAgICAgIChXZWJLaXQ6OlBy b3Zpc2lvbmFsUGFnZVByb3h5OjpjYW5jZWwpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25h bFBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6bG9hZERhdGFXaXRoTmF2aWdhdGlvbik6CisgICAgICAgIChXZWJLaXQ6 OlByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKToKKyAgICAg ICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0pOgor ICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1l KToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlz aW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94 eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJL aXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2FnZSk6CisgICAgICAgIChX ZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlU3luY01lc3NhZ2UpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oOiBBZGRlZC4KKyAgICAgICAg KFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OnBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpQ cm92aXNpb25hbFBhZ2VQcm94eTo6bWFpbkZyYW1lIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6 UHJvdmlzaW9uYWxQYWdlUHJveHk6OnByb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBjb25zdCk6CisgICAg ICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpuYXZpZ2F0aW9uSUQgY29uc3QpOgor ICAgICAgICBBZGQgbmV3IFByb3Zpc2lvbmFsUGFnZVByb3h5IGNsYXNzIHRvIHdyYXAgdGhlIHBy b3Zpc2lvbmFsIGxvYWQgaW4gdGhlIG5ldyBwcm9jZXNzCisgICAgICAgIGFmdGVyIGEgc3dhcC4g VGhlIHByb3Zpc2lvbmFsIHBhZ2UgaXMgb3duZWQgYnkgdGhlIFdlYlBhZ2VQcm94eSBhbmQgd2Ug b25seSBjb21taXQKKyAgICAgICAgdGhlIHByb3Zpc2lvbmFsIHBhZ2Ugd2hlbiB0aGUgbG9hZCBp cyBjb21taXR0ZWQuIFVudGlsIHRoZW4sIHRoZSBXZWJQYWdlUHJveHkga2VlcHMKKyAgICAgICAg dXNpbmcgdGhlIG9sZCBwcm9jZXNzIGFuZCBkaXNwbGF5aW5nIHRoZSBjdXJyZW50IGNvbnRlbnQu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5Ojp+U3VzcGVuZGVkUGFnZVByb3h5KToKKyAgICAg ICAgKFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5Ojp1bnN1c3BlbmQpOgorICAgICAgICAoV2Vi S2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6OmRpZFByb2Nlc3NSZXF1ZXN0VG9TdXNwZW5kKToKKyAg ICAgICAgVW5yZWdpc3RlciB0aGUgU3VzcGVuZGVkUGFnZVByb3h5IGFzIGFuIElQQyBtZXNzYWdl IHJlY2VpdmVyIGEgbGl0dGxlIGJpdCBlYXJsaWVyCisgICAgICAgIHdoZW4gd2UncmUgZ29pbmcg dG8gdW5zdXNwZW5kIGl0LiBUaGlzIGF2b2lkcyBjb25mbGljdGluZyB3aXRoIHRoZSBQcm92aXNp b25hbFBhZ2VQcm94eQorICAgICAgICB3aGljaCB0cmllcyB0byByZWdpc3RlciBpdHNlbGYgYXMg YW4gSVBDIG1lc3NhZ2UgcmVjZWl2ZXIgZm9yIHRoZSBzYW1lIHBhZ2VJRCB3aGVuCisgICAgICAg IGEgcHJvY2Vzcy1zd2FwIG9jY3VycyBhbmQgd2UncmUgc3dpdGNoaW5nIHRvIGEgc3VzcGVuZGVk IHBhZ2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkZyYW1lUHJveHk6OmlzTWFpbkZyYW1lIGNvbnN0KToKKyAgICAgICAgV2Vi RnJhbWVQcm94eTo6aXNNYWluRnJhbWUoKSByZWxpZXMgb24gY2hlY2tpbmcgdGhhdCB0aGUgZnJh bWUgaXMgdGhlIFdlYlBhZ2VQcm94eSdzIG1fbWFpbkZyYW1lLgorICAgICAgICBOb3cgdGhhdCB0 aGUgV2ViUGFnZVByb3h5IGNhbiBoYXZlIGEgUHJvdmlzaW9uYWxQYWdlUHJveHksIGFsc28gY2hl Y2sgaWYgaXQgaXMgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5J3MKKyAgICAgICAgbV9tYWluRnJh bWUgdG8gbWFpbnRhaW4gcHJldmlvdXMgYmVoYXZpb3IuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpzd2FwVG9X ZWJQcm9jZXNzKToKKyAgICAgICAgc3dhcFRvV2ViUHJvY2VzcygpIG5vIGxvbmdlciB0YWtlcyBj YXJlIG9mIHVuc3VzcGVuZGluZyB0aGUgU3VzcGVuZGVkUGFnZSBiZWNhdXNlIHdlIG5vdyBjYWxs IHN3YXBUb1dlYlByb2Nlc3MoKQorICAgICAgICBsYXRlciwgd2hlbiBhIGxvYWQgaXMgYWN0dWFs bHkgY29tbWl0dGVkIGluIHRoZSBwcm92aXNpb25hbCBwYWdlIC8gcHJvY2Vzcy4gc3dhcFRvV2Vi UHJvY2VzcygpIG5vdyBhbHNvIG5lZWRzCisgICAgICAgIHRvIGluaXRpYWxpemUgc29tZSBkYXRh IG1lbWJlcnMgc3VjaCBhcyB0aGUgZHJhd2luZyBhcmVhIGFuZCB0aGUgbWFpbiBmcmFtZSBhcyBp dCBpcyB0cmFuc2ZlcnJpbmcgdGhlbSBvdmVyIGZyb20KKyAgICAgICAgdGhlIFByb3Zpc2lvbmFs UGFnZVByb3h5IHdoaWNoIHN0YXJ0ZWQgdGhlIHByb3Zpc2lvbmFsIGxvYWQuCisKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MpOgorICAg ICAgICBXZSBubyBsb25nZXIgbmVlZCBJc1N3YXBGcm9tU3VzcGVuZGVkIHBhcmFtZXRlciBhcyB0 aGlzIGlzIGNhbGxlZCBsYXRlciBub3csIGFmdGVyIGEgbG9hZCBoYXMgYWN0dWFsbHkgYmVlbgor ICAgICAgICBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHByb2Nlc3MuCisKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSk6CisgICAgICAgIC0gV2Ug bm8gbG9uZ2VyIG5lZWQgSXNTd2FwRnJvbVN1c3BlbmRlZCBwYXJhbWV0ZXIgYXMgdGhpcyBpcyBj YWxsZWQgbGF0ZXIgbm93LCBhZnRlciBhIGxvYWQgaGFzIGFjdHVhbGx5IGJlZW4KKyAgICAgICAg ICBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHByb2Nlc3MuCisgICAgICAgIC0gQWxzbyBk byBub3QgcmUtaW5pdGlhbGl6ZSBtX2RyYXdpbmdBcmVhIGlmIGl0IGlzIGFscmVhZHkgc2V0IGJl Y2F1c2Ugc3dhcFRvV2ViUHJvY2VzcygpIG5vdyB0cmFuc2ZlcnMgdGhlCisgICAgICAgICAgZHJh d2luZyBhcmVhIGZyb20gdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGJlZm9yZSBjYWxsaW5nIHRo aXMgbWV0aG9kLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3RX aXRoTmF2aWdhdGlvbik6CisgICAgICAgIE9ubHkgY2FsbCBzZXRQZW5kaW5nQVBJUmVxdWVzdFVS TCgpIGluIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oKSBvbmx5IGlmIFNob3VsZFRyZWF0QXND b250aW51aW5nTG9hZCBpcyBub3QKKyAgICAgICAgWWVzLiBUaGlzIGF2b2lkcyBoaXR0aW5nIHNv bWUgYXNzZXJ0aW9ucyBhcyB0aGlzIHdhcyBhbHJlYWR5IGNhbGxlZCBkdXJpbmcgdGhlIGZpcnN0 IEFQSSBjYWxsIGlmIG5lZWRlZC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJl Y2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uKToKKyAgICAgICAgSW4gY2FzZSBvZiBwcm9j ZXNzIHN3YXAsIHRlbGwgdGhlIHByZXZpb3VzIHByb2Nlc3MgdG8gaWdub3JlIHRoZSBsb2FkIGlu c3RlYWQgb2Ygc3VzcGVuZGluZyBpdCByaWdodCBhd2F5LgorICAgICAgICBTdXNwZW5zaW9uIG5v dyBoYXBwZW5zIGxhdGVyLCBvbmx5IGlmIHdlIGVuZCB1cCBjb21taXR0aW5nIHRoZSBwcm92aXNp b25hbCBsb2FkIGluIHRoZSBuZXcgcHJvY2Vzcy4KKyAgICAgICAgQWxzbyBkaXNjYXJkIHRoZSBT dXNwZW5kZWRQYWdlIGlmIGl0IGZhaWxlZCB0byBzdXNwZW5kICh3ZSBvbmx5IHJldXNlIGl0cyBw cm9jZXNzIGluIHRoaXMgY2FzZSkuIFRoaXMgdXNlZAorICAgICAgICB0byBoYXBwZW4gYSBiaXQg bGF0ZXIgYnV0IGl0IGlzIGNsZWFyZXIgaWYgd2UgZG8gdGhpcyBhcyBlYXJseSBhcyBwb3NzaWJs ZSBJIHRoaW5rLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y29tbWl0UHJvdmlz aW9uYWxQYWdlKToKKyAgICAgICAgV2hlbiB0aGUgbG9hZCBpcyBjb21taXR0ZWQgaW4gdGhlIG5l dyBwcm9jZXNzLCB3ZSBjYWxsIFdlYlBhZ2VQcm94eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKCku IEl0IHRha2VzIGNhcmUgb2Y6CisgICAgICAgIC0gQWN0dWFsbHkgc3dhcHBpbmcgdGhlIFdlYlBh Z2VQcm94eSB0byB0aGUgbmV3IHByb2Nlc3MgYnkgY2FsbGluZyBwcm9jZXNzRGlkVGVybWluYXRl KCkgLyBzd2FwVG9XZWJQcm9jZXNzKCkuCisgICAgICAgIC0gU3VzcGVuZGluZyB0aGUgY3VycmVu dCBwYWdlLgorICAgICAgICAtIExldHRpbmcgdGhlIGNsaWVudCBrbm93IHRoZSBsb2FkIGlzIGNv bWl0dGVkCisgICAgICAgIC0gRGVzdHJveSB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkuCisgICAg ICAgIFRoaXMgd29yayB1c2VkIHRvIGhhcHBlbiBlYXJsaWVyIGluIGNvbnRpbnVlTmF2aWdhdGlv bkluTmV3UHJvY2VzcygpLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y29udGlu dWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKToKKyAgICAgICAgTW92ZWQgc29tZSBvZiB0aGUgbG9n aWMgdG8gY29tbWl0UHJvdmlzaW9uYWxQYWdlKCkuIFdlIG5vdyBtZXJlbHkgc3RhcnQgdGhlIGxv YWQgaW4gYSBuZXcgUHJvdmlzaW9uYWxQYWdlUHJveHksCisgICAgICAgIHdpdGhvdXQgYWN0dWFs bHkgaGF2aW5nIHRoZSBXZWJQYWdlUHJveHkgc3dpdGNoIHRvIHRoZSBuZXcgcHJvY2VzcyB5ZXQu CisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVdpbmRvdyk6CisgICAgICAg IERyb3Agc29tZSBjb2RlIHRoYXQgaXMgbm8gbG9uZ2VyIG5lZWRlZCwgbm93IHRoYXQgdGhlIFBy b3Zpc2lvbmFsUGFnZVByb3h5IHRha2VzIGNhcmUgb2YgdGhpcy4KKworICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmRpZERlc3Ryb3lOYXZpZ2F0aW9uKToKKyAgICAgICAgT24gcHJvY2Vz cy1zd2FwLCB3aGVuIHRlbGxpbmcgdGhlIHByZXZpb3VzIHByb2Nlc3MgdG8gaWdub3JlIHRoZSBs b2FkIGFuZCBzdGFydGluZyB0aGUgbmV3IGxvYWQgaW4gYSBuZXcKKyAgICAgICAgUHJvdmlzaW9u YWxQYWdlUHJveHksIHRoZSBwcmV2aW91cyBXZWJQYWdlIGF0dGVtcHRzIHRvIGRlc3Ryb3kgdGhl IG5hdmlnYXRpb24uIEluIHRoaXMgY2FzZSwgd2UgaWdub3JlCisgICAgICAgIHRoZSBjYWxsIHNp bmNlIHRoZSBuYXZpZ2F0aW9uIGlzIG1lcmVseSB0YWtlbiBvdmVyIGJ5IHRoZSBQcm92aXNpb25h bFBhZ2VQcm94eS4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICBNb3ZlZCBzb21lIFBTT04gbG9naWMgdG8g dGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGluc3RlYWQuCisKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICBXaGVu IGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSgpIGlzIGNhbGxlZCBmb3IgYSBQcm92aXNp b25hbFBhZ2VQcm94eSwgZGVzdHJveSBpdC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYyk6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UpOgorICAgICAgICBDYXB0 dXJlIHRoZSBwcm9jZXNzIGluIHRoZSBsYW1iZGEsIHRvIG1ha2Ugc3VyZSB3ZSBzZW5kIHRoZSBw b2xpY3kgZGVjaXNpb24gdG8gdGhlIHNhbWUgcHJvY2VzcyB0aGF0CisgICAgICAgIGFza2VkIGZv ciBpdCwgc28gYXMgdG8gbm90IGdldCBjb25mdXNlZCBieSBwcm9jZXNzIHN3YXBzLgorCisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVzZXRTdGF0ZSk6CisgICAgICAgIERyb3Agc29t ZSBjb2RlIHRoYXQgaXMgbm8gbG9uZ2VyIG5lZWRlZC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycyk6CisgICAgICAgIE1vdmUgdGhlIGhhc1JlZ2lz dGVyZWRTZXJ2aWNlV29ya2VycyBmbGFnIGluaXRpYWxpemF0aW9uIGZyb20gdGhlIGNhbGwgc2l0 ZSB0byBoZXJlIG5vdyB0aGF0IHdlIGhhdmUKKyAgICAgICAgbW9yZSB0aGFuIG9uZSBjYWxsIHNp dGUuIFRoaXMgd2FzIGp1c3Qgc29tZSBiYWQgZmFjdG9yaW5nLgorCisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6UGFnZVByb2Nlc3NPdmVycmlkZSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6flBh Z2VQcm9jZXNzT3ZlcnJpZGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp0ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2Vz cyk6CisgICAgICAgIEFkZCB1dGlsaXR5IGNsYXNzIHRvIHRlbXBvcmFyaWx5IG92ZXJyaWRlIHRo ZSBXZWJQYWdlUHJveHkncyBtX3Byb2Nlc3Mgd2l0aCB0aGUgcHJvdmlzaW9uYWwgb25lIHdoZW4K KyAgICAgICAgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGludGVyYWN0cyB3aXRoIHRoZSBXZWJQ YWdlUHJveHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQg Y29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OnVwZGF0ZUJhY2tGb3J3 YXJkSXRlbSk6CisgICAgICAgIEJlZm9yZSB1cGRhdGluZyBhIEJhY2tGb3J3YXJkTGlzdEl0ZW0s IHdlIG5vcm1hbGx5IG1ha2Ugc3VyZSB0aGUgcHJvY2VzcyBoYXMgYSBXZWJQYWdlUHJveHkgd2l0 aCB0aGUKKyAgICAgICAgaXRlbSdzIHBhZ2VJRC4gV2UgaGF2ZSB0byB0d2VhayB0aGUgbG9naWMg YmVjYXVzZSB0aGVyZSBtYXkgbm93IGJlIG5vIFdlYlBhZ2VQcm94eSB3aXRoIHRoaXMgcGFnZUlE CisgICAgICAgIGFzc29jaWF0ZWQgd2l0aCB0aGlzIHByb2Nlc3MgeWV0LCBiZWNhdXNlIGl0IGlz IHN0aWxsIGEgUHJvdmlzaW9uYWxQYWdlUHJveHkuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzc1Byb3h5OjpjYW5UZXJtaW5hdGVDaGlsZFByb2Nlc3MpOgorICAgICAgICBEbyBub3QgdGVy bWluYXRlIHRoZSBXZWJQcm9jZXNzIGlmIHRoZXJlIGFyZSBQcm92aXNpb25hbFBhZ2VQcm94eSBv YmplY3RzIHVzaW5nIGl0LgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5o OgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OmFkZFByb3Zpc2lvbmFsUGFnZVBy b3h5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpyZW1vdmVQcm92aXNpb25h bFBhZ2VQcm94eSk6CisKKyAgICAgICAgKiBXZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv ajoKKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHA6CisgICAgICAg IChXZWJLaXQ6OnRvUG9saWN5QWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWU6OmRp ZFJlY2VpdmVQb2xpY3lEZWNpc2lvbik6CisgICAgICAgIFN0b3AgZGVhbGluZyB3aXRoIFdlYlBv bGljeUFjdGlvbjo6U3VzcGVuZCBhcyBpdCBubyBsb25nZXIgZXhpc3RzLgorCisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl OjpyZWluaXRpYWxpemVXZWJQYWdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZGlkUmVj ZWl2ZVBvbGljeURlY2lzaW9uKToKKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRJc1N1 c3BlbmRlZCk6CisgICAgICAgIFN1c3BlbmQgdGhlIFBhZ2Ugd2hlbiBzZXRJc1N1c3BlbmRlZCh0 cnVlKSBpcyBjYWxsZWQsIG5vdyB0aGF0IHRoZXJlIGlzIG5vIGxvbmdlciBhIFdlYlBvbGljeUFj dGlvbjo6U3VzcGVuZC4KKyAgICAgICAgc2V0SXNTdXNwZW5kZWQodHJ1ZSkgSVBDIGlzIHNlbnQg d2hlbiB3ZSBhY3R1YWxseSBjb21taXQgdGhlIHByb3Zpc2lvbmFsIHBhZ2UuCisKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1t OgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6VGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEpOgorCiAyMDE5LTAxLTEwICBBbGV4IENocmlzdGVuc2Vu ICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjM5ODE1 KSBodHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9zZXJ2aWNld29ya2VyLXByaXZhdGUtYnJvd3Np bmcuaHR0cHMuaHRtbCB0ZXN0IHRpbWVzIG91dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5jcHAKaW5kZXggNGMyNmE2OTgxYjQ2NGRhNTkxNmYwNWViNzM1OTY2OTE1N2VlOWZmZS4uZWJm OTUwYmE2YzJlZDkxZjYyMzJiZDJiNWVmYjlmNzk1NTdhYjU4ZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0yMDMyLDExICsyMDMyLDExIEBAIHZvaWQgRnJhbWVMb2Fk ZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCgpCiAKICAgICAgICAgT3B0aW9uYWw8SGFzSW5zZWN1 cmVDb250ZW50PiBoYXNJbnNlY3VyZUNvbnRlbnQgPSBjYWNoZWRQYWdlLT5jYWNoZWRNYWluRnJh bWUoKS0+aGFzSW5zZWN1cmVDb250ZW50KCk7CiAKKyAgICAgICAgZGlzcGF0Y2hEaWRDb21taXRM b2FkKGhhc0luc2VjdXJlQ29udGVudCk7CisKICAgICAgICAgLy8gRklYTUU6IFRoaXMgQVBJIHNo b3VsZCBiZSB0dXJuZWQgYXJvdW5kIHNvIHRoYXQgd2UgZ3JvdW5kIENhY2hlZFBhZ2UgaW50byB0 aGUgUGFnZS4KICAgICAgICAgY2FjaGVkUGFnZS0+cmVzdG9yZSgqbV9mcmFtZS5wYWdlKCkpOwog Ci0gICAgICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOwotCiAj aWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICAgICAgbV9mcmFtZS5wYWdlKCktPmNocm9tZSgp LnNldERpc3BhdGNoVmlld3BvcnREYXRhRGlkQ2hhbmdlU3VwcHJlc3NlZChmYWxzZSk7CiAgICAg ICAgIG1fZnJhbWUucGFnZSgpLT5jaHJvbWUoKS5kaXNwYXRjaFZpZXdwb3J0UHJvcGVydGllc0Rp ZENoYW5nZShtX2ZyYW1lLnBhZ2UoKS0+dmlld3BvcnRBcmd1bWVudHMoKSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcCBiL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCmluZGV4IGNh MmRmNDBlZTFkZDJjYTM2ZjNhNDhhMDQ3NTdmOTdiZGJiNjM2NDcuLjZkMDdjMDNhZDhjOTI3ZTU0 NTNjNWZkYTk1OTY3MDlhNzcyNjFlMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVk L1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVk L1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCkBAIC03Myw3ICs3Myw3IEBAIHZvaWQgV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKElQQzo6RW5jb2RlciYgZW5jb2RlcikgY29u c3QKICAgICBlbmNvZGVyLmVuY29kZUVudW0obGF5ZXJIb3N0aW5nTW9kZSk7CiAgICAgZW5jb2Rl ciA8PCBtaW1lVHlwZXNXaXRoQ3VzdG9tQ29udGVudFByb3ZpZGVyczsKICAgICBlbmNvZGVyIDw8 IGNvbnRyb2xsZWRCeUF1dG9tYXRpb247Ci0gICAgZW5jb2RlciA8PCBpc1N3YXBGcm9tU3VzcGVu ZGVkOworICAgIGVuY29kZXIgPDwgaXNQcm9jZXNzU3dhcDsKIAogI2lmIFBMQVRGT1JNKE1BQykK ICAgICBlbmNvZGVyIDw8IGNvbG9yU3BhY2U7CkBAIC0yMjcsNyArMjI3LDcgQEAgT3B0aW9uYWw8 V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycz4gV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZGVj b2RlKElQQzo6RGVjb2QKICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKICAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuY29udHJvbGxlZEJ5QXV0b21hdGlvbikpCiAgICAgICAg IHJldHVybiBXVEY6Om51bGxvcHQ7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJz LmlzU3dhcEZyb21TdXNwZW5kZWQpKQorICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVy cy5pc1Byb2Nlc3NTd2FwKSkKICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAogI2lmIFBM QVRGT1JNKE1BQykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVh dGlvblBhcmFtZXRlcnMuaCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBh cmFtZXRlcnMuaAppbmRleCBhZTQzMjVjYmQ1ZjFlNTY3NjE2NTg2ZjVlOWZhNzNlZTViMzViOTM3 Li5iMzgyY2VlZGQ0NDlhOGQ5YTBmODY5NDczNWYyNmMwNTk1ZGRlY2Q4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgKKysrIGIvU291 cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCkBAIC0xMjksNyAr MTI5LDcgQEAgc3RydWN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMgewogICAgIFZlY3RvcjxT dHJpbmc+IG1pbWVUeXBlc1dpdGhDdXN0b21Db250ZW50UHJvdmlkZXJzOwogCiAgICAgYm9vbCBj b250cm9sbGVkQnlBdXRvbWF0aW9uOwotICAgIGJvb2wgaXNTd2FwRnJvbVN1c3BlbmRlZCB7IGZh bHNlIH07CisgICAgYm9vbCBpc1Byb2Nlc3NTd2FwIHsgZmFsc2UgfTsKIAogI2lmIFBMQVRGT1JN KE1BQykKICAgICBDb2xvclNwYWNlRGF0YSBjb2xvclNwYWNlOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9X ZWJQb2xpY3lBY3Rpb24uaAppbmRleCAxNDJhNTE4ZGYwOTdlNWVmMmZhMTgwNDg0ZTA5ZDAzMzNj MTA1YjgxLi4zOTcxNzk1YzQ2YTUxYjM4ODE4YzU1Yjc2ZDY1M2EzNGI1Mjg5ZTljIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaApAQCAtMjksMTEgKzI5LDExIEBACiAKIG5h bWVzcGFjZSBXZWJLaXQgewogCisvLyBGSVhNRTogUmVtb3ZlIHRoaXMgdHlwZSBhbmQgdXNlIFdl YkNvcmU6OlBvbGljeUFjdGlvbiBpbnN0ZWFkLgogZW51bSBjbGFzcyBXZWJQb2xpY3lBY3Rpb24g OiB1aW50OF90IHsKICAgICBVc2UsCiAgICAgRG93bmxvYWQsCi0gICAgSWdub3JlLAotICAgIFN1 c3BlbmQKKyAgICBJZ25vcmUKIH07CiAKIH0KQEAgLTQ1LDggKzQ1LDcgQEAgdGVtcGxhdGU8PiBz dHJ1Y3QgRW51bVRyYWl0czxXZWJLaXQ6OldlYlBvbGljeUFjdGlvbj4gewogICAgICAgICBXZWJL aXQ6OldlYlBvbGljeUFjdGlvbiwKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OlVz ZSwKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OkRvd25sb2FkLAotICAgICAgICBX ZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6SWdub3JlLAotICAgICAgICBXZWJLaXQ6OldlYlBvbGlj eUFjdGlvbjo6U3VzcGVuZAorICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6SWdub3Jl CiAgICAgPjsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQgYi9T b3VyY2UvV2ViS2l0L1NvdXJjZXMudHh0CmluZGV4IGEwYjZmNzI4NDYwNDFjMjYzYTU0NzY3MTBl YWM5ODdmZWQxZDE2MDQuLjhhZWNiODY0NzI1MDJkMDI3YTM0YWYzNzE5ZGQ4MjhiMDA3ZGIxMTYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQKKysrIGIvU291cmNlL1dlYktp dC9Tb3VyY2VzLnR4dApAQCAtMjMwLDYgKzIzMCw3IEBAIFVJUHJvY2Vzcy9JbnNwZWN0b3JUYXJn ZXRQcm94eS5jcHAKIFVJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmNwcAogVUlQcm9jZXNzL1Byb2Nl c3NBc3NlcnRpb24uY3BwCiBVSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5jcHAKK1VJUHJvY2Vz cy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAKIFVJUHJvY2Vzcy9SZW1vdGVXZWJJbnNwZWN0b3JQ cm94eS5jcHAKIFVJUHJvY2Vzcy9SZXNwb25zaXZlbmVzc1RpbWVyLmNwcAogVUlQcm9jZXNzL1Nl cnZpY2VXb3JrZXJQcm9jZXNzUHJveHkuY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCBjZjE5MTljOTNhNzM4NTMwNzU5ZTM3ZjMzZGJi MTBiNGNkMDQ1ODc4Li5jNzlmY2IyMTBiNTE1NTUwODhlMWRmODZmY2E5NjU1MWM2MzJhOGQ1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAg LTQ0LDYgKzQ0LDcgQEAKICNpbXBvcnQgIk5hdmlnYXRpb25TdGF0ZS5oIgogI2ltcG9ydCAiT2Jq Q09iamVjdEdyYXBoLmgiCiAjaW1wb3J0ICJQYWdlQ2xpZW50LmgiCisjaW1wb3J0ICJQcm92aXNp b25hbFBhZ2VQcm94eS5oIgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJUcmVlU2Nyb2xsaW5nUGVyZm9y bWFuY2VEYXRhLmgiCiAjaW1wb3J0ICJSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5oIgogI2lt cG9ydCAiUmVtb3RlT2JqZWN0UmVnaXN0cnkuaCIKQEAgLTQ2NjQsNiArNDY2NSwxMSBAQCAtICh2 b2lkKV9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0YXRlCiB7CiAgICAgUmVmPFdlYktp dDo6V2ViUHJvY2Vzc1Byb3h5PiBwcm90ZWN0ZWRQcm9jZXNzUHJveHkoX3BhZ2UtPnByb2Nlc3Mo KSk7CiAgICAgcHJvdGVjdGVkUHJvY2Vzc1Byb3h5LT5yZXF1ZXN0VGVybWluYXRpb24oV2ViS2l0 OjpQcm9jZXNzVGVybWluYXRpb25SZWFzb246OlJlcXVlc3RlZEJ5Q2xpZW50KTsKKworICAgIGlm IChhdXRvKiBwcm92aXNpb25hbFBhZ2VQcm94eSA9IF9wYWdlLT5wcm92aXNpb25hbFBhZ2VQcm94 eSgpKSB7CisgICAgICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nlc3NQcm94eT4gcHJvdGVjdGVkUHJv Y2Vzc1Byb3h5KHByb3Zpc2lvbmFsUGFnZVByb3h5LT5wcm9jZXNzKCkpOworICAgICAgICBwcm90 ZWN0ZWRQcm9jZXNzUHJveHktPnJlcXVlc3RUZXJtaW5hdGlvbihXZWJLaXQ6OlByb2Nlc3NUZXJt aW5hdGlvblJlYXNvbjo6UmVxdWVzdGVkQnlDbGllbnQpOworICAgIH0KIH0KIAogI2lmIFBMQVRG T1JNKE1BQykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VDbGllbnQu aCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAppbmRleCAwYjg1OGM0NmVl NDc0ZDY5NmRkYzNkNDM1YmQ1NGMxMzIzMDAzYzJkLi42ZjNkZjg0NTJiMzFlMzRlYjdmYWY0YWNk MGZkN2UwNDdlZTlmMDc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdl Q2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCkBAIC00 OCw2ICs0OCw3IEBACiAKIE9CSkNfQ0xBU1MgQ0FMYXllcjsKIE9CSkNfQ0xBU1MgTlNGaWxlV3Jh cHBlcjsKK09CSkNfQ0xBU1MgTlNNZW51OwogT0JKQ19DTEFTUyBOU1NldDsKIE9CSkNfQ0xBU1Mg V0tEcmF3aW5nVmlldzsKIE9CSkNfQ0xBU1MgX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uNzlmNTIzNjY1NjQ2ZWFiNDE4NjIyNjY5NzY4ZThlZDM4NmQyYjM5MwotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmNw cApAQCAtMCwwICsxLDMwNSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxOSBBcHBsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBz b3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24s IGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAq IGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRh aW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0 aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25z IGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBw cm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQ Uk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICog QU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9U IExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElU WSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVE LiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJF IExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVY RU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9U IExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJ Q0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVS UlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBX SEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVE SU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBP RiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNp bmNsdWRlICJQcm92aXNpb25hbFBhZ2VQcm94eS5oIgorCisjaW5jbHVkZSAiQVBJTmF2aWdhdGlv bi5oIgorI2luY2x1ZGUgIkRyYXdpbmdBcmVhUHJveHkuaCIKKyNpbmNsdWRlICJMb2dnaW5nLmgi CisjaW5jbHVkZSAiUGFnZUNsaWVudC5oIgorI2luY2x1ZGUgIldlYkJhY2tGb3J3YXJkTGlzdC5o IgorI2luY2x1ZGUgIldlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uaCIKKyNpbmNsdWRlICJXZWJFcnJv cnMuaCIKKyNpbmNsdWRlICJXZWJOYXZpZ2F0aW9uU3RhdGUuaCIKKyNpbmNsdWRlICJXZWJQYWdl TWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQYWdlUHJveHkuaCIKKyNpbmNsdWRlICJXZWJQYWdl UHJveHlNZXNzYWdlcy5oIgorI2luY2x1ZGUgIldlYlByb2Nlc3NNZXNzYWdlcy5oIgorI2luY2x1 ZGUgIldlYlByb2Nlc3NQcm94eS5oIgorI2luY2x1ZGUgPFdlYkNvcmUvU2hvdWxkVHJlYXRBc0Nv bnRpbnVpbmdMb2FkLmg+CisKK25hbWVzcGFjZSBXZWJLaXQgeworCisjZGVmaW5lIFJFTEVBU0Vf TE9HX0lGX0FMTE9XRUQoY2hhbm5lbCwgZm10LCAuLi4pIFJFTEVBU0VfTE9HX0lGKG1fcGFnZS5p c0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQoKSwgY2hhbm5lbCwgIiVwIC0gUHJvdmlzaW9uYWxQYWdl UHJveHk6OiIgZm10LCB0aGlzLCAjI19fVkFfQVJHU19fKQorCitQcm92aXNpb25hbFBhZ2VQcm94 eTo6UHJvdmlzaW9uYWxQYWdlUHJveHkoV2ViUGFnZVByb3h5JiBwYWdlLCBSZWY8V2ViUHJvY2Vz c1Byb3h5PiYmIHByb2Nlc3MsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+IHN1 c3BlbmRlZFBhZ2UsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgYm9vbCBpc1NlcnZlclJlZGlyZWN0 LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFByb2Nlc3NTd2FwUmVx dWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCkKKyAgICA6IG1fcGFn ZShwYWdlKQorICAgICwgbV9wcm9jZXNzKFdURk1vdmUocHJvY2VzcykpCisgICAgLCBtX25hdmln YXRpb25JRChuYXZpZ2F0aW9uSUQpCisgICAgLCBtX2lzU2VydmVyUmVkaXJlY3QoaXNTZXJ2ZXJS ZWRpcmVjdCkKKyAgICAsIG1fcmVxdWVzdChyZXF1ZXN0KQorICAgICwgbV9wcm9jZXNzU3dhcFJl cXVlc3RlZEJ5Q2xpZW50KHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpCisjaWYgUExBVEZP Uk0oSU9TX0ZBTUlMWSkKKyAgICAsIG1fc3VzcGVuc2lvblRva2VuKG1fcHJvY2Vzcy0+dGhyb3R0 bGVyKCkuYmFja2dyb3VuZEFjdGl2aXR5VG9rZW4oKSkKKyNlbmRpZgoreworICAgIG1fcHJvY2Vz cy0+YWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNl aXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpLCAqdGhpcyk7CisgICAgbV9wcm9jZXNzLT5hZGRQ cm92aXNpb25hbFBhZ2VQcm94eSgqdGhpcyk7CisKKyAgICAvLyBJZiB3ZSBhcmUgcmVhdHRhY2hp bmcgdG8gYSBTdXNwZW5kZWRQYWdlLCB0aGVuIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdlIGFscmVh ZHkgZXhpc3RzIGFuZAorICAgIC8vIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKCkg d2lsbCBub3QgYmUgY2FsbGVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUuIEluIHN1Y2gKKyAg ICAvLyBjYXNlLCB3ZSBuZWVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUgdG8gcmVmbGVjdCB0 aGUgZmFjdCB0aGUgdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UKKyAgICAvLyBhbHJlYWR5IGV4aXN0 cyBhbmQgYWxyZWFkeSBoYXMgYSBtYWluIGZyYW1lLgorICAgIGlmIChzdXNwZW5kZWRQYWdlKSB7 CisgICAgICAgIEFTU0VSVCgmc3VzcGVuZGVkUGFnZS0+cHJvY2VzcygpID09IG1fcHJvY2Vzcy5w dHIoKSk7CisgICAgICAgIHN1c3BlbmRlZFBhZ2UtPnVuc3VzcGVuZCgpOworICAgICAgICBtX21h aW5GcmFtZSA9IFdlYkZyYW1lUHJveHk6OmNyZWF0ZShtX3BhZ2UsIHN1c3BlbmRlZFBhZ2UtPm1h aW5GcmFtZUlEKCkpOworICAgICAgICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChzdXNwZW5kZWRQ YWdlLT5tYWluRnJhbWVJRCgpLCAqbV9tYWluRnJhbWUpOworICAgIH0KKworICAgIGluaXRpYWxp emVXZWJQYWdlKCk7Cit9CisKK1Byb3Zpc2lvbmFsUGFnZVByb3h5Ojp+UHJvdmlzaW9uYWxQYWdl UHJveHkoKQoreworICAgIG1fcHJvY2Vzcy0+cmVtb3ZlUHJvdmlzaW9uYWxQYWdlUHJveHkoKnRo aXMpOworCisgICAgaWYgKG1fd2FzQ29tbWl0dGVkKQorICAgICAgICByZXR1cm47CisKKyAgICBt X3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5Ojpt ZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgbV9wcm9jZXNzLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpDbG9zZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAg aWYgKG1fZHJhd2luZ0FyZWEpIHsKKyAgICAgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0g bV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgICAgIG1f ZHJhd2luZ0FyZWEgPSBudWxscHRyOworICAgIH0KKworICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNw YXRjaChbcHJvY2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCldIHsKKyAgICAgICAgcHJvY2Vzcy0+ bWF5YmVTaHV0RG93bigpOworICAgIH0pOworfQorCitzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0Fy ZWFQcm94eT4gUHJvdmlzaW9uYWxQYWdlUHJveHk6OnRha2VEcmF3aW5nQXJlYSgpCit7CisgICAg cmV0dXJuIFdURk1vdmUobV9kcmF3aW5nQXJlYSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdl UHJveHk6OmNhbmNlbCgpCit7CisgICAgLy8gSWYgdGhlIHByb3Zpc2lvbmFsIGxvYWQgc3RhcnRl ZCwgdGhlbiBpbmRpY2F0ZSB0aGF0IGl0IGZhaWxlZCBkdWUgdG8gY2FuY2VsbGF0aW9uIGJ5IGNh bGxpbmcgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKCkuCisgICAgaWYgKG1fcHJvdmlz aW9uYWxMb2FkVVJMLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJjYW5jZWw6IFNpbXVsYXRpbmcgYSBkaWRG YWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUgZm9yIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wYWdl LnBhZ2VJRCgpKTsKKyAgICBBU1NFUlQobV9tYWluRnJhbWUpOworICAgIGF1dG8gZXJyb3IgPSBX ZWJLaXQ6OmNhbmNlbGxlZEVycm9yKG1fcmVxdWVzdCk7CisgICAgZXJyb3Iuc2V0VHlwZShXZWJD b3JlOjpSZXNvdXJjZUVycm9yOjpUeXBlOjpDYW5jZWxsYXRpb24pOworICAgIGRpZEZhaWxQcm92 aXNpb25hbExvYWRGb3JGcmFtZShtX21haW5GcmFtZS0+ZnJhbWVJRCgpLCB7IH0sIG1fbmF2aWdh dGlvbklELCBtX3Byb3Zpc2lvbmFsTG9hZFVSTCwgZXJyb3IsIFVzZXJEYXRhIHsgfSk7IC8vIFdp bGwgZGVsZXRlIHx0aGlzfC4KK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6cHJvY2Vz c0RpZEZpbmlzaExhdW5jaGluZygpCit7CisgICAgZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFm dGVyUHJvY2Vzc0xhdW5jaCgpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpmaW5p c2hJbml0aWFsaXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNoKCkKK3sKKyAgICBBU1NFUlQo bV9wcm9jZXNzLT5zdGF0ZSgpID09IFdlYlByb2Nlc3NQcm94eTo6U3RhdGU6OlJ1bm5pbmcpOwor CisgICAgLy8gRklYTUU6IFRoZSBXZWJQYWdlUHJveHkgZGVsYXlzIGFkZGluZyB0aGUgdmlzaXRl ZCBsaW5rIHN0b3JlIHVudGlsIGFmdGVyIHRoZSBwcm9jZXNzIGhhcyBsYXVuY2hlZAorICAgIC8v IHNvIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eSBkb2VzIHRoZSBzYW1lLiBIb3dldmVyLCBkbyB3 ZSByZWFsbHkgbmVlZCB0bz8KKyAgICBtX3Byb2Nlc3MtPmFkZFZpc2l0ZWRMaW5rU3RvcmUobV9w YWdlLnZpc2l0ZWRMaW5rU3RvcmUoKSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6 OmluaXRpYWxpemVXZWJQYWdlKCkKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBt X3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBtX2RyYXdp bmdBcmVhID0gbV9wYWdlLnBhZ2VDbGllbnQoKS5jcmVhdGVEcmF3aW5nQXJlYVByb3h5KCk7CisK KyAgICBhdXRvIHBhcmFtZXRlcnMgPSBtX3BhZ2UuY3JlYXRpb25QYXJhbWV0ZXJzKCk7CisgICAg cGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwID0gdHJ1ZTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlByb2Nlc3M6OkNyZWF0ZVdlYlBhZ2UobV9wYWdlLnBhZ2VJRCgpLCBwYXJhbWV0 ZXJzKSwgMCk7CisKKyAgICBpZiAobV9wcm9jZXNzLT5zdGF0ZSgpID09IFdlYlByb2Nlc3NQcm94 eTo6U3RhdGU6OlJ1bm5pbmcpCisgICAgICAgIGZpbmlzaEluaXRpYWxpemluZ1dlYlBhZ2VBZnRl clByb2Nlc3NMYXVuY2goKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6bG9hZERh dGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIGNvbnN0IElQQzo6 RGF0YVJlZmVyZW5jZSYgZGF0YSwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5n JiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEs IE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQoreworICAg IGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJv Y2VzcyhtX3Byb2Nlc3MpOworICAgIG1fcGFnZS5sb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKG5hdmln YXRpb24sIGRhdGEsIE1JTUVUeXBlLCBlbmNvZGluZywgYmFzZVVSTCwgdXNlckRhdGEsIFdlYkNv cmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNpdGVQb2xp Y2llcykpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhO YXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0JiYgcmVxdWVzdCwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSBz aG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIE9wdGlv bmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQoreworICAgIGF1dG8g cGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2Vzcyht X3Byb2Nlc3MpOworICAgIG1fcGFnZS5sb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRp b24sIFdURk1vdmUocmVxdWVzdCksIHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIHVzZXJE YXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3 ZWJzaXRlUG9saWNpZXMpKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6Z29Ub0Jh Y2tGb3J3YXJkSXRlbShBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0mIGl0ZW0sIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBv bGljaWVzKQoreworICAgIGF1dG8gaXRlbVN0YXRlcyA9IG1fcGFnZS5iYWNrRm9yd2FyZExpc3Qo KS5maWx0ZXJlZEl0ZW1TdGF0ZXMoW3RoaXMsIHRhcmdldEl0ZW0gPSAmaXRlbV0oYXV0byYgaXRl bSkgeworICAgICAgICBpZiAoYXV0byogcGFnZSA9IGl0ZW0uc3VzcGVuZGVkUGFnZSgpKSB7Cisg ICAgICAgICAgICBpZiAoJnBhZ2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpCisgICAg ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CisgICAgICAgIHJldHVybiAmaXRl bSAhPSB0YXJnZXRJdGVtOworICAgIH0pOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6VXBkYXRlQmFja0ZvcndhcmRMaXN0Rm9yUmVhdHRhY2goV1RGTW92ZShpdGVtU3Rh dGVzKSksIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtKG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIGl0 ZW0uaXRlbUlEKCksICpuYXZpZ2F0aW9uLmJhY2tGb3J3YXJkRnJhbWVMb2FkVHlwZSgpLCBXZWJD b3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9s aWNpZXMpKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKyAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNz VGltZXIoKS5zdGFydCgpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVh dGVNYWluRnJhbWUodWludDY0X3QgZnJhbWVJRCkKK3sKKyAgICBSRUxFQVNFX0xPR19JRl9BTExP V0VEKFByb2Nlc3NTd2FwcGluZywgImRpZENyZWF0ZU1haW5GcmFtZTogcGFnZUlEID0gJSIgUFJJ dTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSwgZnJhbWVJRCk7Cisg ICAgQVNTRVJUKCFtX21haW5GcmFtZSk7CisKKyAgICBtX21haW5GcmFtZSA9IFdlYkZyYW1lUHJv eHk6OmNyZWF0ZShtX3BhZ2UsIGZyYW1lSUQpOworCisgICAgLy8gQWRkIHRoZSBmcmFtZSB0byB0 aGUgcHJvY2VzcyB3aWRlIG1hcC4KKyAgICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChmcmFtZUlE LCAqbV9tYWluRnJhbWUpOworCisgICAgLy8gVGhpcyBuYXZpZ2F0aW9uIHdhcyBkZXN0cm95ZWQg c28gbm8gbmVlZCB0byBub3RpZnkgb2YgcmVkaXJlY3QuCisgICAgaWYgKCFtX3BhZ2UubmF2aWdh dGlvblN0YXRlKCkuaGFzTmF2aWdhdGlvbihtX25hdmlnYXRpb25JRCkpCisgICAgICAgIHJldHVy bjsKKworICAgIC8vIFJlc3RvcmUgdGhlIG1haW4gZnJhbWUncyBjb21taXR0ZWQgVVJMIGFzIHNv bWUgY2xpZW50cyBtYXkgcmVseSBvbiBpdCB1bnRpbCB0aGUgbmV4dCBsb2FkIGlzIGNvbW1pdHRl ZC4KKyAgICBpZiAoYXV0byogbWFpbkZyYW1lID0gbV9wYWdlLm1haW5GcmFtZSgpKQorICAgICAg ICBtX21haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5zZXRVUkwobWFpbkZyYW1lLT5mcmFtZUxv YWRTdGF0ZSgpLnVybCgpKTsKKworICAgIC8vIE5vcm1hbGx5LCBub3RpZmljYXRpb24gb2YgYSBz ZXJ2ZXIgcmVkaXJlY3QgY29tZXMgZnJvbSB0aGUgV2ViQ29udGVudCBwcm9jZXNzLgorICAgIC8v IElmIHdlIGFyZSBwcm9jZXNzIHN3YXBwaW5nIGluIHJlc3BvbnNlIHRvIGEgc2VydmVyIHJlZGly ZWN0IHRoZW4gdGhhdCBub3RpZmljYXRpb24gd2lsbCBub3QgY29tZSBmcm9tIHRoZSBuZXcgV2Vi Q29udGVudCBwcm9jZXNzLgorICAgIC8vIEluIHRoaXMgY2FzZSB3ZSBoYXZlIHRoZSBVSVByb2Nl c3Mgc3ludGhlc2l6ZSB0aGUgcmVkaXJlY3Qgbm90aWZpY2F0aW9uIGF0IHRoZSBhcHByb3ByaWF0 ZSB0aW1lLgorICAgIGlmIChtX2lzU2VydmVyUmVkaXJlY3QpIHsKKyAgICAgICAgbV9tYWluRnJh bWUtPmZyYW1lTG9hZFN0YXRlKCkuZGlkU3RhcnRQcm92aXNpb25hbExvYWQobV9yZXF1ZXN0LnVy bCgpKTsKKworICAgICAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9y YXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICAgICAgbV9wYWdlLmRpZFJlY2Vp dmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKG1fbWFpbkZyYW1lLT5m cmFtZUlEKCksIG1fbmF2aWdhdGlvbklELCBXVEZNb3ZlKG1fcmVxdWVzdCksIHsgfSk7CisgICAg fQorfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9h ZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYg dXJsLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQorewor ICAgIC8vIElmIHRoZSBwcmV2aW91cyBwcm92aXNpb25hbCBsb2FkIHVzZWQgdGhlIHNhbWUgcHJv Y2Vzcywgd2UgbWF5IHJlY2VpdmUgSVBDIGZvciB0aGlzIHByZXZpb3VzIHByb3Zpc2lvbmFsJ3Mg bWFpbiBmcmFtZSB0aGF0IHdlIG5lZWQgdG8gaWdub3JlLgorICAgIGlmICghbV9tYWluRnJhbWUg fHwgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSAhPSBmcmFtZUlEKQorICAgICAgICByZXR1cm47CisK KyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yRnJhbWU6IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIg UFJJdTY0ICIsIG5hdmlnYXRpb25JRCA9ICUiIFBSSXU2NCwgbV9wYWdlLnBhZ2VJRCgpLCBmcmFt ZUlELCBuYXZpZ2F0aW9uSUQpOworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFsTG9hZFVSTC5pc051 bGwoKSk7CisgICAgbV9wcm92aXNpb25hbExvYWRVUkwgPSB1cmw7CisKKyAgICAvLyBNZXJlbHkg Zm9sbG93aW5nIGEgc2VydmVyIHNpZGUgcmVkaXJlY3Qgc28gdGhlcmUgaXMgbm8gbmVlZCB0byBz ZW5kIGEgZGlkU3RhcnRQcm92aXNpb25hbExvYWQgYWdhaW4uCisgICAgaWYgKG1faXNTZXJ2ZXJS ZWRpcmVjdCkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gQ2xpZW50cyBleHBlY3QgdGhlIFBh Z2UncyBtYWluIGZyYW1lJ3MgZXhwZWN0ZWRVUkwgdG8gYmUgdGhlIHByb3Zpc2lvbmFsIG9uZSB3 aGVuIGEgcHJvdmlzaW9uYWwgbG9hZCBpcyBzdGFydGVkLgorICAgIGlmIChhdXRvKiBwYWdlTWFp bkZyYW1lID0gbV9wYWdlLm1haW5GcmFtZSgpKQorICAgICAgICBwYWdlTWFpbkZyYW1lLT5kaWRT dGFydFByb3Zpc2lvbmFsTG9hZCh1cmwpOworCisgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRl ID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgbV9w YWdlLmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoZnJhbWVJRCwgbmF2aWdhdGlvbklE LCBXVEZNb3ZlKHVybCksIFdURk1vdmUodW5yZWFjaGFibGVVUkwpLCB1c2VyRGF0YSk7Cit9CisK K3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFt ZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZy YW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBw cm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYgZXJyb3IsIGNvbnN0 IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBt X3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKworICAgIFJFTEVB U0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiZGlkRmFpbFByb3Zpc2lvbmFsTG9h ZEZvckZyYW1lOiBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCBu YXZpZ2F0aW9uSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSwgZnJhbWVJRCwgbmF2aWdh dGlvbklEKTsKKyAgICBtX3Byb3Zpc2lvbmFsTG9hZFVSTCA9IHsgfTsKKworICAgIC8vIE1ha2Ug c3VyZSB0aGUgUGFnZSdzIG1haW4gZnJhbWUncyBleHBlY3RlZFVSTCBnZXRzIGNsZWFyZWQgc2lu Y2Ugd2UgdXBkYXRlZCBpdCBpbiBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZC4KKyAgICBpZiAoYXV0 byogcGFnZU1haW5GcmFtZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAgICAgcGFnZU1haW5G cmFtZS0+ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZCgpOworCisgICAgbV9wYWdlLmRpZEZhaWxQcm92 aXNpb25hbExvYWRGb3JGcmFtZShmcmFtZUlELCBmcmFtZVNlY3VyaXR5T3JpZ2luLCBuYXZpZ2F0 aW9uSUQsIHByb3Zpc2lvbmFsVVJMLCBlcnJvciwgdXNlckRhdGEpOyAvLyBXaWxsIGRlbGV0ZSB8 dGhpc3wuCit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JG cmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmlu ZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90 IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYgY2VydGlmaWNh dGVJbmZvLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhh c0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0 YSYgdXNlckRhdGEpCit7CisgICAgLy8gSWYgdGhlIHByZXZpb3VzIHByb3Zpc2lvbmFsIGxvYWQg dXNlZCB0aGUgc2FtZSBwcm9jZXNzLCB3ZSBtYXkgcmVjZWl2ZSBJUEMgZm9yIHRoaXMgcHJldmlv dXMgcHJvdmlzaW9uYWwncyBtYWluIGZyYW1lIHRoYXQgd2UgbmVlZCB0byBpZ25vcmUuCisgICAg aWYgKCFtX21haW5GcmFtZSB8fCBtX21haW5GcmFtZS0+ZnJhbWVJRCgpICE9IGZyYW1lSUQpCisg ICAgICAgIHJldHVybjsKKworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBw aW5nLCAiZGlkQ29tbWl0TG9hZEZvckZyYW1lOiBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJ RCA9ICUiIFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQo KSwgZnJhbWVJRCwgbmF2aWdhdGlvbklEKTsKKyAgICBtX3Byb3Zpc2lvbmFsTG9hZFVSTCA9IHsg fTsKKyAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisKKyAgICBt X3dhc0NvbW1pdHRlZCA9IHRydWU7CisgICAgbV9wYWdlLmNvbW1pdFByb3Zpc2lvbmFsUGFnZShm cmFtZUlELCBuYXZpZ2F0aW9uSUQsIG1pbWVUeXBlLCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92 aWRlciwgZnJhbWVMb2FkVHlwZSwgY2VydGlmaWNhdGVJbmZvLCBjb250YWluc1BsdWdpbkRvY3Vt ZW50LCBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIHVzZXJEYXRhKTsgLy8gV2lsbCBkZWxldGUg fHRoaXN8LgorfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2Fn ZShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIElQQzo6RGVjb2RlciYgZGVjb2RlcikKK3sK KyAgICBBU1NFUlQoZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkgPT0gTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpKTsKKworICAgIGlmIChkZWNvZGVyLm1l c3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU3RhcnRQcm9ncmVzczo6 bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjpEaWRDaGFuZ2VQcm9ncmVzczo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIu bWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpCYWNrRm9yd2FyZEFkZEl0 ZW06Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6TG9nRGlhZ25vc3RpY01lc3NhZ2U6Om5hbWUoKQorICAgICAgICB8fCBk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6TG9nRGlhZ25v c3RpY01lc3NhZ2VXaXRoRW5oYW5jZWRQcml2YWN5OjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rl ci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNldE5ldHdvcmtSZXF1 ZXN0c0luUHJvZ3Jlc3M6Om5hbWUoKQorI2lmIFBMQVRGT1JNKENPQ09BKQorICAgICAgICB8fCBk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UmVnaXN0ZXJX ZWJQcm9jZXNzQWNjZXNzaWJpbGl0eVRva2VuOjpuYW1lKCkKKyNlbmRpZgorICAgICAgICB8fCBk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5t ZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlN0YXJ0VVJMU2NoZW1lVGFz azo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpEZWNpZGVQb2xpY3lGb3JSZXNwb25zZTo6bmFtZSgpCisgICAgICAgIHx8 IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRQZXJm b3JtQ2xpZW50UmVkaXJlY3Q6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1l KCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JG cmFtZTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpEaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YTo6bmFtZSgpKQor ICAgIHsKKyAgICAgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFy aWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgICAgIG1fcGFnZS5kaWRSZWNlaXZl TWVzc2FnZShjb25uZWN0aW9uLCBkZWNvZGVyKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwor ICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6 RGlkQ3JlYXRlTWFpbkZyYW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdl PE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENyZWF0ZU1haW5GcmFtZT4oZGVjb2RlciwgdGhp cywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOworICAgICAgICBy ZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOjpuYW1lKCkp IHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRp ZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25h bFBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OkRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZTo6bmFtZSgpKSB7 CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRG YWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBh Z2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6RGlkQ29tbWl0TG9hZEZvckZyYW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBD OjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENvbW1pdExvYWRGb3JG cmFtZT4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDb21taXRMb2Fk Rm9yRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgTE9HKFByb2Nlc3NTd2Fw cGluZywgIlVuaGFuZGxlZCBtZXNzYWdlICVzOjolcyBmcm9tIHByb3Zpc2lvbmFsIHByb2Nlc3Mi LCBkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKS50b1N0cmluZygpLmRhdGEoKSwgZGVjb2Rl ci5tZXNzYWdlTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgpKTsKK30KKwordm9pZCBQcm92aXNpb25h bFBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYgY29ubmVj dGlvbiwgSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVy PiYgZW5jb2RlcikKK3sKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OkJhY2tGb3J3YXJkSXRlbUF0SW5kZXg6Om5hbWUoKSB8fCBkZWNvZGVy Lm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6QmFja0ZvcndhcmRHb1Rv SXRlbTo6bmFtZSgpKSB7CisgICAgICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFn ZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgICAgICBtX3BhZ2Uu ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKGNvbm5lY3Rpb24sIGRlY29kZXIsIGVuY29kZXIpOworICAg ICAgICByZXR1cm47CisgICAgfQorCisgICAgTE9HKFByb2Nlc3NTd2FwcGluZywgIlVuaGFuZGxl ZCBzeW5jIG1lc3NhZ2UgJXM6OiVzIGZyb20gcHJvdmlzaW9uYWwgcHJvY2VzcyIsIGRlY29kZXIu bWVzc2FnZVJlY2VpdmVyTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgpLCBkZWNvZGVyLm1lc3NhZ2VO YW1lKCkudG9TdHJpbmcoKS5kYXRhKCkpOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5Lmgg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjgyNzQwMDY1MGFjMThiYzYxZGU1YTYzNjI4NzVhMGM3MDQyNTU0NWIKLS0tIC9kZXYvbnVs bAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oCkBA IC0wLDAgKzEsOTIgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTkgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUg cGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUg bWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRo ZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBi aW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIg aW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlk ZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklE RUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBB TlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E IEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4g Tk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFC TEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExB UlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsg TE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJ T04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhF UiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBO RUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhF IFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjcHJhZ21hIG9uY2UKKworI2luY2x1ZGUgIk1l c3NhZ2VSZWNlaXZlci5oIgorCituYW1lc3BhY2UgV2ViQ29yZSB7CitjbGFzcyBSZXNvdXJjZVJl cXVlc3Q7Cit9CisKK25hbWVzcGFjZSBXZWJLaXQgeworCitjbGFzcyBEcmF3aW5nQXJlYVByb3h5 OworY2xhc3MgU3VzcGVuZGVkUGFnZVByb3h5OworY2xhc3MgV2ViRnJhbWVQcm94eTsKK2NsYXNz IFdlYlBhZ2VQcm94eTsKK2NsYXNzIFdlYlByb2Nlc3NQcm94eTsKKworY2xhc3MgUHJvdmlzaW9u YWxQYWdlUHJveHkgOiBwdWJsaWMgSVBDOjpNZXNzYWdlUmVjZWl2ZXIgeworICAgIFdURl9NQUtF X0ZBU1RfQUxMT0NBVEVEOworcHVibGljOgorICAgIFByb3Zpc2lvbmFsUGFnZVByb3h5KFdlYlBh Z2VQcm94eSYsIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5k ZWRQYWdlUHJveHk+LCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGJvb2wgaXNTZXJ2ZXJSZWRpcmVj dCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRC eUNsaWVudCk7CisgICAgflByb3Zpc2lvbmFsUGFnZVByb3h5KCk7CisKKyAgICBXZWJQYWdlUHJv eHkmIHBhZ2UoKSB7IHJldHVybiBtX3BhZ2U7IH0KKyAgICBXZWJGcmFtZVByb3h5KiBtYWluRnJh bWUoKSBjb25zdCB7IHJldHVybiBtX21haW5GcmFtZS5nZXQoKTsgfQorICAgIFdlYlByb2Nlc3NQ cm94eSYgcHJvY2VzcygpIHsgcmV0dXJuIG1fcHJvY2Vzcy5nZXQoKTsgfQorICAgIFByb2Nlc3NT d2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCgpIGNvbnN0 IHsgcmV0dXJuIG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDsgfQorICAgIHVpbnQ2NF90 IG5hdmlnYXRpb25JRCgpIGNvbnN0IHsgcmV0dXJuIG1fbmF2aWdhdGlvbklEOyB9CisKKyAgICBz dGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gdGFrZURyYXdpbmdBcmVhKCk7CisKKyAg ICB2b2lkIGxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgY29uc3QgSVBD OjpEYXRhUmVmZXJlbmNlJiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBl bmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIE9w dGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOworICAgIHZvaWQg bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QmJiwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgQVBJ OjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RG OjpudWxsb3B0KTsKKyAgICB2b2lkIGdvVG9CYWNrRm9yd2FyZEl0ZW0oQVBJOjpOYXZpZ2F0aW9u JiwgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+ JiYpOworICAgIHZvaWQgY2FuY2VsKCk7CisKKyAgICB2b2lkIHByb2Nlc3NEaWRGaW5pc2hMYXVu Y2hpbmcoKTsKKworcHJpdmF0ZToKKyAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgorICAgIHZv aWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgZmlu YWw7CisgICAgdm9pZCBkaWRSZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBD OjpEZWNvZGVyJiwgc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mKSBmaW5hbDsKKworICAg IHZvaWQgZGlkQ3JlYXRlTWFpbkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpOworICAgIHZvaWQgZGlk U3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBu YXZpZ2F0aW9uSUQsIFVSTCYmLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEm KTsKKyAgICB2b2lkIGRpZENvbW1pdExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50 NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXND dXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNv cmU6OkNlcnRpZmljYXRlSW5mbyYsIGJvb2wgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9u YWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQs IGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJh bWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBm cmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYg cHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBjb25zdCBVc2Vy RGF0YSYpOworCisgICAgdm9pZCBpbml0aWFsaXplV2ViUGFnZSgpOworICAgIHZvaWQgZmluaXNo SW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCgpOworCisgICAgV2ViUGFnZVBy b3h5JiBtX3BhZ2U7CisgICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gbV9wcm9jZXNzOworICAgIHN0 ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBtX2RyYXdpbmdBcmVhOworICAgIFJlZlB0 cjxXZWJGcmFtZVByb3h5PiBtX21haW5GcmFtZTsKKyAgICB1aW50NjRfdCBtX25hdmlnYXRpb25J RDsKKyAgICBib29sIG1faXNTZXJ2ZXJSZWRpcmVjdDsKKyAgICBXZWJDb3JlOjpSZXNvdXJjZVJl cXVlc3QgbV9yZXF1ZXN0OworICAgIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgbV9wcm9j ZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50OworICAgIGJvb2wgbV93YXNDb21taXR0ZWQgeyBmYWxz ZSB9OworICAgIFVSTCBtX3Byb3Zpc2lvbmFsTG9hZFVSTDsKKworI2lmIFBMQVRGT1JNKElPU19G QU1JTFkpCisgICAgUHJvY2Vzc1Rocm90dGxlcjo6QmFja2dyb3VuZEFjdGl2aXR5VG9rZW4gbV9z dXNwZW5zaW9uVG9rZW47CisjZW5kaWYKK307CisKK30gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAKaW5kZXggZjE5 OGE4MTUzM2Y3NmIyZThlMmJmNzFkNGEzYjlkMjc0MGM5NTA3OC4uZmY3NmQ5ZjdmOTdhYzZmYTRm YmIzMDJmNjQ2NjYxZDE2NzhhZTI1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9T dXNwZW5kZWRQYWdlUHJveHkuY3BwCkBAIC0xMDAsNyArMTAwLDkgQEAgU3VzcGVuZGVkUGFnZVBy b3h5Ojp+U3VzcGVuZGVkUGFnZVByb3h5KCkKICAgICAvLyBJZiB0aGUgc3VzcGVuZGVkIHBhZ2Ug d2FzIG5vdCBjb25zdW1lZCBiZWZvcmUgZ2V0dGluZyBkZXN0cm95ZWQsIHRoZW4gY2xvc2UgdGhl IGNvcnJlc3BvbmRpbmcgcGFnZQogICAgIC8vIG9uIHRoZSBXZWJQcm9jZXNzIHNpZGUuCiAgICAg bV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpDbG9zZSgpLCBtX3BhZ2UucGFnZUlE KCkpOwotICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQ YWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKworICAg IGlmIChtX3N1c3BlbnNpb25TdGF0ZSA9PSBTdXNwZW5zaW9uU3RhdGU6OlN1c3BlbmRpbmcpCisg ICAgICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKIAogICAgIC8v IFdlIGNhbGwgbWF5YmVTaHV0RG93bigpIGFzeW5jaHJvbm91c2x5IHNpbmNlIHRoZSBTdXNwZW5k ZWRQYWdlIGlzIGN1cnJlbnRseSBiZWluZyByZW1vdmVkIGZyb20gdGhlIFdlYlByb2Nlc3NQb29s CiAgICAgLy8gYW5kIHdlIHdhbnQgdG8gYXZvaWQgcmUtZW50ZXJpbmcgV2ViUHJvY2Vzc1Bvb2wg bWV0aG9kcy4KQEAgLTEzNCw3ICsxMzYsNiBAQCB2b2lkIFN1c3BlbmRlZFBhZ2VQcm94eTo6dW5z dXNwZW5kKCkKICAgICBBU1NFUlQobV9zdXNwZW5zaW9uU3RhdGUgPT0gU3VzcGVuc2lvblN0YXRl OjpTdXNwZW5kZWQpOwogCiAgICAgbV9zdXNwZW5zaW9uU3RhdGUgPSBTdXNwZW5zaW9uU3RhdGU6 OlJlc3VtZWQ7Ci0gICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOwog ICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0SXNTdXNwZW5kZWQoZmFs c2UpLCBtX3BhZ2UucGFnZUlEKCkpOwogfQogCkBAIC0xNTEsNiArMTUyLDggQEAgdm9pZCBTdXNw ZW5kZWRQYWdlUHJveHk6OmRpZFByb2Nlc3NSZXF1ZXN0VG9TdXNwZW5kKFN1c3BlbnNpb25TdGF0 ZSBuZXdTdXNwZW5zaW8KICAgICBtX3N1c3BlbnNpb25Ub2tlbiA9IG51bGxwdHI7CiAjZW5kaWYK IAorICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKwogICAgIGlm IChtX3JlYWR5VG9VbnN1c3BlbmRIYW5kbGVyKQogICAgICAgICBtX3JlYWR5VG9VbnN1c3BlbmRI YW5kbGVyKHRoaXMpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi RnJhbWVQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNw cAppbmRleCBjNzdhMjZiNzQyN2MzMWM4MjhlMmVhYTIyMWY4MDcwYjc3YWRkMjYyLi41M2M3MTk2 YzJhYTBhMzNkMjIwNzU4MTkwY2Q0YmQ5NWE1Y2QwMjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJGcmFtZVByb3h5LmNwcApAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUgIldlYkZy YW1lUHJveHkuaCIKIAogI2luY2x1ZGUgIkFQSU5hdmlnYXRpb24uaCIKKyNpbmNsdWRlICJQcm92 aXNpb25hbFBhZ2VQcm94eS5oIgogI2luY2x1ZGUgIldlYkNlcnRpZmljYXRlSW5mby5oIgogI2lu Y2x1ZGUgIldlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eS5oIgogI2luY2x1ZGUgIldlYlBhZ2VN ZXNzYWdlcy5oIgpAQCAtNzQsNyArNzUsNyBAQCBib29sIFdlYkZyYW1lUHJveHk6OmlzTWFpbkZy YW1lKCkgY29uc3QKICAgICBpZiAoIW1fcGFnZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0g ICAgcmV0dXJuIHRoaXMgPT0gbV9wYWdlLT5tYWluRnJhbWUoKTsKKyAgICByZXR1cm4gdGhpcyA9 PSBtX3BhZ2UtPm1haW5GcmFtZSgpIHx8IChtX3BhZ2UtPnByb3Zpc2lvbmFsUGFnZVByb3h5KCkg JiYgdGhpcyA9PSBtX3BhZ2UtPnByb3Zpc2lvbmFsUGFnZVByb3h5KCktPm1haW5GcmFtZSgpKTsK IH0KIAogdm9pZCBXZWJGcmFtZVByb3h5Ojpsb2FkVVJMKGNvbnN0IFVSTCYgdXJsKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMzkyNzQzYmQ1Njc5Y2JkMjI2 N2EyYzEwZWNjZTE5NWE2MWMzM2QyOS4uYTdkMzI1YTMxOWEyNDVhMjlhZjc5ZmYyNzk3ODk4YWRj NDg5OWE5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC03 Nyw2ICs3Nyw3IEBACiAjaW5jbHVkZSAiUGx1Z2luSW5mb3JtYXRpb24uaCIKICNpbmNsdWRlICJQ bHVnaW5Qcm9jZXNzTWFuYWdlci5oIgogI2luY2x1ZGUgIlByaW50SW5mby5oIgorI2luY2x1ZGUg IlByb3Zpc2lvbmFsUGFnZVByb3h5LmgiCiAjaW5jbHVkZSAiU2FmZUJyb3dzaW5nV2FybmluZy5o IgogI2luY2x1ZGUgIlNoYXJlU2hlZXRDYWxsYmFja0lELmgiCiAjaW5jbHVkZSAiU2hhcmVkQnVm ZmVyRGF0YVJlZmVyZW5jZS5oIgpAQCAtNzY4LDM4ICs3NjksMjYgQEAgYm9vbCBXZWJQYWdlUHJv eHk6OnN1c3BlbmRDdXJyZW50UGFnZUlmUG9zc2libGUoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0 aW9uLCBPcHQKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OnN3YXBU b1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVuaXF1ZV9w dHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSwgSXNTd2Fw RnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9pZCBXZWJQYWdlUHJveHk6OnN3 YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVuaXF1 ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4mJiBkcmF3aW5nQXJlYSwgUmVmUHRyPFdlYkZyYW1lUHJv eHk+JiYgbWFpbkZyYW1lKQogewogICAgIEFTU0VSVCghbV9pc0Nsb3NlZCk7CiAgICAgUkVMRUFT RV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAic3dhcFRvV2ViUHJvY2Vzczogd2ViUElEID0gJWks IHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3Bh Z2VJRCk7CiAKICAgICBtX3Byb2Nlc3MgPSBXVEZNb3ZlKHByb2Nlc3MpOworICAgIEFTU0VSVCgh bV9kcmF3aW5nQXJlYSk7CisgICAgc2V0RHJhd2luZ0FyZWEoV1RGTW92ZShkcmF3aW5nQXJlYSkp OworICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOworICAgIG1fbWFpbkZyYW1lID0gV1RGTW92ZSht YWluRnJhbWUpOwogICAgIG1faXNWYWxpZCA9IHRydWU7CiAKLSAgICAvLyBJZiB3ZSBhcmUgcmVh dHRhY2hpbmcgdG8gYSBTdXNwZW5kZWRQYWdlLCB0aGVuIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdl IGFscmVhZHkgZXhpc3RzIGFuZAotICAgIC8vIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZy YW1lKCkgd2lsbCBub3QgYmUgY2FsbGVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUuIEluIHN1 Y2gKLSAgICAvLyBjYXNlLCB3ZSBuZWVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUgdG8gcmVm bGVjdCB0aGUgZmFjdCB0aGUgdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UKLSAgICAvLyBhbHJlYWR5 IGV4aXN0cyBhbmQgYWxyZWFkeSBoYXMgYSBtYWluIGZyYW1lLgotICAgIGlmIChkZXN0aW5hdGlv blN1c3BlbmRlZFBhZ2UpIHsKLSAgICAgICAgaWYgKCFkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2Ut PmZhaWxlZFRvU3VzcGVuZCgpKSB7Ci0gICAgICAgICAgICBBU1NFUlQoIW1fbWFpbkZyYW1lKTsK LSAgICAgICAgICAgIEFTU0VSVCgmZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5wcm9jZXNzKCkg PT0gbV9wcm9jZXNzLnB0cigpKTsKLSAgICAgICAgICAgIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFn ZS0+dW5zdXNwZW5kKCk7Ci0gICAgICAgICAgICBtX21haW5GcmFtZSA9IFdlYkZyYW1lUHJveHk6 OmNyZWF0ZSgqdGhpcywgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpKTsK LSAgICAgICAgICAgIG1fcHJvY2Vzcy0+ZnJhbWVDcmVhdGVkKGRlc3RpbmF0aW9uU3VzcGVuZGVk UGFnZS0+bWFpbkZyYW1lSUQoKSwgKm1fbWFpbkZyYW1lKTsKLSAgICAgICAgfSBlbHNlIHsKLSAg ICAgICAgICAgIC8vIFdlIGZhaWxlZCB0byBzdXNwZW5kIHRoZSBwYWdlIHNvIGRlc3Ryb3kgaXQg bm93IGFuZCBtZXJlbHkgcmV1c2UgaXRzIFdlYkNvbnRlbnQgcHJvY2Vzcy4KLSAgICAgICAgICAg IGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSA9IG51bGxwdHI7Ci0gICAgICAgIH0KLSAgICB9Ci0K ICAgICBtX3Byb2Nlc3MtPmFkZEV4aXN0aW5nV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQsIFdlYlBy b2Nlc3NQcm94eTo6QmVnaW5zVXNpbmdEYXRhU3RvcmU6Ok5vKTsKICAgICBtX3Byb2Nlc3MtPmFk ZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJO YW1lKCksIG1fcGFnZUlELCAqdGhpcyk7CiAKLSAgICBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nl c3MoaXNTd2FwRnJvbVN1c3BlbmRlZCk7CisgICAgLy8gTm8gbmVlZCB0byBpbml0aWFsaXplIHRo ZSBXZWJQYWdlIHNpbmNlIGl0IHdhcyBjcmVhdGVkIHdoZW4gd2UgY3JlYXRlZCB0aGUgUHJvdmlz aW9uYWxQYWdlUHJveHkuCisgICAgZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKFNob3VsZElu aXRpYWxpemVXZWJQYWdlOjpObyk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpmaW5pc2hBdHRh Y2hpbmdUb1dlYlByb2Nlc3MoSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVk KQordm9pZCBXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhTaG91bGRJ bml0aWFsaXplV2ViUGFnZSBzaG91bGRJbml0aWFsaXplUGFnZSkKIHsKICAgICBBU1NFUlQobV9w cm9jZXNzLT5zdGF0ZSgpICE9IENoaWxkUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6VGVybWluYXRlZCk7 CiAKQEAgLTgzNSw3ICs4MjQsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNoaW5n VG9XZWJQcm9jZXNzKElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1cwogICAgIG1fZWRp dGFibGVJbWFnZUNvbnRyb2xsZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEVkaXRhYmxlSW1hZ2VDb250 cm9sbGVyPigqdGhpcyk7CiAjZW5kaWYKIAotICAgIGluaXRpYWxpemVXZWJQYWdlKGlzU3dhcEZy b21TdXNwZW5kZWQpOworICAgIGlmIChzaG91bGRJbml0aWFsaXplUGFnZSA9PSBTaG91bGRJbml0 aWFsaXplV2ViUGFnZTo6WWVzKQorICAgICAgICBpbml0aWFsaXplV2ViUGFnZSgpOwogCiAgICAg bV9pbnNwZWN0b3ItPnVwZGF0ZUZvck5ld1BhZ2VQcm9jZXNzKHRoaXMpOwogCkBAIC05MDAsMTIg Kzg5MCwxMSBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OnJlYXR0YWNo VG9XZWJQcm9jZXNzV2l0aEl0ZW0oV2ViQmFja0ZvcndhcgogICAgIHJldHVybiBXVEZNb3ZlKG5h dmlnYXRpb24pOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoSXNT d2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9pZCBXZWJQYWdlUHJveHk6 OnNldERyYXdpbmdBcmVhKHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmIGRyYXdp bmdBcmVhKQogewotICAgIEFTU0VSVChpc1ZhbGlkKCkpOwotCi0gICAgbV9kcmF3aW5nQXJlYSA9 IHBhZ2VDbGllbnQoKS5jcmVhdGVEcmF3aW5nQXJlYVByb3h5KCk7Ci0gICAgQVNTRVJUKG1fZHJh d2luZ0FyZWEpOworICAgIG1fZHJhd2luZ0FyZWEgPSBXVEZNb3ZlKGRyYXdpbmdBcmVhKTsKKyAg ICBpZiAoIW1fZHJhd2luZ0FyZWEpCisgICAgICAgIHJldHVybjsKIAogI2lmIEVOQUJMRShBU1lO Q19TQ1JPTExJTkcpICYmIFBMQVRGT1JNKENPQ09BKQogICAgIGlmIChtX2RyYXdpbmdBcmVhLT50 eXBlKCkgPT0gRHJhd2luZ0FyZWFUeXBlUmVtb3RlTGF5ZXJUcmVlKSB7CkBAIC05MTYsMTUgKzkw NSwxNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoSXNTd2FwRnJvbVN1 c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQogI2VuZGlmCiAgICAgfQogI2VuZGlmCit9CiAK LSAgICBhdXRvIHBhcmFtZXRlcnMgPSBjcmVhdGlvblBhcmFtZXRlcnMoKTsKLSAgICBwYXJhbWV0 ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQgPSBpc1N3YXBGcm9tU3VzcGVuZGVkID09IElzU3dhcEZy b21TdXNwZW5kZWQ6OlllczsKK3ZvaWQgV2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSgp Cit7CisgICAgQVNTRVJUKGlzVmFsaWQoKSk7CiAKLSNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIp Ci0gICAgcGFyYW1ldGVycy5oYXNSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMgPSBwcm9jZXNzKCku cHJvY2Vzc1Bvb2woKS5tYXlIYXZlUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXJzKG1fd2Vic2l0ZURh dGFTdG9yZSk7Ci0jZW5kaWYKKyAgICBzZXREcmF3aW5nQXJlYShwYWdlQ2xpZW50KCkuY3JlYXRl RHJhd2luZ0FyZWFQcm94eSgpKTsKKyAgICBBU1NFUlQobV9kcmF3aW5nQXJlYSk7CiAKLSAgICBw cm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6Q3JlYXRlV2ViUGFnZShtX3BhZ2VJ RCwgcGFyYW1ldGVycyksIDApOworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9j ZXNzOjpDcmVhdGVXZWJQYWdlKG1fcGFnZUlELCBjcmVhdGlvblBhcmFtZXRlcnMoKSksIDApOwog CiAgICAgbV9uZWVkc1RvRmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5j aCA9IHRydWU7CiAgICAgZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5j aCgpOwpAQCAtMTA3Niw3ICsxMDY2LDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRSZXF1ZXN0 V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBSZXNvdXIKICAgICBh dXRvIHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CiAKICAgICBh dXRvIHVybCA9IHJlcXVlc3QudXJsKCk7Ci0gICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdB UElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCB1cmwpOworICAgIGlmIChzaG91bGRUcmVhdEFzQ29u dGludWluZ0xvYWQgIT0gU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMpCisgICAgICAg IG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFuc2FjdGlvbiwgdXJs KTsKIAogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICByZWF0dGFjaFRvV2ViUHJvY2Vzcygp OwpAQCAtMjY5Nyw3ICsyNjg4LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdh dGlvblBvbGljeURlY2lzaW9uKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24KICAgICAgICAg fQogCiAgICAgICAgIGlmIChwcm9jZXNzRm9yTmF2aWdhdGlvbi5wdHIoKSAhPSAmcHJvY2Vzcygp KSB7Ci0gICAgICAgICAgICBwb2xpY3lBY3Rpb24gPSBpc1BhZ2VPcGVuZWRCeURPTVNob3dpbmdJ bml0aWFsRW1wdHlEb2N1bWVudCgpID8gV2ViUG9saWN5QWN0aW9uOjpJZ25vcmUgOiBXZWJQb2xp Y3lBY3Rpb246OlN1c3BlbmQ7CisgICAgICAgICAgICBwb2xpY3lBY3Rpb24gPSBXZWJQb2xpY3lB Y3Rpb246Oklnbm9yZTsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vz c1N3YXBwaW5nLCAiZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiwgc3dhcHBpbmcgcHJv Y2VzcyAlaSB3aXRoIHByb2Nlc3MgJWkgZm9yIG5hdmlnYXRpb24sIHJlYXNvbjogJXtwdWJsaWN9 cyIsIHByb2Nlc3NJZGVudGlmaWVyKCksIHByb2Nlc3NGb3JOYXZpZ2F0aW9uLT5wcm9jZXNzSWRl bnRpZmllcigpLCByZWFzb24udXRmOCgpLmRhdGEoKSk7CiAgICAgICAgICAgICBMT0coUHJvY2Vz c1N3YXBwaW5nLCAiKFByb2Nlc3NTd2FwcGluZykgU3dpdGNoaW5nIGZyb20gcHJvY2VzcyAlaSB0 byBuZXcgcHJvY2VzcyAoJWkpIGZvciBuYXZpZ2F0aW9uICUiIFBSSXU2NCAiICclcyciLCBwcm9j ZXNzSWRlbnRpZmllcigpLCBwcm9jZXNzRm9yTmF2aWdhdGlvbi0+cHJvY2Vzc0lkZW50aWZpZXIo KSwgbmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24tPmxvZ2dpbmdTdHJpbmco KSk7CiAgICAgICAgIH0gZWxzZQpAQCAtMjcwNiw4ICsyNjk3LDE0IEBAIHZvaWQgV2ViUGFnZVBy b3h5OjpyZWNlaXZlZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbihXZWJQb2xpY3lBY3Rpb24gcG9s aWN5QWN0aW9uCiAgICAgICAgIGJvb2wgc2hvdWxkUHJvY2Vzc1N3YXAgPSBwcm9jZXNzRm9yTmF2 aWdhdGlvbi5wdHIoKSAhPSAmcHJvY2VzcygpOwogICAgICAgICByZWNlaXZlZFBvbGljeURlY2lz aW9uKHBvbGljeUFjdGlvbiwgbmF2aWdhdGlvbi5wdHIoKSwgc2hvdWxkUHJvY2Vzc1N3YXAgPyBX VEY6Om51bGxvcHQgOiBXVEZNb3ZlKGRhdGEpLCBXVEZNb3ZlKHNlbmRlcikpOwogCi0gICAgICAg IGlmIChzaG91bGRQcm9jZXNzU3dhcCkKLSAgICAgICAgICAgIGNvbnRpbnVlTmF2aWdhdGlvbklu TmV3UHJvY2VzcyhuYXZpZ2F0aW9uLCBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UgPyBwcm9jZXNz KCkucHJvY2Vzc1Bvb2woKS50YWtlU3VzcGVuZGVkUGFnZSgqZGVzdGluYXRpb25TdXNwZW5kZWRQ YWdlKSA6IG51bGxwdHIsIFdURk1vdmUocHJvY2Vzc0Zvck5hdmlnYXRpb24pLCBwcm9jZXNzU3dh cFJlcXVlc3RlZEJ5Q2xpZW50LCBXVEZNb3ZlKGRhdGEpKTsKKyAgICAgICAgaWYgKCFzaG91bGRQ cm9jZXNzU3dhcCkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBhdXRvIHN1c3BlbmRl ZFBhZ2UgPSBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UgPyBwcm9jZXNzKCkucHJvY2Vzc1Bvb2wo KS50YWtlU3VzcGVuZGVkUGFnZSgqZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlKSA6IG51bGxwdHI7 CisgICAgICAgIGlmIChzdXNwZW5kZWRQYWdlICYmIHN1c3BlbmRlZFBhZ2UtPmZhaWxlZFRvU3Vz cGVuZCgpKQorICAgICAgICAgICAgc3VzcGVuZGVkUGFnZSA9IG51bGxwdHI7CisKKyAgICAgICAg Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKG5hdmlnYXRpb24sIFdURk1vdmUoc3VzcGVu ZGVkUGFnZSksIFdURk1vdmUocHJvY2Vzc0Zvck5hdmlnYXRpb24pLCBwcm9jZXNzU3dhcFJlcXVl c3RlZEJ5Q2xpZW50LCBXVEZNb3ZlKGRhdGEpKTsKICAgICB9KTsKIH0KIApAQCAtMjc0MywyNCAr Mjc0MCw0NSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihXZWJQ b2xpY3lBY3Rpb24gYWN0aW9uLCBBUEk6Ok5hdmlnYXRpbwogICAgIHNlbmRlci0+c2VuZChhY3Rp b24sIG5hdmlnYXRpb24gPyBuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSA6IDAsIGRvd25sb2Fk SUQsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojpj b250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9u LCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmIHN1c3BlbmRlZFBhZ2VQcm94 eSwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5 Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIE9wdGlvbmFsPFdlYnNpdGVQb2xp Y2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQordm9pZCBXZWJQYWdlUHJveHk6OmNvbW1pdFBy b3Zpc2lvbmFsUGFnZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNv bnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIs IHVpbnQzMl90IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYg Y2VydGlmaWNhdGVJbmZvLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdl YkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25z dCBVc2VyRGF0YSYgdXNlckRhdGEpCiB7Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2Fk aW5nLCAiY29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzOiB3ZWJQSUQgPSAlaSwgcGFnZUlE ID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsK LSAgICBMT0coTG9hZGluZywgIkNvbnRpbnVpbmcgbmF2aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMn IGluIGEgbmV3IHdlYiBwcm9jZXNzIiwgbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdh dGlvbi5sb2dnaW5nU3RyaW5nKCkpOworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFnZSk7Cisg ICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiY29tbWl0UHJvdmlzaW9uYWxQYWdl OiBwcmV2aW91c1BJRCA9ICVpLCBuZXdQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3By b2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCku cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQpOwogCi0gICAgUmVmPFdlYlByb2Nlc3NQcm94 eT4gcHJldmlvdXNQcm9jZXNzID0gbV9wcm9jZXNzLmNvcHlSZWYoKTsKICAgICBPcHRpb25hbDx1 aW50NjRfdD4gbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcyA9IG1fbWFpbkZyYW1lID8gbWFr ZU9wdGlvbmFsKG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkpIDogV1RGOjpudWxsb3B0OwotICAgIGF1 dG8gbWFpbkZyYW1lVVJMID0gbV9tYWluRnJhbWUgPyBtX21haW5GcmFtZS0+dXJsKCkgOiBVUkwo KTsKIAotICAgIEFTU0VSVChtX3Byb2Nlc3MucHRyKCkgIT0gcHJvY2Vzcy5wdHIoKSk7CisgICAg QVNTRVJUKG1fcHJvY2Vzcy5wdHIoKSAhPSAmbV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3MoKSk7 CiAKICAgICBwcm9jZXNzRGlkVGVybWluYXRlKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbjo6TmF2 aWdhdGlvblN3YXApOwogCiAgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVz c2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2VJRCk7Ci0g ICAgYm9vbCBkaWRTdXNwZW5kUHJldmlvdXNQYWdlID0gc3VzcGVuZEN1cnJlbnRQYWdlSWZQb3Nz aWJsZShuYXZpZ2F0aW9uLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzLCBwcm9jZXNzU3dh cFJlcXVlc3RlZEJ5Q2xpZW50KTsKKyAgICBhdXRvKiBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0 YXRlKCkubmF2aWdhdGlvbihtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkpOworICAg IGJvb2wgZGlkU3VzcGVuZFByZXZpb3VzUGFnZSA9IG5hdmlnYXRpb24gPyBzdXNwZW5kQ3VycmVu dFBhZ2VJZlBvc3NpYmxlKCpuYXZpZ2F0aW9uLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNz LCBtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCgpKSA6IGZh bHNlOwogICAgIG1fcHJvY2Vzcy0+cmVtb3ZlV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQsIFdlYlBy b2Nlc3NQcm94eTo6RW5kc1VzaW5nRGF0YVN0b3JlOjpObyk7CiAKLSAgICBzd2FwVG9XZWJQcm9j ZXNzKFdURk1vdmUocHJvY2VzcyksIFdURk1vdmUoc3VzcGVuZGVkUGFnZVByb3h5KSwgZGlkU3Vz cGVuZFByZXZpb3VzUGFnZSA/IElzU3dhcEZyb21TdXNwZW5kZWQ6OlllcyA6IElzU3dhcEZyb21T dXNwZW5kZWQ6Ok5vKTsKKyAgICAvLyBUaGVyZSBpcyBubyB3YXkgd2UnbGwgYmUgYWJsZSB0byBy ZXR1cm4gdG8gdGhlIHBhZ2UgaW4gdGhlIHByZXZpb3VzIHBhZ2Ugc28gY2xvc2UgaXQuCisgICAg aWYgKCFkaWRTdXNwZW5kUHJldmlvdXNQYWdlKQorICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OkNsb3NlKCksIHBhZ2VJRCgpKTsKKworICAgIHN3YXBUb1dlYlByb2Nl c3MobV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3MoKSwgbV9wcm92aXNpb25hbFBhZ2UtPnRha2VE cmF3aW5nQXJlYSgpLCBtX3Byb3Zpc2lvbmFsUGFnZS0+bWFpbkZyYW1lKCkpOworCisgICAgZGlk Q29tbWl0TG9hZEZvckZyYW1lKGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgbWltZVR5cGUsIGZyYW1l SGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCBmcmFtZUxvYWRUeXBlLCBjZXJ0aWZpY2F0ZUluZm8s IGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgdXNlckRh dGEpOworCisgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBudWxscHRyOworfQorCit2b2lkIFdlYlBh Z2VQcm94eTo6Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKEFQSTo6TmF2aWdhdGlvbiYg bmF2aWdhdGlvbiwgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiBzdXNwZW5k ZWRQYWdlUHJveHksIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgbmV3UHJvY2VzcywgUHJvY2Vzc1N3 YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBPcHRpb25h bDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBSRUxFQVNF X0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3M6 IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50 aWZpZXIoKSwgbV9wYWdlSUQpOworICAgIExPRyhMb2FkaW5nLCAiQ29udGludWluZyBuYXZpZ2F0 aW9uICUiIFBSSXU2NCAiICclcycgaW4gYSBuZXcgd2ViIHByb2Nlc3MiLCBuYXZpZ2F0aW9uLm5h dmlnYXRpb25JRCgpLCBuYXZpZ2F0aW9uLmxvZ2dpbmdTdHJpbmcoKSk7CisKKyAgICBpZiAobV9w cm92aXNpb25hbFBhZ2UpIHsKKyAgICAgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0 aW9uSUQoKSAhPSBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpKQorICAgICAgICAgICAgbV9wcm92 aXNpb25hbFBhZ2UtPmNhbmNlbCgpOworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxw dHI7CisgICAgfQorCisgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBzdGQ6Om1ha2VfdW5pcXVlPFBy b3Zpc2lvbmFsUGFnZVByb3h5PigqdGhpcywgbmV3UHJvY2Vzcy5jb3B5UmVmKCksIFdURk1vdmUo c3VzcGVuZGVkUGFnZVByb3h5KSwgbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlv bi5jdXJyZW50UmVxdWVzdElzUmVkaXJlY3QoKSwgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgp LCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KTsKIAogICAgIGlmIChhdXRvKiBpdGVtID0g bmF2aWdhdGlvbi50YXJnZXRJdGVtKCkpIHsKICAgICAgICAgTE9HKExvYWRpbmcsICJXZWJQYWdl UHJveHkgJXAgY29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzIHRvIGJhY2sgaXRlbSBVUkwg JXMiLCB0aGlzLCBpdGVtLT51cmwoKS51dGY4KCkuZGF0YSgpKTsKQEAgLTI3NjgsNjcgKzI3ODYs MjIgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhB UEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIHMKICAgICAgICAgYXV0byB0cmFuc2FjdGlvbiA9 IG1fcGFnZUxvYWRTdGF0ZS50cmFuc2FjdGlvbigpOwogICAgICAgICBtX3BhZ2VMb2FkU3RhdGUu c2V0UGVuZGluZ0FQSVJlcXVlc3RVUkwodHJhbnNhY3Rpb24sIGl0ZW0tPnVybCgpKTsKIAotICAg ICAgICBhdXRvIGl0ZW1TdGF0ZXMgPSBtX2JhY2tGb3J3YXJkTGlzdC0+ZmlsdGVyZWRJdGVtU3Rh dGVzKFt0aGlzLCB0YXJnZXRJdGVtID0gaXRlbV0oV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYgaXRl bSkgewotICAgICAgICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBpdGVtLnN1c3BlbmRlZFBhZ2UoKSkg ewotICAgICAgICAgICAgICAgIGlmICgmcGFnZS0+cHJvY2VzcygpID09IG1fcHJvY2Vzcy5wdHIo KSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgfQotICAg ICAgICAgICAgcmV0dXJuICZpdGVtICE9IHRhcmdldEl0ZW07Ci0gICAgICAgIH0pOwotICAgICAg ICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlVwZGF0ZUJhY2tGb3J3YXJkTGlz dEZvclJlYXR0YWNoKFdURk1vdmUoaXRlbVN0YXRlcykpLCBtX3BhZ2VJRCk7Ci0gICAgICAgIG1f cHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShuYXZp Z2F0aW9uLm5hdmlnYXRpb25JRCgpLCBpdGVtLT5pdGVtSUQoKSwgKm5hdmlnYXRpb24uYmFja0Zv cndhcmRGcmFtZUxvYWRUeXBlKCksIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBX VEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpLCBtX3BhZ2VJRCk7Ci0gICAgICAgIG1fcHJvY2Vzcy0+ cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7Ci0KKyAgICAgICAgbV9wcm92aXNpb25hbFBh Z2UtPmdvVG9CYWNrRm9yd2FyZEl0ZW0obmF2aWdhdGlvbiwgKml0ZW0sIFdURk1vdmUod2Vic2l0 ZVBvbGljaWVzKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBpZiAobV9iYWNrRm9y d2FyZExpc3QtPmN1cnJlbnRJdGVtKCkgJiYgKG5hdmlnYXRpb24ubG9ja0JhY2tGb3J3YXJkTGlz dCgpID09IExvY2tCYWNrRm9yd2FyZExpc3Q6OlllcyB8fCBuYXZpZ2F0aW9uLmxvY2tIaXN0b3J5 KCkgPT0gTG9ja0hpc3Rvcnk6OlllcykpIHsKICAgICAgICAgLy8gSWYgV2ViQ29yZSBpcyBzdXBw b3NlZCB0byBsb2NrIHRoZSBoaXN0b3J5IGZvciB0aGlzIGxvYWQsIHRoZW4gdGhlIG5ldyBwcm9j ZXNzIG5lZWRzIHRvIGtub3cgYWJvdXQgdGhlIGN1cnJlbnQgaGlzdG9yeSBpdGVtIHNvIGl0IGNh biB1cGRhdGUKICAgICAgICAgLy8gaXQgaW5zdGVhZCBvZiBjcmVhdGluZyBhIG5ldyBvbmUuCi0g ICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0Q3VycmVudEhpc3Rv cnlJdGVtRm9yUmVhdHRhY2gobV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCktPml0ZW1T dGF0ZSgpKSwgbV9wYWdlSUQpOworICAgICAgICBuZXdQcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlOjpTZXRDdXJyZW50SGlzdG9yeUl0ZW1Gb3JSZWF0dGFjaChtX2JhY2tGb3J3YXJkTGlz dC0+Y3VycmVudEl0ZW0oKS0+aXRlbVN0YXRlKCkpLCBtX3BhZ2VJRCk7CiAgICAgfQogCiAgICAg Ly8gRklYTUU6IFdvcmsgb3V0IHRpbWluZyBvZiByZXNwb25kaW5nIHdpdGggdGhlIGxhc3QgcG9s aWN5IGRlbGVnYXRlLCBldGMKICAgICBBU1NFUlQoIW5hdmlnYXRpb24uY3VycmVudFJlcXVlc3Qo KS5pc0VtcHR5KCkpOwogICAgIGlmIChhdXRvJiBzdWJzdGl0dXRlRGF0YSA9IG5hdmlnYXRpb24u c3Vic3RpdHV0ZURhdGEoKSkKLSAgICAgICAgbG9hZERhdGFXaXRoTmF2aWdhdGlvbihuYXZpZ2F0 aW9uLCB7IHN1YnN0aXR1dGVEYXRhLT5jb250ZW50LmRhdGEoKSwgc3Vic3RpdHV0ZURhdGEtPmNv bnRlbnQuc2l6ZSgpIH0sIHN1YnN0aXR1dGVEYXRhLT5NSU1FVHlwZSwgc3Vic3RpdHV0ZURhdGEt PmVuY29kaW5nLCBzdWJzdGl0dXRlRGF0YS0+YmFzZVVSTCwgc3Vic3RpdHV0ZURhdGEtPnVzZXJE YXRhLmdldCgpLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJz aXRlUG9saWNpZXMpKTsKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UtPmxvYWREYXRhV2l0aE5h dmlnYXRpb24obmF2aWdhdGlvbiwgeyBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5kYXRhKCksIHN1 YnN0aXR1dGVEYXRhLT5jb250ZW50LnNpemUoKSB9LCBzdWJzdGl0dXRlRGF0YS0+TUlNRVR5cGUs IHN1YnN0aXR1dGVEYXRhLT5lbmNvZGluZywgc3Vic3RpdHV0ZURhdGEtPmJhc2VVUkwsIHN1YnN0 aXR1dGVEYXRhLT51c2VyRGF0YS5nZXQoKSwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKICAg ICBlbHNlCi0gICAgICAgIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgUmVz b3VyY2VSZXF1ZXN0IHsgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpIH0sIFdlYkNvcmU6OlNo b3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZEFsbG93RXh0ZXJuYWxTY2hlbWVzLCBu dWxscHRyLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRl UG9saWNpZXMpKTsKLQotICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOwotICAgIG1fbWFpbkZyYW1l Q3JlYXRpb25IYW5kbGVyID0gW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCBu YXZpZ2F0aW9uSUQgPSBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCByZXF1ZXN0ID0gIG5hdmln YXRpb24uY3VycmVudFJlcXVlc3QoKSwgbWFpbkZyYW1lVVJMLCBpc1NlcnZlclJlZGlyZWN0ID0g bmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdElzUmVkaXJlY3QoKV0oKSBtdXRhYmxlIHsKLSAgICAg ICAgaWYgKCF3ZWFrVGhpcykKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBBU1NFUlQo bV9tYWluRnJhbWUpOwotICAgICAgICAvLyBUaGlzIG5hdmlnYXRpb24gd2FzIGRlc3Ryb3llZCBz byBubyBuZWVkIHRvIG5vdGlmeSBvZiByZWRpcmVjdC4KLSAgICAgICAgaWYgKCFuYXZpZ2F0aW9u U3RhdGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCkpCi0gICAgICAgICAgICByZXR1cm47Ci0K LSAgICAgICAgLy8gUmVzdG9yZSB0aGUgbWFpbiBmcmFtZSdzIGNvbW1pdHRlZCBVUkwgYXMgc29t ZSBjbGllbnRzIG1heSByZWx5IG9uIGl0IHVudGlsIHRoZSBuZXh0IGxvYWQgaXMgY29tbWl0dGVk LgotICAgICAgICBtX21haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5zZXRVUkwobWFpbkZyYW1l VVJMKTsKLQotICAgICAgICAvLyBOb3JtYWxseSwgbm90aWZpY2F0aW9uIG9mIGEgc2VydmVyIHJl ZGlyZWN0IGNvbWVzIGZyb20gdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KLSAgICAgICAgLy8gSWYg d2UgYXJlIHByb2Nlc3Mgc3dhcHBpbmcgaW4gcmVzcG9uc2UgdG8gYSBzZXJ2ZXIgcmVkaXJlY3Qg dGhlbiB0aGF0IG5vdGlmaWNhdGlvbiB3aWxsIG5vdCBjb21lIGZyb20gdGhlIG5ldyBXZWJDb250 ZW50IHByb2Nlc3MuCi0gICAgICAgIC8vIEluIHRoaXMgY2FzZSB3ZSBoYXZlIHRoZSBVSVByb2Nl c3Mgc3ludGhlc2l6ZSB0aGUgcmVkaXJlY3Qgbm90aWZpY2F0aW9uIGF0IHRoZSBhcHByb3ByaWF0 ZSB0aW1lLgotICAgICAgICBpZiAoaXNTZXJ2ZXJSZWRpcmVjdCkgewotICAgICAgICAgICAgbV9t YWluRnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkuZGlkU3RhcnRQcm92aXNpb25hbExvYWQocmVxdWVz dC51cmwoKSk7Ci0gICAgICAgICAgICBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNp b25hbExvYWRGb3JGcmFtZShtX21haW5GcmFtZS0+ZnJhbWVJRCgpLCBuYXZpZ2F0aW9uSUQsIFdU Rk1vdmUocmVxdWVzdCksIHsgfSk7Ci0gICAgICAgIH0KLSAgICB9OwotCi0gICAgaWYgKCFtX3By b2Nlc3MtPnByb2Nlc3NQb29sKCkuY29uZmlndXJhdGlvbigpLnByb2Nlc3NTd2Fwc09uV2luZG93 T3BlbldpdGhPcGVuZXIoKSB8fCAhaXNQYWdlT3BlbmVkQnlET01TaG93aW5nSW5pdGlhbEVtcHR5 RG9jdW1lbnQoKSB8fCAhbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcykgewotICAgICAgICAv LyBUaGVyZSBpcyBubyB3YXkgd2UnbGwgYmUgYWJsZSB0byByZXR1cm4gdG8gdGhlIHBhZ2UgaW4g dGhlIHByZXZpb3VzIHBhZ2Ugc28gY2xvc2UgaXQuCi0gICAgICAgIGlmICghZGlkU3VzcGVuZFBy ZXZpb3VzUGFnZSkKLSAgICAgICAgICAgIHByZXZpb3VzUHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6Q2xvc2UoKSwgbV9wYWdlSUQpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0g ICAgbV9tYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIgPSBbdGhpcywgcHJldmlvdXNQcm9j ZXNzID0gV1RGTW92ZShwcmV2aW91c1Byb2Nlc3MpLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9j ZXNzID0gKm1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3NdKGNvbnN0IEdsb2JhbFdpbmRvd0lk ZW50aWZpZXImIHdpbmRvd0lkZW50aWZpZXIpIHsKLSAgICAgICAgQVNTRVJUKG1fbWFpbkZyYW1l KTsKLSAgICAgICAgR2xvYmFsRnJhbWVJZGVudGlmaWVyIG5hdmlnYXRlZEZyYW1lSWRlbnRpZmll ckluTmV3UHJvY2VzcyB7IHBhZ2VJRCgpLCBtX21haW5GcmFtZS0+ZnJhbWVJRCgpIH07Ci0gICAg ICAgIHByZXZpb3VzUHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RnJhbWVCZWNhbWVS ZW1vdGUobWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcywgbmF2aWdhdGVkRnJhbWVJZGVudGlm aWVySW5OZXdQcm9jZXNzLCB3aW5kb3dJZGVudGlmaWVyKSwgcGFnZUlEKCkpOwotICAgIH07Cisg ICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5sb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKG5hdmln YXRpb24sIFJlc291cmNlUmVxdWVzdCB7IG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKSB9LCBX ZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGRBbGxvd0V4dGVybmFs U2NoZW1lcywgbnVsbHB0ciwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKIH0KIAogYm9vbCBX ZWJQYWdlUHJveHk6OmlzUGFnZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50 KCkgY29uc3QKQEAgLTM2OTMsMTEgKzM2NjYsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3Jl YXRlTWFpbkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCiAKICAgICAvLyBBZGQgdGhlIGZyYW1lIHRv IHRoZSBwcm9jZXNzIHdpZGUgbWFwLgogICAgIG1fcHJvY2Vzcy0+ZnJhbWVDcmVhdGVkKGZyYW1l SUQsICptX21haW5GcmFtZSk7Ci0KLSAgICBpZiAobV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIp IHsKLSAgICAgICAgbV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIoKTsKLSAgICAgICAgbV9tYWlu RnJhbWVDcmVhdGlvbkhhbmRsZXIgPSBudWxscHRyOwotICAgIH0KIH0KIAogdm9pZCBXZWJQYWdl UHJveHk6OmRpZENyZWF0ZVN1YmZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCkBAIC0zNzIyLDEwICsz NjkwLDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVN1YmZyYW1lKHVpbnQ2NF90IGZy YW1lSUQpCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVXaW5kb3codWludDY0X3QgZnJh bWVJRCwgR2xvYmFsV2luZG93SWRlbnRpZmllciYmIHdpbmRvd0lkZW50aWZpZXIpCiB7Ci0gICAg aWYgKG1fbWFpbkZyYW1lICYmIG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkgPT0gZnJhbWVJRCkgewot ICAgICAgICBpZiAoYXV0byBtYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIgPSBXVEZNb3Zl KG1fbWFpbkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyKSkKLSAgICAgICAgICAgIG1haW5GcmFt ZVdpbmRvd0NyZWF0aW9uSGFuZGxlcih3aW5kb3dJZGVudGlmaWVyKTsKLSAgICB9CiB9CiAKIGRv dWJsZSBXZWJQYWdlUHJveHk6OmVzdGltYXRlZFByb2dyZXNzKCkgY29uc3QKQEAgLTM3NzgsNiAr Mzc0MiwxMCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRGVzdHJveU5hdmlnYXRpb24odWludDY0 X3QgbmF2aWdhdGlvbklEKQogewogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBh Z2VDbGllbnQoKSk7CiAKKyAgICAvLyBPbiBwcm9jZXNzLXN3YXAsIHRoZSBwcmV2aW91cyBwcm9j ZXNzIHRyaWVzIHRvIGRlc3Ryb3kgdGhlIG5hdmlnYXRpb24gYnV0IHRoZSBwcm92aXNpb25hbCBw cm9jZXNzIGlzIGFjdHVhbGx5IHRha2luZyBvdmVyIHRoZSBuYXZpZ2F0aW9uLgorICAgIGlmICht X3Byb3Zpc2lvbmFsUGFnZSAmJiBtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkgPT0g bmF2aWdhdGlvbklEKQorICAgICAgICByZXR1cm47CisKICAgICAvLyBGSVhNRTogTWVzc2FnZSBj aGVjayB0aGUgbmF2aWdhdGlvbklELgogICAgIG1fbmF2aWdhdGlvblN0YXRlLT5kaWREZXN0cm95 TmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpOwogfQpAQCAtMzc5NSwxNCArMzc2Myw2IEBAIHZvaWQg V2ViUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZy YW1lSUQsIHVpbnQ2NF90IG5hCiAgICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpICYmIG5hdmln YXRpb25JRCkKICAgICAgICAgbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRp b24obmF2aWdhdGlvbklEKTsKIAotICAgIC8vIElmIHRoaXMgc2VlbWluZ2x5IG5ldyBsb2FkIGlz IGFjdHVhbGx5IGNvbnRpbnVpbmcgYSBzZXJ2ZXIgcmVkaXJlY3QgZm9yIGEgcHJldmlvdXMgbmF2 aWdhdGlvbiBpbiBhIG5ldyBwcm9jZXNzLAotICAgIC8vIHRoZW4gd2UgaWdub3JlIHRoaXMgbm90 aWZpY2F0aW9uLgotICAgIGlmIChuYXZpZ2F0aW9uICYmIG5hdmlnYXRpb24tPmN1cnJlbnRSZXF1 ZXN0SXNSZWRpcmVjdCgpKSB7Ci0gICAgICAgIGF1dG8gbmF2aWdhdGlvblByb2Nlc3NJZGVudGlm aWVyID0gbmF2aWdhdGlvbi0+Y3VycmVudFJlcXVlc3RQcm9jZXNzSWRlbnRpZmllcigpOwotICAg ICAgICBpZiAobmF2aWdhdGlvblByb2Nlc3NJZGVudGlmaWVyICYmICpuYXZpZ2F0aW9uUHJvY2Vz c0lkZW50aWZpZXIgIT0gbV9wcm9jZXNzLT5jb3JlUHJvY2Vzc0lkZW50aWZpZXIoKSkKLSAgICAg ICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBMT0coTG9hZGluZywgIldlYlBhZ2VQcm94eSAl IiBQUkl1NjQgIiBpbiBwcm9jZXNzIHBpZCAlaSBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lIHRvIGZyYW1lSUQgJSIgUFJJdTY0ICIsIG5hdmlnYXRpb25JRCAlIiBQUkl1NjQgIiwgdXJs ICVzIiwgbV9wYWdlSUQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgZnJhbWVJRCwg bmF2aWdhdGlvbklELCB1cmwuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTog d2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0LCBt X3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlELCBmcmFtZUlEKTsKIApAQCAt MzkxMCw2ICszODcwLDExIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxM b2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2VjdXJpCiAKICAgICBQYWdlQ2xp ZW50UHJvdGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCisgICAgaWYgKG1fcHJvdmlz aW9uYWxQYWdlICYmIG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSA9PSBuYXZpZ2F0 aW9uSUQgJiYgJm1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCkgIT0gbV9wcm9jZXNzLnB0cigp KSB7CisgICAgICAgIC8vIFRoZSBsb2FkIGRpZCBub3QgZmFpbCwgaXQgbWVyZWx5IGhhcHBlbmlu ZyBpbiBhIG5ldyBwcm92aXNpb25hbCBwcm9jZXNzLgorICAgICAgICByZXR1cm47CisgICAgfQor CiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQp OwogICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOwogCkBAIC0zOTQ4LDYgKzM5MTMsMTAgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBm cmFtZUlELCBjb25zdCBTZWN1cmkKICAgICB9CiAKICAgICBtX2ZhaWxpbmdQcm92aXNpb25hbExv YWRVUkwgPSB7IH07CisKKyAgICAvLyBJZiB0aGUgcHJvdmlzaW9uYWwgcGFnZSdzIGxvYWQgZmFp bHMgdGhlbiB3ZSBkZXN0cm95IHRoZSBwcm92aXNpb25hbCBwYWdlLgorICAgIGlmIChtX3Byb3Zp c2lvbmFsUGFnZSAmJiBtX3Byb3Zpc2lvbmFsUGFnZS0+bWFpbkZyYW1lKCkgPT0gZnJhbWUpCisg ICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlID0gbnVsbHB0cjsKIH0KIAogdm9pZCBXZWJQYWdlUHJv eHk6OmNsZWFyTG9hZERlcGVuZGVudENhbGxiYWNrcygpCkBAIC00MzM5LDggKzQzMDgsOCBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jKHVp bnQ2NF90IGZyYW1lSUQsIFdlYkNvcgogICAgIGF1dG8qIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJG cmFtZShmcmFtZUlEKTsKICAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKIAotICAgIGRlY2lkZVBv bGljeUZvck5hdmlnYXRpb25BY3Rpb24oKmZyYW1lLCBXVEZNb3ZlKGZyYW1lU2VjdXJpdHlPcmln aW4pLCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUobmF2aWdhdGlvbkFjdGlvbkRhdGEpLCBXVEZNb3Zl KGZyYW1lSW5mb0RhdGEpLCBvcmlnaW5hdGluZ1BhZ2VJRCwgb3JpZ2luYWxSZXF1ZXN0LCBXVEZN b3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKHJlcXVlc3RCb2R5KSwgV1RGTW92ZShyZWRpcmVjdFJlc3Bv bnNlKSwgdXNlckRhdGEsIFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3Rl Y3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRF0gKGF1dG8uLi4g YXJncykgewotICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJl Y2VpdmVQb2xpY3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdl SUQpOworICAgIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oKmZyYW1lLCBXVEZNb3Zl KGZyYW1lU2VjdXJpdHlPcmlnaW4pLCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUobmF2aWdhdGlvbkFj dGlvbkRhdGEpLCBXVEZNb3ZlKGZyYW1lSW5mb0RhdGEpLCBvcmlnaW5hdGluZ1BhZ2VJRCwgb3Jp Z2luYWxSZXF1ZXN0LCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKHJlcXVlc3RCb2R5KSwgV1RG TW92ZShyZWRpcmVjdFJlc3BvbnNlKSwgdXNlckRhdGEsIFBvbGljeURlY2lzaW9uU2VuZGVyOjpj cmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlz dGVuZXJJRCwgcHJvY2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCldIChhdXRvLi4uIGFyZ3MpIHsK KyAgICAgICAgcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGlj eURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CiAgICAg fSkpOwogfQogCkBAIC00NTc0LDEyICs0NTQzLDEyIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNp ZGVQb2xpY3lGb3JSZXNwb25zZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cml0eU9yaWdp CiAgICAgTUVTU0FHRV9DSEVDS19VUkwocmVzcG9uc2UudXJsKCkpOwogCiAgICAgUmVmUHRyPEFQ STo6TmF2aWdhdGlvbj4gbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25JRCA/IG1fbmF2aWdhdGlvblN0 YXRlLT5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCkgOiBudWxscHRyOwotICAgIGF1dG8gbGlzdGVu ZXIgPSBtYWtlUmVmKGZyYW1lLT5zZXRVcFBvbGljeUxpc3RlbmVyUHJveHkoW3RoaXMsIHByb3Rl Y3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRCwgbmF2aWdhdGlv biA9IFdURk1vdmUobmF2aWdhdGlvbildIChXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCBB UEk6OldlYnNpdGVQb2xpY2llcyosIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vz c1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgUmVmUHRyPFNhZmVCcm93c2luZ1dhcm5pbmc+JiYgc2Fm ZUJyb3dzaW5nV2FybmluZykgbXV0YWJsZSB7CisgICAgYXV0byBsaXN0ZW5lciA9IG1ha2VSZWYo ZnJhbWUtPnNldFVwUG9saWN5TGlzdGVuZXJQcm94eShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1h a2VSZWYoKnRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklELCBuYXZpZ2F0aW9uID0gV1RGTW92ZShu YXZpZ2F0aW9uKSwgcHJvY2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCldIChXZWJQb2xpY3lBY3Rp b24gcG9saWN5QWN0aW9uLCBBUEk6OldlYnNpdGVQb2xpY2llcyosIFByb2Nlc3NTd2FwUmVxdWVz dGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgUmVmUHRyPFNhZmVCcm93 c2luZ1dhcm5pbmc+JiYgc2FmZUJyb3dzaW5nV2FybmluZykgbXV0YWJsZSB7CiAgICAgICAgIC8v IEZJWE1FOiBBc3NlcnQgdGhlIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiBpcyBudWxscHRyIGhlcmUg b25jZSBjbGllbnRzIG9mIFdLRnJhbWVQb2xpY3lMaXN0ZW5lclVzZVdpdGhQb2xpY2llcyBnbyBh d2F5LgogICAgICAgICBSRUxFQVNFX0FTU0VSVChwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50 ID09IFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQ6Ok5vKTsKICAgICAgICAgQVNTRVJUX1VO VVNFRChzYWZlQnJvd3NpbmdXYXJuaW5nLCAhc2FmZUJyb3dzaW5nV2FybmluZyk7Ci0gICAgICAg IHJlY2VpdmVkUG9saWN5RGVjaXNpb24ocG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uLmdldCgpLCBX VEY6Om51bGxvcHQsIFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3Rl ZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklEXSAoYXV0 by4uLiBhcmdzKSB7Ci0gICAgICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OkRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4u KSwgbV9wYWdlSUQpOworICAgICAgICByZWNlaXZlZFBvbGljeURlY2lzaW9uKHBvbGljeUFjdGlv biwgbmF2aWdhdGlvbi5nZXQoKSwgV1RGOjpudWxsb3B0LCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6 Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKSwgZnJh bWVJRCwgbGlzdGVuZXJJRCwgcHJvY2VzcyA9IFdURk1vdmUocHJvY2VzcyldIChhdXRvLi4uIGFy Z3MpIHsKKyAgICAgICAgICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJl Y2VpdmVQb2xpY3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdl SUQpOwogICAgICAgICB9KSk7CiAgICAgfSwgU2hvdWxkRXhwZWN0U2FmZUJyb3dzaW5nUmVzdWx0 OjpObykpOwogCkBAIC02NDg2LDggKzY0NTUsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cHJvY2Vz c1dpbGxCZWNvbWVGb3JlZ3JvdW5kKCkKIHZvaWQgV2ViUGFnZVByb3h5OjpyZXNldFN0YXRlKFJl c2V0U3RhdGVSZWFzb24gcmVzZXRTdGF0ZVJlYXNvbikKIHsKICAgICBtX21haW5GcmFtZSA9IG51 bGxwdHI7Ci0gICAgbV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIgPSBudWxscHRyOwotICAgIG1f bWFpbkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyID0gbnVsbHB0cjsKIAogI2lmIFBMQVRGT1JN KENPQ09BKQogICAgIG1fc2Nyb2xsaW5nUGVyZm9ybWFuY2VEYXRhID0gbnVsbHB0cjsKQEAgLTY3 NzgsNiArNjc0NSwxMCBAQCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6 Y3JlYXRpb25QYXJhbWV0ZXJzKCkKICAgICBwYXJhbWV0ZXJzLmFwcGxpY2F0aW9uTWFuaWZlc3Qg PSBtX2NvbmZpZ3VyYXRpb24tPmFwcGxpY2F0aW9uTWFuaWZlc3QoKSA/IE9wdGlvbmFsPFdlYkNv cmU6OkFwcGxpY2F0aW9uTWFuaWZlc3Q+KG1fY29uZmlndXJhdGlvbi0+YXBwbGljYXRpb25NYW5p ZmVzdCgpLT5hcHBsaWNhdGlvbk1hbmlmZXN0KCkpIDogV1RGOjpudWxsb3B0OwogI2VuZGlmCiAK KyNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCisgICAgcGFyYW1ldGVycy5oYXNSZWdpc3RlcmVk U2VydmljZVdvcmtlcnMgPSBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS5tYXlIYXZlUmVnaXN0ZXJl ZFNlcnZpY2VXb3JrZXJzKG1fd2Vic2l0ZURhdGFTdG9yZSk7CisjZW5kaWYKKwogICAgIHBhcmFt ZXRlcnMubmVlZHNGb250QXR0cmlidXRlcyA9IG1fbmVlZHNGb250QXR0cmlidXRlczsKIAogICAg IG1fcHJvY2Vzcy0+YWRkV2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJveHkobV91c2VyQ29udGVu dENvbnRyb2xsZXIsIHBhcmFtZXRlcnMpOwpAQCAtODUzOSw2ICs4NTEwLDIxIEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpzaW11bGF0ZURldmljZU9yaWVudGF0aW9uQ2hhbmdlKGRvdWJsZSBhbHBoYSwg ZG91YmxlIGJldGEsIGRvCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpT aW11bGF0ZURldmljZU9yaWVudGF0aW9uQ2hhbmdlKGFscGhhLCBiZXRhLCBnYW1tYSksIG1fcGFn ZUlEKTsKIH0KIAorV2ViUGFnZVByb3h5OjpQYWdlUHJvY2Vzc092ZXJyaWRlOjpQYWdlUHJvY2Vz c092ZXJyaWRlKFdlYlBhZ2VQcm94eSYgcGFnZSwgV2ViUHJvY2Vzc1Byb3h5JiBuZXdQcm9jZXNz KQorICAgIDogbV9wYWdlKCZwYWdlKQorICAgICwgbV9wcmV2aW91c1Byb2Nlc3MocGFnZS5wcm9j ZXNzKCkpCit7CisgICAgcGFnZS5tX3Byb2Nlc3MgPSBuZXdQcm9jZXNzOworfQorCitXZWJQYWdl UHJveHk6OlBhZ2VQcm9jZXNzT3ZlcnJpZGU6OlBhZ2VQcm9jZXNzT3ZlcnJpZGUoUGFnZVByb2Nl c3NPdmVycmlkZSYmKSA9IGRlZmF1bHQ7CisKK1dlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVy cmlkZTo6flBhZ2VQcm9jZXNzT3ZlcnJpZGUoKQoreworICAgIGlmIChtX3BhZ2UpCisgICAgICAg IG1fcGFnZS0+bV9wcm9jZXNzID0gV1RGTW92ZShtX3ByZXZpb3VzUHJvY2Vzcyk7Cit9CisKICNp ZiBFTkFCTEUoREFUQV9ERVRFQ1RJT04pCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkZXRlY3REYXRh SW5BbGxGcmFtZXMoV2ViQ29yZTo6RGF0YURldGVjdG9yVHlwZXMgdHlwZXMsIENvbXBsZXRpb25I YW5kbGVyPHZvaWQoY29uc3QgRGF0YURldGVjdGlvblJlc3VsdCYpPiYmIGNvbXBsZXRpb25IYW5k bGVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmgg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBjZDgwMWI4MDhj NDZlNDUwZDhjZGFkNDk3MDhmNDdmOGYwMTM3MDI5Li4zOWZkMjU5YWI4MzhkZTM2ZmI5NjhlOGVk Y2RiZDY4ZGZjNmE0NmVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApA QCAtMjI1LDYgKzIyNSw3IEBAIGNsYXNzIE5hdGl2ZVdlYktleWJvYXJkRXZlbnQ7CiBjbGFzcyBO YXRpdmVXZWJNb3VzZUV2ZW50OwogY2xhc3MgTmF0aXZlV2ViV2hlZWxFdmVudDsKIGNsYXNzIFBh Z2VDbGllbnQ7CitjbGFzcyBQcm92aXNpb25hbFBhZ2VQcm94eTsKIGNsYXNzIFJlbW90ZUxheWVy VHJlZUhvc3Q7CiBjbGFzcyBSZW1vdGVMYXllclRyZWVTY3JvbGxpbmdQZXJmb3JtYW5jZURhdGE7 CiBjbGFzcyBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjsKQEAgLTM3OSw2ICszODAsNyBAQCBw dWJsaWM6CiAKICAgICBib29sIGFkZHNWaXNpdGVkTGlua3MoKSBjb25zdCB7IHJldHVybiBtX2Fk ZHNWaXNpdGVkTGlua3M7IH0KICAgICB2b2lkIHNldEFkZHNWaXNpdGVkTGlua3MoYm9vbCBhZGRz VmlzaXRlZExpbmtzKSB7IG1fYWRkc1Zpc2l0ZWRMaW5rcyA9IGFkZHNWaXNpdGVkTGlua3M7IH0K KyAgICBWaXNpdGVkTGlua1N0b3JlJiB2aXNpdGVkTGlua1N0b3JlKCkgeyByZXR1cm4gbV92aXNp dGVkTGlua1N0b3JlOyB9CiAKICAgICB2b2lkIGV4aXRGdWxsc2NyZWVuSW1tZWRpYXRlbHkoKTsK ICAgICB2b2lkIGZ1bGxzY3JlZW5NYXlSZXR1cm5Ub0lubGluZSgpOwpAQCAtNDU4LDggKzQ2MCw4 IEBAIHB1YmxpYzoKICAgICBBUEk6Okljb25Mb2FkaW5nQ2xpZW50JiBpY29uTG9hZGluZ0NsaWVu dCgpIHsgcmV0dXJuICptX2ljb25Mb2FkaW5nQ2xpZW50OyB9CiAgICAgdm9pZCBzZXRJY29uTG9h ZGluZ0NsaWVudChzdGQ6OnVuaXF1ZV9wdHI8QVBJOjpJY29uTG9hZGluZ0NsaWVudD4mJik7CiAK LSAgICBlbnVtIGNsYXNzIElzU3dhcEZyb21TdXNwZW5kZWQgeyBObywgWWVzIH07Ci0gICAgdm9p ZCBpbml0aWFsaXplV2ViUGFnZShJc1N3YXBGcm9tU3VzcGVuZGVkID0gSXNTd2FwRnJvbVN1c3Bl bmRlZDo6Tm8pOworICAgIHZvaWQgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsKKyAgICB2b2lkIHNldERy YXdpbmdBcmVhKHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmKTsKIAogICAgIFdl YWtQdHI8U2VjS2V5UHJveHlTdG9yZT4gc2VjS2V5UHJveHlTdG9yZShjb25zdCBXZWJDb3JlOjpB dXRoZW50aWNhdGlvbkNoYWxsZW5nZSYpOwogICAgICAgICAKQEAgLTEwMjUsNiArMTAyNywxOSBA QCBwdWJsaWM6CiAgICAgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKCkgeyByZXR1cm4gbV9wcm9j ZXNzOyB9CiAgICAgUHJvY2Vzc0lEIHByb2Nlc3NJZGVudGlmaWVyKCkgY29uc3Q7CiAKKyAgICBj bGFzcyBQYWdlUHJvY2Vzc092ZXJyaWRlIHsKKyAgICBwdWJsaWM6CisgICAgICAgIFBhZ2VQcm9j ZXNzT3ZlcnJpZGUoV2ViUGFnZVByb3h5JiwgV2ViUHJvY2Vzc1Byb3h5JiBuZXdQcm9jZXNzKTsK KyAgICAgICAgUGFnZVByb2Nlc3NPdmVycmlkZShQYWdlUHJvY2Vzc092ZXJyaWRlJiYpOworICAg ICAgICB+UGFnZVByb2Nlc3NPdmVycmlkZSgpOworCisgICAgcHJpdmF0ZToKKyAgICAgICAgUmVm UHRyPFdlYlBhZ2VQcm94eT4gbV9wYWdlOworICAgICAgICBSZWY8V2ViUHJvY2Vzc1Byb3h5PiBt X3ByZXZpb3VzUHJvY2VzczsKKyAgICB9OworCisgICAgUGFnZVByb2Nlc3NPdmVycmlkZSB0ZW1w b3JhcmlseU92ZXJyaWRlUHJvY2VzcyhXZWJQcm9jZXNzUHJveHkmIG5ld1Byb2Nlc3MpIHsgcmV0 dXJuIFBhZ2VQcm9jZXNzT3ZlcnJpZGUoKnRoaXMsIG5ld1Byb2Nlc3MpOyB9CisKICAgICBXZWJQ cmVmZXJlbmNlcyYgcHJlZmVyZW5jZXMoKSB7IHJldHVybiBtX3ByZWZlcmVuY2VzOyB9CiAgICAg dm9pZCBzZXRQcmVmZXJlbmNlcyhXZWJQcmVmZXJlbmNlcyYpOwogCkBAIC0xNDE0LDYgKzE0Mjks MjEgQEAgcHVibGljOgogICAgIEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyJiBlZGl0YWJsZUltYWdl Q29udHJvbGxlcigpIHsgcmV0dXJuICptX2VkaXRhYmxlSW1hZ2VDb250cm9sbGVyOyB9CiAjZW5k aWYKIAorICAgIFByb3Zpc2lvbmFsUGFnZVByb3h5KiBwcm92aXNpb25hbFBhZ2VQcm94eSgpIGNv bnN0IHsgcmV0dXJuIG1fcHJvdmlzaW9uYWxQYWdlLmdldCgpOyB9CisgICAgdm9pZCBjb21taXRQ cm92aXNpb25hbFBhZ2UodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBj b25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVy LCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8m LCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2Vj dXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYpOwor CisgICAgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1l SUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYsIFVSTCYmIHVucmVhY2hhYmxlVVJMLCBj b25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1l KHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJh bWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIHBy b3Zpc2lvbmFsVVJMLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgY29uc3QgVXNlckRh dGEmKTsKKyAgICB2b2lkIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9h ZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIGNvbnN0IFVzZXJEYXRhJik7CisKKyAgICB2b2lkIGxvYWRE YXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgY29uc3QgSVBDOjpEYXRhUmVmZXJl bmNlJiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZywgY29u c3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFdlYkNvcmU6OlNob3Vs ZFRyZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9 IFdURjo6bnVsbG9wdCk7CisgICAgdm9pZCBsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6 TmF2aWdhdGlvbiYsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBXZWJDb3JlOjpTaG91bGRP cGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFdlYkNvcmU6OlNo b3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4m JiA9IFdURjo6bnVsbG9wdCk7CisKKyAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgorICAgIC8v IEltcGxlbWVudGVkIGluIGdlbmVyYXRlZCBXZWJQYWdlUHJveHlNZXNzYWdlUmVjZWl2ZXIuY3Bw CisgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29k ZXImKSBvdmVycmlkZTsKKyAgICB2b2lkIGRpZFJlY2VpdmVTeW5jTWVzc2FnZShJUEM6OkNvbm5l Y3Rpb24mLCBJUEM6OkRlY29kZXImLCBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVyPiYpIG92 ZXJyaWRlOworCiBwcml2YXRlOgogICAgIFdlYlBhZ2VQcm94eShQYWdlQ2xpZW50JiwgV2ViUHJv Y2Vzc1Byb3h5JiwgdWludDY0X3QgcGFnZUlELCBSZWY8QVBJOjpQYWdlQ29uZmlndXJhdGlvbj4m Jik7CiAgICAgdm9pZCBwbGF0Zm9ybUluaXRpYWxpemUoKTsKQEAgLTE0MzgsMTIgKzE0NjgsNiBA QCBwcml2YXRlOgogCiAgICAgdm9pZCBzZXRVc2VyQWdlbnQoU3RyaW5nJiYpOwogCi0gICAgLy8g SVBDOjpNZXNzYWdlUmVjZWl2ZXIKLSAgICAvLyBJbXBsZW1lbnRlZCBpbiBnZW5lcmF0ZWQgV2Vi UGFnZVByb3h5TWVzc2FnZVJlY2VpdmVyLmNwcAotICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2Uo SVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgb3ZlcnJpZGU7Ci0gICAgdm9pZCBkaWRS ZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJiwgc3RkOjp1 bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mKSBvdmVycmlkZTsKLQotCiAgICAgLy8gSVBDOjpNZXNz YWdlU2VuZGVyCiAgICAgYm9vbCBzZW5kTWVzc2FnZShzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNv ZGVyPiwgT3B0aW9uU2V0PElQQzo6U2VuZE9wdGlvbj4pIG92ZXJyaWRlOwogICAgIElQQzo6Q29u bmVjdGlvbiogbWVzc2FnZVNlbmRlckNvbm5lY3Rpb24oKSBvdmVycmlkZTsKQEAgLTE0NjUsMTIg KzE0ODksOSBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlkQ3JlYXRlU3ViZnJhbWUodWludDY0X3Qg ZnJhbWVJRCk7CiAgICAgdm9pZCBkaWRDcmVhdGVXaW5kb3codWludDY0X3QgZnJhbWVJRCwgV2Vi Q29yZTo6R2xvYmFsV2luZG93SWRlbnRpZmllciYmKTsKIAotICAgIHZvaWQgZGlkU3RhcnRQcm92 aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9u SUQsIFVSTCYmLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmKTsKLSAgICB2 b2lkIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVp bnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0JiYsIGNvbnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCB3aWxsUGVyZm9ybUNsaWVudFJl ZGlyZWN0Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGRvdWJs ZSBkZWxheSwgV2ViQ29yZTo6TG9ja0JhY2tGb3J3YXJkTGlzdCk7CiAgICAgdm9pZCBkaWRDYW5j ZWxDbGllbnRSZWRpcmVjdEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpOwogICAgIHZvaWQgZGlk Q2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBu YXZpZ2F0aW9uSUQsIFVSTCYmKTsKLSAgICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JG cmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEm IGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5n JiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIGNvbnN0IFVz ZXJEYXRhJik7CiAgICAgdm9pZCBkaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJ RCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZy YW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25z dCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQs IE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVD b250ZW50LCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkRmluaXNoRG9jdW1lbnRMb2Fk Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBV c2VyRGF0YSYpOwogICAgIHZvaWQgZGlkRmluaXNoTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1l SUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgVXNlckRhdGEmKTsKQEAgLTE1NzQsMTgg KzE1OTUsMTYgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldENhblNob3J0Q2lyY3VpdEhvcml6b250 YWxXaGVlbEV2ZW50cyhib29sIGNhblNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50cykg eyBtX2NhblNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50cyA9IGNhblNob3J0Q2lyY3Vp dEhvcml6b250YWxXaGVlbEV2ZW50czsgfQogCiAgICAgdm9pZCByZWF0dGFjaFRvV2ViUHJvY2Vz cygpOwotICAgIHZvaWQgc3dhcFRvV2ViUHJvY2VzcyhSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmLCBz dGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmLCBJc1N3YXBGcm9tU3VzcGVuZGVk KTsKKyAgICB2b2lkIHN3YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiwgc3Rk Ojp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+JiYsIFJlZlB0cjxXZWJGcmFtZVByb3h5PiYm IG1haW5GcmFtZSk7CiAgICAgdm9pZCBkaWRGYWlsVG9TdXNwZW5kQWZ0ZXJQcm9jZXNzU3dhcCgp OwogICAgIHZvaWQgZGlkU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAoKTsKIAotICAgIHZvaWQgZmlu aXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKElzU3dhcEZyb21TdXNwZW5kZWQgPSBJc1N3YXBGcm9t U3VzcGVuZGVkOjpObyk7CisgICAgZW51bSBjbGFzcyBTaG91bGRJbml0aWFsaXplV2ViUGFnZSB7 IE5vLCBZZXMgfTsKKyAgICB2b2lkIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhTaG91bGRJ bml0aWFsaXplV2ViUGFnZSA9IFNob3VsZEluaXRpYWxpemVXZWJQYWdlOjpZZXMpOwogCiAgICAg UmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVhdHRhY2hUb1dlYlByb2Nlc3NGb3JSZWxvYWQoKTsK ICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiByZWF0dGFjaFRvV2ViUHJvY2Vzc1dpdGhJdGVt KFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKTsKIAotICAgIHZvaWQgbG9hZERhdGFXaXRoTmF2aWdh dGlvbihBUEk6Ok5hdmlnYXRpb24mLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBjb25zdCBT dHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcmIGJh c2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRp bnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0 KTsKLSAgICB2b2lkIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwg V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVS THNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0Nv bnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxs b3B0KTsKLQogICAgIHZvaWQgcmVxdWVzdE5vdGlmaWNhdGlvblBlcm1pc3Npb24odWludDY0X3Qg bm90aWZpY2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nKTsKICAgICB2b2lkIHNo b3dOb3RpZmljYXRpb24oY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBib2R5LCBj b25zdCBTdHJpbmcmIGljb25VUkwsIGNvbnN0IFN0cmluZyYgdGFnLCBjb25zdCBTdHJpbmcmIGxh bmcsIFdlYkNvcmU6Ok5vdGlmaWNhdGlvbkRpcmVjdGlvbiwgY29uc3QgU3RyaW5nJiBvcmlnaW5T dHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsKICAgICB2b2lkIGNhbmNlbE5vdGlmaWNh dGlvbih1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CkBAIC0xOTUxLDggKzE5NzAsNiBAQCBwcml2 YXRlOgogICAgIFJlZjxXZWJzaXRlRGF0YVN0b3JlPiBtX3dlYnNpdGVEYXRhU3RvcmU7CiAKICAg ICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9tYWluRnJhbWU7Ci0gICAgRnVuY3Rpb248dm9pZCgp PiBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlcjsKLSAgICBGdW5jdGlvbjx2b2lkKGNvbnN0IFdl YkNvcmU6Okdsb2JhbFdpbmRvd0lkZW50aWZpZXImKT4gbV9tYWluRnJhbWVXaW5kb3dDcmVhdGlv bkhhbmRsZXI7CiAKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9mb2N1c2VkRnJhbWU7CiAg ICAgUmVmUHRyPFdlYkZyYW1lUHJveHk+IG1fZnJhbWVTZXRMYXJnZXN0RnJhbWU7CkBAIC0yMzIy LDYgKzIzMzksOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9uZWVkc0ZvbnRBdHRyaWJ1dGVzIHsg ZmFsc2UgfTsKICAgICBib29sIG1fbWF5SGF2ZVVuaXZlcnNhbEZpbGVSZWFkU2FuZGJveEV4dGVu c2lvbiB7IGZhbHNlIH07CiAKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJvdmlzaW9uYWxQYWdlUHJv eHk+IG1fcHJvdmlzaW9uYWxQYWdlOworCiAjaWYgSEFWRShQRU5DSUxLSVQpCiAgICAgc3RkOjp1 bmlxdWVfcHRyPEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyPiBtX2VkaXRhYmxlSW1hZ2VDb250cm9s bGVyOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNw cAppbmRleCBkYjFmZDU4YjkzZGZmNTg2NWQxM2ZjNTQxYjZlNWQ4NzQ2ZWI4ZTBhLi5kYWJlZGJj MGE3NDQxMjZiZGU2OGQ1OTQ2ZDc1MzFmZWY3NWM3NTU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNsdWRlICJM b2dnaW5nLmgiCiAjaW5jbHVkZSAiUGx1Z2luSW5mb1N0b3JlLmgiCiAjaW5jbHVkZSAiUGx1Z2lu UHJvY2Vzc01hbmFnZXIuaCIKKyNpbmNsdWRlICJQcm92aXNpb25hbFBhZ2VQcm94eS5oIgogI2lu Y2x1ZGUgIlRleHRDaGVja2VyLmgiCiAjaW5jbHVkZSAiVGV4dENoZWNrZXJTdGF0ZS5oIgogI2lu Y2x1ZGUgIlVJTWVzc2FnZVBvcnRDaGFubmVsUHJvdmlkZXIuaCIKQEAgLTU4NCw2ICs1ODUsMTUg QEAgYm9vbCBXZWJQcm9jZXNzUHJveHk6OmZ1bGxLZXlib2FyZEFjY2Vzc0VuYWJsZWQoKQogfQog I2VuZGlmCiAKK2Jvb2wgV2ViUHJvY2Vzc1Byb3h5OjpoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQo dWludDY0X3QgcGFnZUlEKSBjb25zdAoreworICAgIGZvciAoYXV0byogcHJvdmlzaW9uYWxQYWdl IDogbV9wcm92aXNpb25hbFBhZ2VzKSB7CisgICAgICAgIGlmIChwcm92aXNpb25hbFBhZ2UtPnBh Z2UoKS5wYWdlSUQoKSA9PSBwYWdlSUQpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9 CisgICAgcmV0dXJuIGZhbHNlOworfQorCiB2b2lkIFdlYlByb2Nlc3NQcm94eTo6dXBkYXRlQmFj a0ZvcndhcmRJdGVtKGNvbnN0IEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSYgaXRlbVN0YXRlKQog ewogICAgIGlmIChhdXRvKiBpdGVtID0gV2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6aXRlbUZvcklE KGl0ZW1TdGF0ZS5pZGVudGlmaWVyKSkgewpAQCAtNTkxLDcgKzYwMSw3IEBAIHZvaWQgV2ViUHJv Y2Vzc1Byb3h5Ojp1cGRhdGVCYWNrRm9yd2FyZEl0ZW0oY29uc3QgQmFja0ZvcndhcmRMaXN0SXRl bVN0YXRlJiBpdGVtCiAgICAgICAgIC8vIHRoZSBiYWNrL2ZvcndhcmQgaXRlbXMgcGFnZS4KICAg ICAgICAgLy8gZS5nLiBUaGUgb2xkIHdlYiBwcm9jZXNzIGlzIG5hdmlnYXRpbmcgdG8gYWJvdXQ6 YmxhbmsgZm9yIHN1c3BlbnNpb24uCiAgICAgICAgIC8vIFdlIGlnbm9yZSB0aGVzZSB1cGRhdGVz LgotICAgICAgICBpZiAobV9wYWdlTWFwLmNvbnRhaW5zKGl0ZW0tPnBhZ2VJRCgpKSkKKyAgICAg ICAgaWYgKG1fcGFnZU1hcC5jb250YWlucyhpdGVtLT5wYWdlSUQoKSkgfHwgaGFzUHJvdmlzaW9u YWxQYWdlV2l0aElEKGl0ZW0tPnBhZ2VJRCgpKSkKICAgICAgICAgICAgIGl0ZW0tPnNldFBhZ2VT dGF0ZShpdGVtU3RhdGUucGFnZVN0YXRlKTsKICAgICB9CiB9CkBAIC03ODAsNiArNzkwLDEyIEBA IHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVuY2hpbmcoUHJvY2Vzc0xhdW5jaGVy KiBsYXVuY2hlciwgSVBDOjpDb25uZWN0CiAgICAgICAgIHBhZ2UtPnByb2Nlc3NEaWRGaW5pc2hM YXVuY2hpbmcoKTsKICAgICB9CiAKKyAgICBmb3IgKGF1dG8qIHByb3Zpc2lvbmFsUGFnZSA6IG1f cHJvdmlzaW9uYWxQYWdlcykgeworICAgICAgICBBU1NFUlQodGhpcyA9PSAmcHJvdmlzaW9uYWxQ YWdlLT5wcm9jZXNzKCkpOworICAgICAgICBwcm92aXNpb25hbFBhZ2UtPnByb2Nlc3NEaWRGaW5p c2hMYXVuY2hpbmcoKTsKKyAgICB9CisKKwogICAgIFJFTEVBU0VfQVNTRVJUKCFtX3dlYkNvbm5l Y3Rpb24pOwogICAgIG1fd2ViQ29ubmVjdGlvbiA9IFdlYkNvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6 OmNyZWF0ZSh0aGlzKTsKIApAQCAtODczLDcgKzg4OSw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5 OjptYXliZVNodXREb3duKCkKIAogYm9vbCBXZWJQcm9jZXNzUHJveHk6OmNhblRlcm1pbmF0ZUNo aWxkUHJvY2VzcygpCiB7Ci0gICAgaWYgKCFtX3BhZ2VNYXAuaXNFbXB0eSgpIHx8IG1fcHJvY2Vz c1Bvb2wtPmhhc1N1c3BlbmRlZFBhZ2VGb3IoKnRoaXMpKQorICAgIGlmICghbV9wYWdlTWFwLmlz RW1wdHkoKSB8fCBtX3Byb2Nlc3NQb29sLT5oYXNTdXNwZW5kZWRQYWdlRm9yKCp0aGlzKSB8fCAh bV9wcm92aXNpb25hbFBhZ2VzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAg ICAgaWYgKCFtX3Byb2Nlc3NQb29sLT5zaG91bGRUZXJtaW5hdGUodGhpcykpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCmluZGV4IDc1ZjY1YTdmN2ViMWFjYzgxOTk5 MWNlNGY5ZjY5ODZjOTViNjFmZjMuLjUwNDI2MzBkZTM3MWQ4NWE4MjgzNzQzNDhhYTk2OTE3Mzlj OWNkNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94 eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCkBAIC03 MCw2ICs3MCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgTmV0d29ya1Byb2Nlc3NQcm94 eTsKIGNsYXNzIE9iakNPYmplY3RHcmFwaDsKIGNsYXNzIFBhZ2VDbGllbnQ7CitjbGFzcyBQcm92 aXNpb25hbFBhZ2VQcm94eTsKIGNsYXNzIFVzZXJNZWRpYUNhcHR1cmVNYW5hZ2VyUHJveHk7CiBj bGFzcyBWaXNpdGVkTGlua1N0b3JlOwogY2xhc3MgV2ViQmFja0ZvcndhcmRMaXN0SXRlbTsKQEAg LTEyNCw2ICsxMjUsOSBAQCBwdWJsaWM6CiAgICAgZW51bSBjbGFzcyBFbmRzVXNpbmdEYXRhU3Rv cmUgOiBib29sIHsgTm8sIFllcyB9OwogICAgIHZvaWQgcmVtb3ZlV2ViUGFnZShXZWJQYWdlUHJv eHkmLCB1aW50NjRfdCBwYWdlSUQsIEVuZHNVc2luZ0RhdGFTdG9yZSk7CiAKKyAgICB2b2lkIGFk ZFByb3Zpc2lvbmFsUGFnZVByb3h5KFByb3Zpc2lvbmFsUGFnZVByb3h5JiBwcm92aXNpb25hbFBh Z2UpIHsgQVNTRVJUKCFtX3Byb3Zpc2lvbmFsUGFnZXMuY29udGFpbnMoJnByb3Zpc2lvbmFsUGFn ZSkpOyBtX3Byb3Zpc2lvbmFsUGFnZXMuYWRkKCZwcm92aXNpb25hbFBhZ2UpOyB9CisgICAgdm9p ZCByZW1vdmVQcm92aXNpb25hbFBhZ2VQcm94eShQcm92aXNpb25hbFBhZ2VQcm94eSYgcHJvdmlz aW9uYWxQYWdlKSB7IEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFnZXMuY29udGFpbnMoJnByb3Zpc2lv bmFsUGFnZSkpOyBtX3Byb3Zpc2lvbmFsUGFnZXMucmVtb3ZlKCZwcm92aXNpb25hbFBhZ2UpOyB9 CisKICAgICB0eXBlbmFtZSBXZWJQYWdlUHJveHlNYXA6OlZhbHVlc0NvbnN0SXRlcmF0b3JSYW5n ZSBwYWdlcygpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZU1hcC52YWx1ZXMoKTsgfQogICAgIHVuc2ln bmVkIHBhZ2VDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZU1hcC5zaXplKCk7IH0KICAgICB1 bnNpZ25lZCB2aXNpYmxlUGFnZUNvdW50KCkgY29uc3QgeyByZXR1cm4gbV92aXNpYmxlUGFnZUNv dW50ZXIudmFsdWUoKTsgfQpAQCAtMzMwLDYgKzMzNCw4IEBAIHByaXZhdGU6CiAKICAgICB2b2lk IGxvZ0RpYWdub3N0aWNNZXNzYWdlRm9yUmVzb3VyY2VMaW1pdFRlcm1pbmF0aW9uKGNvbnN0IFN0 cmluZyYgbGltaXRLZXkpOwogCisgICAgYm9vbCBoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQodWlu dDY0X3QgcGFnZUlEKSBjb25zdDsKKwogICAgIGVudW0gY2xhc3MgSXNXZWFrIHsgTm8sIFllcyB9 OwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGNsYXNzIFdlYWtPclN0cm9uZ1B0ciB7CiAgICAg cHVibGljOgpAQCAtMzczLDYgKzM3OSw3IEBAIHByaXZhdGU6CiAKICAgICBXZWJQYWdlUHJveHlN YXAgbV9wYWdlTWFwOwogICAgIFdlYkZyYW1lUHJveHlNYXAgbV9mcmFtZU1hcDsKKyAgICBIYXNo U2V0PFByb3Zpc2lvbmFsUGFnZVByb3h5Kj4gbV9wcm92aXNpb25hbFBhZ2VzOwogICAgIFVzZXJJ bml0aWF0ZWRBY3Rpb25NYXAgbV91c2VySW5pdGlhdGVkQWN0aW9uTWFwOwogCiAgICAgSGFzaFNl dDxWaXNpdGVkTGlua1N0b3JlKj4gbV92aXNpdGVkTGlua1N0b3JlczsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2Vi S2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDUwN2VkYjczZTc0YzNh NTdmNGVmNDcyZjViNTQ2Y2IyZGIwNjdhYTkuLjcwNzliMjY5ODg1ZGY2N2EwZTgxOTA5MTZmMGJh MDU4NmJhMzEyMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvagpAQCAtMzA5NSw2ICszMDk1LDggQEAKIAkJNDY2QkMwMzgxRkEyNjZDOTAwMkZB OUMxIC8qIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDY2QkMwMzkxRkEyNjZDOTAwMkZBOUMxIC8q IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMu aDsgcGF0aCA9IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmg7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCTQ2NkJDMDNBMUZBMjY2QzkwMDJGQTlDMSAvKiBXZWJTV0NvbnRleHRN YW5hZ2VyQ29ubmVjdGlvbi5tZXNzYWdlcy5pbiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7IHBhdGggPSBXZWJT V0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5tZXNzYWdlcy5pbjsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKKwkJNDY4MzU2OUEyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFsUGFnZVBy b3h5LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFByb3Zpc2lvbmFsUGFnZVBy b3h5Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTQ2ODM1NjlCMjFFODFDQzcwMDZF MjdBMyAvKiBQcm92aXNpb25hbFBhZ2VQcm94eS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNw cC5jcHA7IHBhdGggPSBQcm92aXNpb25hbFBhZ2VQcm94eS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CiAJCTQ2QTJCNjA2MUU1Njc1QTIwMEMzREVEQSAvKiBCYWNrZ3JvdW5kUHJvY2Vz c1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBw YXRoID0gQmFja2dyb3VuZFByb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVyLmNwcDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDZBMkI2MDcxRTU2NzVBMjAwQzNERURBIC8qIEJhY2tncm91 bmRQcm9jZXNzUmVzcG9uc2l2ZW5lc3NUaW1lci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7 IHBhdGggPSBCYWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVuZXNzVGltZXIuaDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDZERjA2MzkxRjM5MDVFNTAwMTk4MEJCIC8qIE5ldHdvcmtD T1JTUHJlZmxpZ2h0Q2hlY2tlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBh dGggPSBOZXR3b3JrQ09SU1ByZWZsaWdodENoZWNrZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwpAQCAtNzM1MCw2ICs3MzUyLDggQEAKIAkJCQk4NkU2N0EyMjE5MEY0MTE4MDAwMDRB QjcgLyogUHJvY2Vzc1Rocm90dGxlci5jcHAgKi8sCiAJCQkJODZFNjdBMjExOTBGNDExODAwMDA0 QUI3IC8qIFByb2Nlc3NUaHJvdHRsZXIuaCAqLywKIAkJCQk4MzA0OEFFNTFBQ0E0NURDMDA4MkM4 MzIgLyogUHJvY2Vzc1Rocm90dGxlckNsaWVudC5oICovLAorCQkJCTQ2ODM1NjlCMjFFODFDQzcw MDZFMjdBMyAvKiBQcm92aXNpb25hbFBhZ2VQcm94eS5jcHAgKi8sCisJCQkJNDY4MzU2OUEyMUU4 MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmggKi8sCiAJCQkJQTU1QkE4MUIx QkEyNUIxRTAwN0NEMzNEIC8qIFJlbW90ZVdlYkluc3BlY3RvclByb3h5LmNwcCAqLywKIAkJCQlB NTVCQTgxOTFCQTI1QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkuaCAqLywK IAkJCQlBNTVCQTgxQTFCQTI1QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2ViSW5zcGVjdG9yUHJveHku bWVzc2FnZXMuaW4gKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJGcmFtZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJG cmFtZS5jcHAKaW5kZXggMDA3NDliNDc3YTI0Y2U4Y2NjODI1MDFkOTRlMDhiNjBlZTFhNjI2My4u ZmZlZDAwYzgyMDZhOTRmMGU0ZmZjN2ZmM2E4YTlkZmY4NjEzZmFjOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcApAQCAtMjYzLDggKzI2Myw2IEBA IHN0YXRpYyBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gdG9Qb2xpY3lBY3Rpb24oV2ViUG9saWN5QWN0 aW9uIHBvbGljeUFjdGlvbikKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6 SWdub3JlOwogICAgIGNhc2UgV2ViUG9saWN5QWN0aW9uOjpEb3dubG9hZDoKICAgICAgICAgcmV0 dXJuIFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6RG93bmxvYWQ7Ci0gICAgY2FzZSBXZWJQb2xpY3lB Y3Rpb246OlN1c3BlbmQ6Ci0gICAgICAgIGJyZWFrOwogICAgIH0KICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKICAgICByZXR1cm4gV2ViQ29yZTo6UG9saWN5QWN0aW9uOjpJZ25vcmU7CkBAIC0y NzIsMTEgKzI3MCw4IEBAIHN0YXRpYyBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gdG9Qb2xpY3lBY3Rp b24oV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbikKIAogdm9pZCBXZWJGcmFtZTo6ZGlkUmVj ZWl2ZVBvbGljeURlY2lzaW9uKHVpbnQ2NF90IGxpc3RlbmVySUQsIFdlYlBvbGljeUFjdGlvbiBh Y3Rpb24sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgRG93bmxvYWRJRCBkb3dubG9hZElELCBPcHRp b25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKIHsKLSAgICBpZiAo IW1fY29yZUZyYW1lIHx8ICFtX3BvbGljeUxpc3RlbmVySUQgfHwgbGlzdGVuZXJJRCAhPSBtX3Bv bGljeUxpc3RlbmVySUQgfHwgIW1fcG9saWN5RnVuY3Rpb24pIHsKLSAgICAgICAgaWYgKGFjdGlv biA9PSBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQpCi0gICAgICAgICAgICBwYWdlKCktPnNlbmQo TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAo KSk7CisgICAgaWYgKCFtX2NvcmVGcmFtZSB8fCAhbV9wb2xpY3lMaXN0ZW5lcklEIHx8IGxpc3Rl bmVySUQgIT0gbV9wb2xpY3lMaXN0ZW5lcklEIHx8ICFtX3BvbGljeUZ1bmN0aW9uKQogICAgICAg ICByZXR1cm47Ci0gICAgfQogCiAgICAgRnJhbWVQb2xpY3lGdW5jdGlvbiBmdW5jdGlvbiA9IFdU Rk1vdmUobV9wb2xpY3lGdW5jdGlvbik7CiAgICAgYm9vbCBmb3JOYXZpZ2F0aW9uQWN0aW9uID0g bV9wb2xpY3lGdW5jdGlvbkZvck5hdmlnYXRpb25BY3Rpb24gPT0gRm9yTmF2aWdhdGlvbkFjdGlv bjo6WWVzOwpAQCAtMjkyLDE2ICsyODcsNyBAQCB2b2lkIFdlYkZyYW1lOjpkaWRSZWNlaXZlUG9s aWN5RGVjaXNpb24odWludDY0X3QgbGlzdGVuZXJJRCwgV2ViUG9saWN5QWN0aW9uIGFjdAogICAg ICAgICAgICAgZG9jdW1lbnRMb2FkZXItPnNldE5hdmlnYXRpb25JRChuYXZpZ2F0aW9uSUQpOwog ICAgIH0KIAotICAgIGJvb2wgc2hvdWxkU3VzcGVuZCA9IGZhbHNlOwotICAgIGlmIChhY3Rpb24g PT0gV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kKSB7Ci0gICAgICAgIHNob3VsZFN1c3BlbmQgPSB0 cnVlOwotICAgICAgICBhY3Rpb24gPSBXZWJQb2xpY3lBY3Rpb246Oklnbm9yZTsKLSAgICB9Ci0K ICAgICBmdW5jdGlvbih0b1BvbGljeUFjdGlvbihhY3Rpb24pKTsKLQotICAgIGlmIChzaG91bGRT dXNwZW5kKQotICAgICAgICBwYWdlKCktPnN1c3BlbmRGb3JQcm9jZXNzU3dhcCgpOwogfQogCiB2 b2lkIFdlYkZyYW1lOjpzdGFydERvd25sb2FkKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVz dCYgcmVxdWVzdCwgY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWROYW1lKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCAyNWQ2ZGZiNzFkMDNhNDk2NjQ0 YzYyMzJmNmZiNDIxOGZhOGQyZmJiLi5lNDkxODI0N2E2NzY2ZDY0MmNiZDM2MmZjMzUzNTE1NjA5 YzY3NmVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cApAQCAtNDAxLDcgKzQwMSw3IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBX ZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICAsIG1fb3ZlcnJpZGVD b250ZW50U2VjdXJpdHlQb2xpY3kgeyBwYXJhbWV0ZXJzLm92ZXJyaWRlQ29udGVudFNlY3VyaXR5 UG9saWN5IH0KICAgICAsIG1fY3B1TGltaXQocGFyYW1ldGVycy5jcHVMaW1pdCkKICNpZiBQTEFU Rk9STShNQUMpCi0gICAgLCBtX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNpdGlv bihwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQpCisgICAgLCBtX3Nob3VsZEF0dGFjaERy YXdpbmdBcmVhT25QYWdlVHJhbnNpdGlvbihwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXApCiAjZW5k aWYKIHsKICAgICBBU1NFUlQobV9wYWdlSUQpOwpAQCAtNDcxLDcgKzQ3MSw3IEBAIFdlYlBhZ2U6 OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFy YW1ldGVycykKICAgICBtX2RyYXdpbmdBcmVhLT5zZXRQYWludGluZ0VuYWJsZWQoZmFsc2UpOwog ICAgIG1fZHJhd2luZ0FyZWEtPnNldFNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQocGFyYW1l dGVycy5zaG91bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50KTsKIAotICAgIGlmIChwYXJhbWV0ZXJz LmlzU3dhcEZyb21TdXNwZW5kZWQpCisgICAgaWYgKHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkK ICAgICAgICAgZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6U3dhcEZyb21T dXNwZW5kZWQpOwogCiAjaWYgRU5BQkxFKEFTWU5DX1NDUk9MTElORykKQEAgLTY5Niw3ICs2OTYs NyBAQCB2b2lkIFdlYlBhZ2U6OnJlaW5pdGlhbGl6ZVdlYlBhZ2UoV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVycyYmIHBhcmFtZXRlcnMpCiAgICAgICAgIG1fZHJhd2luZ0FyZWEtPnVwZGF0ZVByZWZl cmVuY2VzKHBhcmFtZXRlcnMuc3RvcmUpOwogICAgICAgICBtX2RyYXdpbmdBcmVhLT5zZXRQYWlu dGluZ0VuYWJsZWQodHJ1ZSk7CiAjaWYgUExBVEZPUk0oTUFDKQotICAgICAgICBtX3Nob3VsZEF0 dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNpdGlvbiA9IHBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1 c3BlbmRlZDsKKyAgICAgICAgbV9zaG91bGRBdHRhY2hEcmF3aW5nQXJlYU9uUGFnZVRyYW5zaXRp b24gPSBwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXA7CiAjZW5kaWYKICAgICAgICAgdW5mcmVlemVM YXllclRyZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29uOjpQYWdlU3VzcGVuZGVkKTsKICAgICB9CkBA IC0zMDUzLDEyICszMDUzLDYgQEAgdm9pZCBXZWJQYWdlOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNp b24odWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbGlzdGVuZXJJRCwgV2UKICAgICBXZWJGcmFt ZSogZnJhbWUgPSBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS53ZWJGcmFtZShmcmFtZUlEKTsKICAg ICBpZiAoIWZyYW1lKQogICAgICAgICByZXR1cm47Ci0gICAgaWYgKHBvbGljeUFjdGlvbiA9PSBX ZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQpIHsKLSAgICAgICAgQVNTRVJUKGZyYW1lID09IG1fbWFp bkZyYW1lKTsKLSAgICAgICAgc2V0SXNTdXNwZW5kZWQodHJ1ZSk7Ci0KLSAgICAgICAgV2ViUHJv Y2Vzczo6c2luZ2xldG9uKCkuc2VuZFByZXdhcm1JbmZvcm1hdGlvbihtYWluV2ViRnJhbWUoKS0+ dXJsKCkpOwotICAgIH0KICAgICBmcmFtZS0+ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGxpc3Rl bmVySUQsIHBvbGljeUFjdGlvbiwgbmF2aWdhdGlvbklELCBkb3dubG9hZElELCBXVEZNb3ZlKHdl YnNpdGVQb2xpY2llcykpOwogfQogCkBAIC02MzEyLDYgKzYzMDYsMTAgQEAgdm9pZCBXZWJQYWdl OjpzZXRJc1N1c3BlbmRlZChib29sIHN1c3BlbmRlZCkKICAgICBpZiAobV9pc1N1c3BlbmRlZCkg ewogICAgICAgICAvLyBVbmZyb3plbiBvbiBkcmF3aW5nIGFyZWEgcmVzZXQuCiAgICAgICAgIGZy ZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlBhZ2VTdXNwZW5kZWQpOworCisg ICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnNlbmRQcmV3YXJtSW5mb3JtYXRpb24obWFp bldlYkZyYW1lKCktPnVybCgpKTsKKworICAgICAgICBzdXNwZW5kRm9yUHJvY2Vzc1N3YXAoKTsK ICAgICB9IGVsc2UKICAgICAgICAgbV9zaG91bGRSZXNldERyYXdpbmdBcmVhQWZ0ZXJTdXNwZW5k ID0gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbSBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQppbmRl eCA5MWFkNzFhZGUxYjdkYjRmOWRjZTY0ZDRmMzMwNDY3YjIyYjgzM2NjLi44M2I2NTk5MjcwYjUx YzdiYjE4ZWZlNzM3YTU5MmUwMjU3MWEyODA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KKysr IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhLm1tCkBAIC05Nyw3ICs5Nyw3IEBAIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhOjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYShXZWJQYWdlJiB3ZWJQYWdlLCBj CiAgICAgdXBkYXRlTGF5ZXJIb3N0aW5nQ29udGV4dCgpOwogICAgIHNldENvbG9yU3BhY2UocGFy YW1ldGVycy5jb2xvclNwYWNlKTsKIAotICAgIGlmICghcGFyYW1ldGVycy5pc1N3YXBGcm9tU3Vz cGVuZGVkKQorICAgIGlmICghcGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwKQogICAgICAgICBhdHRh Y2goKTsKIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9n CmluZGV4IGNkNWY4ZTlkYTU1ZjBkYjMxMDk1YTMzNzE5NTg0NTc1YWI1ZTNmNWIuLjU1YWUyZDI4 NDRkMTM4YWIwODUwOWY4ODAwYzViZGViNDU3ZjY2NjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5n ZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOS0wMS0xNCAg Q2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFJlZ3Jlc3Npb24oUFNP TikgVmlldyBiZWNvbWVzIGJsYW5rIGFmdGVyIGNsaWNrIGEgY3Jvc3Mtc2l0ZSBkb3dubG9hZCBs aW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMz NjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBBUEkgdGVzdCBjb3ZlcmFnZS4KKwor ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5h dmlnYXRpb24ubW06CisgICAgICAgICgtW1BTT05OYXZpZ2F0aW9uRGVsZWdhdGUgd2ViVmlldzpk ZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2U6ZGVjaXNpb25IYW5kbGVyOl0pOgorCiAy MDE5LTAxLTEwICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAg ICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjM5ODI1LgpkaWZmIC0tZ2l0IGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5t bSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5h dmlnYXRpb24ubW0KaW5kZXggZjM1ZDhiYWEzNTNmMDcwMjRmZDQwZTdkNTI3NDUzYTc0MjEwYzNi YS4uZDViZDVlYzc3NmJkNWUxN2IwYmQ5Yzk0MDAyY2NiNTQ0N2NhNWQwOCAxMDA2NDQKLS0tIGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdh dGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nl c3NTd2FwT25OYXZpZ2F0aW9uLm1tCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAo QykgMjAxNyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMp IDIwMTctMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKQEAgLTcyLDYgKzcyLDcgQEAgc3RhdGljIGJvb2wgc2VydmVyUmVk aXJlY3RlZDsKIHN0YXRpYyBIYXNoU2V0PHBpZF90PiBzZWVuUElEczsKIHN0YXRpYyBib29sIHdp bGxQZXJmb3JtQ2xpZW50UmVkaXJlY3Q7CiBzdGF0aWMgYm9vbCBkaWRQZXJmb3JtQ2xpZW50UmVk aXJlY3Q7CitzdGF0aWMgYm9vbCBzaG91bGRDb252ZXJ0VG9Eb3dubG9hZDsKIHN0YXRpYyBSZXRh aW5QdHI8TlNVUkw+IGNsaWVudFJlZGlyZWN0U291cmNlVVJMOwogc3RhdGljIFJldGFpblB0cjxO U1VSTD4gY2xpZW50UmVkaXJlY3REZXN0aW5hdGlvblVSTDsKIApAQCAtMTI4LDYgKzEyOSwxMSBA QCAtICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2 aWdhdGlvbkFjdGlvbjooV0tOYXZpZ2F0aQogICAgIGRpZFJlcG9uZFRvUG9saWN5RGVjaXNpb25D YWxsID0gdHJ1ZTsKIH0KIAorLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25SZXNwb25zZTooV0tOYXZpZ2F0aW9uUmVzcG9uc2UgKilu YXZpZ2F0aW9uUmVzcG9uc2UgZGVjaXNpb25IYW5kbGVyOih2b2lkICheKShXS05hdmlnYXRpb25S ZXNwb25zZVBvbGljeSkpZGVjaXNpb25IYW5kbGVyCit7CisgICAgZGVjaXNpb25IYW5kbGVyKHNo b3VsZENvbnZlcnRUb0Rvd25sb2FkID8gX1dLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5QmVjb21l RG93bmxvYWQgOiBXS05hdmlnYXRpb25SZXNwb25zZVBvbGljeUFsbG93KTsKK30KKwogLSAodm9p ZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZv clByb3Zpc2lvbmFsTmF2aWdhdGlvbjooV0tOYXZpZ2F0aW9uICopbmF2aWdhdGlvbgogewogICAg IHNlZW5QSURzLmFkZChbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKQEAgLTE0MDUs NyArMTQxMSw3IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIFNlcnZlclJlZGlyZWN0KQogCiAgICAgRVhQ RUNUX0ZBTFNFKHNlcnZlclJlZGlyZWN0ZWQpOwogICAgIEVYUEVDVF9FUSgzLCBudW1iZXJPZkRl Y2lkZVBvbGljeUNhbGxzKTsKLSAgICBFWFBFQ1RfRVEoMnUsIHNlZW5QSURzLnNpemUoKSk7Cisg ICAgRVhQRUNUX0VRKDN1LCBzZWVuUElEcy5zaXplKCkpOwogfQogCiBURVNUKFByb2Nlc3NTd2Fw LCBTZXJ2ZXJSZWRpcmVjdDIpCkBAIC0xNDY3LDYgKzE0NzMsMTA5IEBAIFRFU1QoUHJvY2Vzc1N3 YXAsIFNlcnZlclJlZGlyZWN0MikKICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lndl YmtpdC5vcmcvbWFpbjEuaHRtbCIsIFtbd2ViVmlldyBVUkxdIGFic29sdXRlU3RyaW5nXSk7CiB9 CiAKK3N0YXRpYyBjb25zdCBjaGFyKiBsaW5rVG9XZWJLaXRCeXRlcyA9IFIiUFNPTlJFU09VUkNF KAorPGJvZHk+CisgIDxhIGlkPSJ0ZXN0TGluayIgaHJlZj0icHNvbjovL3d3dy53ZWJraXQub3Jn L21haW4uaHRtbCI+TGluazwvYT4KKzwvYm9keT4KKylQU09OUkVTT1VSQ0UiOworCitURVNUKFBy b2Nlc3NTd2FwLCBQb2xpY3lDYW5jZWxBZnRlclNlcnZlclJlZGlyZWN0KQoreworICAgIGF1dG8g cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW19XS1Byb2Nlc3NQb29sQ29uZmln dXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQo KS5wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb24gPSBZRVM7CisgICAgYXV0byBwcm9jZXNzUG9vbCA9 IGFkb3B0TlMoW1tXS1Byb2Nlc3NQb29sIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOnBy b2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKV0pOworCisgICAgYXV0byB3ZWJWaWV3Q29uZmln dXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7 CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFByb2Nlc3NQb29sOnByb2Nlc3NQb29sLmdl dCgpXTsKKyAgICBhdXRvIGhhbmRsZXIgPSBhZG9wdE5TKFtbUFNPTlNjaGVtZSBhbGxvY10gaW5p dF0pOworICAgIFtoYW5kbGVyIGFkZE1hcHBpbmdGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy5n b29nbGUuY29tL21haW4uaHRtbCIgdG9EYXRhOmxpbmtUb1dlYktpdEJ5dGVzXTsKKyAgICBbaGFu ZGxlciBhZGRSZWRpcmVjdEZyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFp bi5odG1sIiB0b1VSTFN0cmluZzpAInBzb246Ly93d3cuYXBwbGUuY29tL2lnbm9yZS5odG1sIl07 CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6aGFuZGxlci5n ZXQoKSBmb3JVUkxTY2hlbWU6QCJwc29uIl07CisKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5T KFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2 MDApIGNvbmZpZ3VyYXRpb246d2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBhdXRv IG5hdmlnYXRpb25EZWxlZ2F0ZSA9IGFkb3B0TlMoW1tQU09OTmF2aWdhdGlvbkRlbGVnYXRlIGFs bG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOm5hdmlnYXRp b25EZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBuYXZpZ2F0aW9uRGVsZWdhdGUtPmRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb24gPSBeKFdLTmF2aWdhdGlvbkFjdGlvbiAqYWN0aW9uLCB2b2lk ICheZGVjaXNpb25IYW5kbGVyKShXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3kpKSB7CisgICAgICAg IGlmIChbYWN0aW9uLnJlcXVlc3QuVVJMLmFic29sdXRlU3RyaW5nIGhhc1N1ZmZpeDpAImlnbm9y ZS5odG1sIl0pIHsKKyAgICAgICAgICAgIGRlY2lzaW9uSGFuZGxlcihXS05hdmlnYXRpb25BY3Rp b25Qb2xpY3lDYW5jZWwpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAg IGRlY2lzaW9uSGFuZGxlcihXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvdyk7CisgICAgfTsK KworICAgIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhV Ukw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1s Il1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworCisgICAgVGVzdFdlYktp dEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisgICAgYXV0byBwaWRB ZnRlckZpcnN0TG9hZCA9IFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl07CisKKyAgICBF WFBFQ1RfRVEoMSwgbnVtYmVyT2ZEZWNpZGVQb2xpY3lDYWxscyk7CisKKyAgICBbd2ViVmlldyBl dmFsdWF0ZUphdmFTY3JpcHQ6QCJ0ZXN0TGluay5jbGljaygpIiBjb21wbGV0aW9uSGFuZGxlcjpu aWxdOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZmYWlsZWQpOworICAgIGZhaWxl ZCA9IGZhbHNlOworICAgIGRvbmUgPSBmYWxzZTsKKworICAgIEVYUEVDVF9FUSgzLCBudW1iZXJP ZkRlY2lkZVBvbGljeUNhbGxzKTsKKworICAgIC8vIFdlIHNob3VsZCBzdGlsbCBiZSBvbiBnb29n bGUuY29tLgorICAgIEVYUEVDVF9FUShwaWRBZnRlckZpcnN0TG9hZCwgW3dlYlZpZXcgX3dlYlBy b2Nlc3NJZGVudGlmaWVyXSk7CisgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5nb29n bGUuY29tL21haW4uaHRtbCIsIFtbd2ViVmlldyBVUkxdIGFic29sdXRlU3RyaW5nXSk7CisKKyAg ICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJ0ZXN0TGluay5pbm5lclRleHQiIGNvbXBs ZXRpb25IYW5kbGVyOiBbJl0gKGlkIGlubmVyVGV4dCwgTlNFcnJvciAqZXJyb3IpIHsKKyAgICAg ICAgRVhQRUNUX1dLX1NUUkVRKEAiTGluayIsIGlubmVyVGV4dCk7CisgICAgICAgIGRvbmUgPSB0 cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAg ZG9uZSA9IGZhbHNlOworfQorCitURVNUKFByb2Nlc3NTd2FwLCBDcm9zc1NpdGVEb3dubG9hZCkK K3sKKyAgICBhdXRvIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tfV0tQcm9j ZXNzUG9vbENvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBwcm9jZXNzUG9vbENvbmZp Z3VyYXRpb24uZ2V0KCkucHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uID0gWUVTOworICAgIGF1dG8g cHJvY2Vzc1Bvb2wgPSBhZG9wdE5TKFtbV0tQcm9jZXNzUG9vbCBhbGxvY10gX2luaXRXaXRoQ29u ZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKworICAgIGF1dG8g d2ViVmlld0NvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBh bGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRQcm9jZXNzUG9vbDpw cm9jZXNzUG9vbC5nZXQoKV07CisgICAgYXV0byBoYW5kbGVyID0gYWRvcHROUyhbW1BTT05TY2hl bWUgYWxsb2NdIGluaXRdKTsKKyAgICBbaGFuZGxlciBhZGRNYXBwaW5nRnJvbVVSTFN0cmluZzpA InBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiIHRvRGF0YTpsaW5rVG9XZWJLaXRCeXRl c107CisgICAgW2hhbmRsZXIgYWRkTWFwcGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3Lndl YmtpdC5vcmcvbWFpbi5odG1sIiB0b0RhdGE6IkhlbGxvIl07CisgICAgW3dlYlZpZXdDb25maWd1 cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBmb3JVUkxTY2hlbWU6QCJw c29uIl07CisKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBp bml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246d2Vi Vmlld0NvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBhdXRvIG5hdmlnYXRpb25EZWxlZ2F0ZSA9 IGFkb3B0TlMoW1tQU09OTmF2aWdhdGlvbkRlbGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgW3dl YlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOm5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKV07CisK KyAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJM OltOU1VSTCBVUkxXaXRoU3RyaW5nOkAicHNvbjovL3d3dy5nb29nbGUuY29tL21haW4uaHRtbCJd XTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRB UEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworICAgIGF1dG8gcGlkQWZ0 ZXJGaXJzdExvYWQgPSBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworCisgICAgc2hv dWxkQ29udmVydFRvRG93bmxvYWQgPSB0cnVlOworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNj cmlwdDpAInRlc3RMaW5rLmNsaWNrKCkiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07CisKKyAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmZhaWxlZCk7CisgICAgZmFpbGVkID0gZmFsc2U7Cisg ICAgc2hvdWxkQ29udmVydFRvRG93bmxvYWQgPSBmYWxzZTsKKworICAgIC8vIFdlIHNob3VsZCBz dGlsbCBiZSBvbiBnb29nbGUuY29tLgorICAgIEVYUEVDVF9FUShwaWRBZnRlckZpcnN0TG9hZCwg W3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7CisgICAgRVhQRUNUX1dLX1NUUkVRKEAi cHNvbjovL3d3dy5nb29nbGUuY29tL21haW4uaHRtbCIsIFtbd2ViVmlldyBVUkxdIGFic29sdXRl U3RyaW5nXSk7CisKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJ0ZXN0TGluay5p bm5lclRleHQiIGNvbXBsZXRpb25IYW5kbGVyOiBbJl0gKGlkIGlubmVyVGV4dCwgTlNFcnJvciAq ZXJyb3IpIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAiTGluayIsIGlubmVyVGV4dCk7Cisg ICAgICAgIGRvbmUgPSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1 bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworfQorCiBlbnVtIGNsYXNzIFNob3VsZEVuYWJs ZVBTT04geyBObywgWWVzIH07CiBzdGF0aWMgdm9pZCBydW5DbGllbnRTaWRlUmVkaXJlY3RUZXN0 KFNob3VsZEVuYWJsZVBTT04gc2hvdWxkRW5hYmxlUFNPTikKIHsKQEAgLTIyMzIsMTIgKzIzNDEs MjcgQEAgVEVTVChQcm9jZXNzU3dhcCwgUGFnZVNob3dIaWRlKQogCiAgICAgRVhQRUNUX0VRKDd1 LCBbcmVjZWl2ZWRNZXNzYWdlcyBjb3VudF0pOwogICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246 Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlc2hvdyBOT1QgcGVyc2lzdGVkIiwgcmVj ZWl2ZWRNZXNzYWdlcy5nZXQoKVswXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3 dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVz c2FnZXMuZ2V0KClbMV0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUu Y29tL21haW4uaHRtbCAtIHBhZ2VzaG93IE5PVCBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2Vz LmdldCgpWzJdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9t YWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNd KTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1s IC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs0XSk7Ci0gICAg RVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2Vo aWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0pOwotICAgIEVYUEVDVF9X S19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNp c3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAgIGlmIChbcmVjZWl2ZWRNZXNz YWdlcy5nZXQoKVsxXSBoYXNQcmVmaXg6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1s Il0pIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21h aW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0p OworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0 bWwgLSBwYWdlc2hvdyBOT1QgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7 CisgICAgfSBlbHNlIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBs ZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2Fn ZXMuZ2V0KClbMV0pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtp dC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5n ZXQoKVsyXSk7CisgICAgfQorICAgIGlmIChbcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSBoYXNQ cmVmaXg6QCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwiXSkgeworICAgICAgICBFWFBF Q1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlaGlkZSBw ZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKKyAgICAgICAgRVhQRUNUX1dL X1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNp c3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNF0pOworICAgIH0gZWxzZSB7CisgICAgICAg IEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdl c2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKKyAgICAgICAgRVhQ RUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZWhpZGUg cGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs0XSk7CisgICAgfQorICAgIGlmIChb cmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSBoYXNQcmVmaXg6QCJwc29uOi8vd3d3LndlYmtpdC5v cmcvbWFpbi5odG1sIl0pIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53 ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2Fn ZXMuZ2V0KClbNV0pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxl LmNvbS9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdl dCgpWzZdKTsKKyAgICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8v d3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1l c3NhZ2VzLmdldCgpWzVdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53 ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2Fn ZXMuZ2V0KClbNl0pOworICAgIH0KIH0KIAogLy8gRGlzYWJsaW5nIHRoZSBwYWdlIGNhY2hlIGV4 cGxpY2l0bHkgaXMgKGZvciBzb21lIHJlYXNvbikgbm90IGF2YWlsYWJsZSBvbiBpT1MuCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggMjFmNzc4ODI1ZDcxYjdmNjE2NTkyYzI2YzI5NzNhMDFkZjk4MDRmYy4uN2NkNzk2NGJlYjE3 NjNlNDE2ODlhNDk3OTMxOTdjNjgxMmRhMzVkNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5 LTAxLTE0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVz c2lvbihQU09OKSBWaWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRv d25sb2FkIGxpbmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE5MzM2MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2tpcCB0ZXN0IHRlc3Rpbmcg dGhlIGNyb3NzLXByb2Nlc3MgRE9NV2luZG93IEFQSSBhcyBJIGJyb2tlIGl0IHdpdGggdGhpcyBw YXRjaC4KKyAgICAgICAgVGhlIGZlYXR1cmUgaXMgZmFyIGZyb20gcmVhZHkgYW5kIG9mZiBieSBk ZWZhdWx0IGFueXdheS4gSSB3aWxsIGFkZCBzdXBwb3J0IGJhY2sKKyAgICAgICAgaW4gYSBmb2xs b3ctdXAuCisKKyAgICAgICAgKiBwbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAx OS0wMS0xMCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIzOTgyNS4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v d2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggOGU5NTllZGFmZmQ4OTI3ZWY5YzJhYWMzMTZlOWUz MTAwY2QxNDBjYi4uOWQ5MGJlOGI0OGU1N2M5NjBiY2RhNjg2Y2UyNDQwZDcxMzhiYjBmNiAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTczMyw4ICs3MzMs OCBAQCBodHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0YXRpc3RpY3MvcmVtb3ZlLWJsb2NraW5nLWlu LXJlZGlyZWN0Lmh0bWwgWyBTa2lwIF0KIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGlj cy9ub24tcHJldmFsZW50LXJlc291cmNlcy1jYW4tYWNjZXNzLWNvb2tpZXMtaW4tYS10aGlyZC1w YXJ0eS1jb250ZXh0Lmh0bWwgWyBTa2lwIF0KIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlz dGljcy9jYXAtY2FjaGUtbWF4LWFnZS1mb3ItcHJldmFsZW50LXJlc291cmNlLmh0bWwgWyBTa2lw IF0KIAotIyBQcm9jZXNzIHN3YXBwaW5nIGlzIG9ubHkgaW1wbGVtZW50ZWQgb24gV2ViS2l0Mi4K LWh0dHAvdGVzdHMvbmF2aWdhdGlvbi9wcm9jZXNzLXN3YXAtd2luZG93LW9wZW4uaHRtbCBbIFBh c3MgXQorIyBUaGlzIGZlYXR1cmUgaXMgY3VycmVudGx5IGRpc2FibGVkIGJ5IGRlZmF1bHQgYW5k IHVuZmluaXNoZWQgPHJkYXI6Ly9wcm9ibGVtLzM4OTI1MDc3Pi4KK2h0dHAvdGVzdHMvbmF2aWdh dGlvbi9wcm9jZXNzLXN3YXAtd2luZG93LW9wZW4uaHRtbCBbIFNraXAgXQogCiAjIENyb3NzLU9y aWdpbi1SZXNvdXJjZS1Qb2xpY3kgcmVzcG9uc2UgaGVhZGVyIGlzIG9ubHkgaW1wbGVtZW50ZWQg aW4gV2ViS2l0Mi4KIGh0dHAvd3B0L2Nyb3NzLW9yaWdpbi1yZXNvdXJjZS1wb2xpY3kvIFsgUGFz cyBdCg== 359088 2019-01-14 15:49:42 -0800 2019-01-14 16:06:44 -0800 Patch bug-193361-20190114154941.patch text/plain 100084 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5ODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Y4YjllNWYwMzU1YTQ0 MzU0Yjc4OTdlMTRhNjE0MDQwYzVmNWY0MC4uMzUwNjUyYjM0MzQ2YWUyYTU3MTkyODM2ZTZlMWI2 NGQ0MjI2MjhlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAxLTE0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBW aWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAg ICAgIFdoZW4gcmVzdG9yaW5nIGZyb20gUGFnZUNhY2hlLCBtYWtlIHN1cmUgd2Ugbm90aWZ5IHRo ZSBjbGllbnQgdGhhdCB0aGUgbG9hZCB3YXMgY29tbWl0dGVkCisgICAgICAgICpiZWZvcmUqIHdl IHRlbGwgaXQgdGhhdCB0aGUgbmF2aWdhdGlvbiBpcyBjb21wbGV0ZS4gVGhpcyB3b3VsZCBjb25m dXNlIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eQorICAgICAgICBsb2dpYyBpbiB0aGUgVUlQcm9j ZXNzLgorCiAyMDE5LTAxLTEwICBKdXN0aW4gRmFuICA8anVzdGluX2ZhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW1dlYkdQVV0gQWRkIEJpbmRHcm91cEJpbmRpbmcsIEJpbmRHcm91cERlc2NyaXB0 b3IsIGFuZCBCdWZmZXJCaW5kaW5nIGRpY3Rpb25hcmllcyBmcm9tIEFQSQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAw ZjAwYWJjZDhkYzUyZGViNmE3ZWViMTc2NmU4YjAxNjIxMDY1OGU2Li42NTg2NThhOTA1MDY3NzA2 OTdmM2IyNThlYTUzZjA3NjZkOWZiMDE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwMSBAQAorMjAx OS0wMS0xNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFJlZ3Jl c3Npb24oUFNPTikgVmlldyBiZWNvbWVzIGJsYW5rIGFmdGVyIGNsaWNrIGEgY3Jvc3Mtc2l0ZSBk b3dubG9hZCBsaW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTMzNjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBpc3N1ZSB0cmFja2Vk IGJ5IHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczIGlzIHRoYXQgYSBwcm92aXNpb25hbCBsb2FkIG1h eSBnZXQKKyAgICAgICAgY2FuY2VsZWQgKG9yIGNvbnZlcnRlZCBpbnRvIGEgZG93bmxvYWQpICph ZnRlciogd2UndmUgZGVjaWRlZCB0byBwcm9jZXNzLXN3YXAuCisgICAgICAgIEluIHN1Y2ggY2Fz ZXMsIHRoZSB2aWV3IHNob3VsZCBrZWVwIGRpc3BsYXlpbmcgdGhlIGN1cnJlbnQgc2l0ZSBhbmQg aXQgc2hvdWxkCisgICAgICAgIHN0aWxsIGJlIGludGVyYWN0aXZlLiBIb3dldmVyLCB3aXRoIHRo ZSBwcmV2aW91cyBQU09OIG1vZGVsLCB0aGUgdmlldyAocGFnZVByb3h5KQorICAgICAgICB3b3Vs ZCBoYXZlIGFscmVhZHkgc3dhcHBlZCB0byB0aGUgbmV3IHByb2Nlc3MgYW5kIHdvdWxkIGVuZCB1 cCBkaXNwbGF5aW5nIHRoZQorICAgICAgICBpbml0aWFsbHkgZW1wdHkgZG9jdW1lbnQuCisKKyAg ICAgICAgVG8gYWRkcmVzcyB0aGUgaXNzdWUsIHRoaXMgcGF0Y2ggaW50cm9kdWNlcyB0aGUgY29u Y2VwdCBvZiBhIHByb3Zpc2lvbmFsIGxvYWQKKyAgICAgICAgaW4gdGhlIFVJUHJvY2VzcywgaGFu ZGxlZCBieSBhIFByb3Zpc2lvbmFsUGFnZVByb3h5IHdoaWNoIGhhcyBpdHMgb3duIHByaXZpc2lv bmFsCisgICAgICAgIHByb2Nlc3MuIFRoZSBXZWJQYWdlUHJveHkgb3ducyB0aGUgUHJvdmlzaW9u YWxQYWdlUHJveHkgYnV0IHdlIGRvIG5vdCBjb21taXQgdGhlCisgICAgICAgIHByb3Zpc2lvbmFs IHBhZ2UgdW50aWwgYWZ0ZXIgdGhlIGxvYWQgd2FzIGNvbW1pdHRlZCBpbiB0aGUgbmV3IHByb2Nl c3MuIFRoaXMgbWVhbnMKKyAgICAgICAgdGhhdCB0aGUgdmlldyAvIFdlYlBhZ2VQcm94eSBrZWVw cyB1c2luZyB0aGUgb2xkIHByb2Nlc3MgYW5kIGRpc3BsYXlzIHRoZSBjdXJyZW50CisgICAgICAg IGNvbnRlbnQgdW50aWwgYSBsb2FkIGhhcyBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHBh Z2UuIElmIG5vIGxvYWQgY29tbWl0cworICAgICAgICBpbiB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vz cyAoZS5nLiBiZWNhdXNlIHRoZSBsb2FkIGlzIGNhbmNlbGxlZCBvciBjb252ZXJ0ZWQgaW50bwor ICAgICAgICBhIGRvd25sb2FkKSwgdGhlbiB3ZSBtZXJlbHkgZGVzdHJveSB0aGUgUHJvdmlzaW9u YWxQYWdlUHJveHkgYW5kIHRlcm1pbmF0ZSBpdHMKKyAgICAgICAgcHJvY2Vzcywgd2l0aG91dCBp bXBhY3RpbmcgdGhlIFdlYlBhZ2VQcm94eS4KKworICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVyczo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVycy5oOgorICAgICAgICBSZW5hbWUgaXNTd2FwRnJvbVN1c3BlbmRlZCB0byBpc1Byb2Nl c3NTd2FwIGZvciBjbGFyaXR5IGFzIHdlIGFsd2F5cyB3YW50IHRvCisgICAgICAgIGRlbGF5IGF0 dGFjaGluZyB0aGUgZHJhd2luZyBhcmVhIGluIGNhc2Ugb2YgYSBwcm9jZXNzLXN3YXAsIG5vIG1h dHRlciB3aGF0CisgICAgICAgIG5vdyB0aGF0IHRoZSBwcmV2aW91cyBwcm9jZXNzIGlzIGtlcHQg YWxpdmUgdW50aWwgdGhlIHByb3Zpc2lvbmFsIGxvYWQgaXMKKyAgICAgICAgY29tbWl0dGVkIGlu IHRoZSBuZXcgcHJvY2Vzcy4KKworICAgICAgICAqIFNoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaDoK KyAgICAgICAgRHJvcCBTdXNwZW5kIHBvbGljeSBhY3Rpb24uIEF0IGRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb24gdGltZSwgaW4gY2FzZSBvZgorICAgICAgICBwcm9jZXNzLXN3YXAsIHdl IG5vdyB0ZWxsIHRoZSBwcmV2aW91cyBwcm9jZXNzIHRvIHNpbXBseSBpZ25vcmUgdGhlIGxvYWQs IHdoaWxlCisgICAgICAgIHdlIGNyZWF0ZSBhIFByb3Zpc2lvbmFsUGFnZVByb3h5IHRvIGRvIHRo ZSBuZXcgbG9hZCBpbiBhIG5ldyBwcm9jZXNzLgorICAgICAgICBTdXNwZW5zaW9uIG9mIHRoZSBw cmV2aW91cyBwYWdlIGluIHRoZSBvbGQgcHJvY2VzcywgaGFwcGVucyBsYXRlciwgd2hlbiBhIGxv YWQKKyAgICAgICAgaXMgYWN0dWFsbHkgY29tbWl0dGVkIGluIHRoZSBuZXcgcHJvY2Vzcy4KKwor ICAgICAgICAqIFNvdXJjZXMudHh0OgorICAgICAgICBBZGQgbmV3IFByb3Zpc2lvbmFsUGFnZVBy b3h5IGZpbGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToK KyAgICAgICAgKC1bV0tXZWJWaWV3IF9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0YXRl XSk6CisgICAgICAgIFdoZW4gY2FsbGluZyBfa2lsbFdlYkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRT dGF0ZSBvbiBhIFdLV2ViVmlldywga2lsbCBib3RoIHRoZSBjdXJyZW50CisgICAgICAgIHByb2Nl c3MgYW5kIHRoZSBwcm92aXNpb25hbCBvbmUsIHRvIG1haW50YWluIHByZXZpb3VzIGJlaGF2aW9y IGluIG91ciBBUEkgdGVzdHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUNsaWVudC5oOgor ICAgICAgICBUaW55IGJ1aWxkIGZpeC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Qcm92aXNpb25h bFBhZ2VQcm94eS5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQ cm94eTo6UHJvdmlzaW9uYWxQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25h bFBhZ2VQcm94eTo6flByb3Zpc2lvbmFsUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OnRha2VEcmF3aW5nQXJlYSk6CisgICAgICAgIChXZWJLaXQ6OlBy b3Zpc2lvbmFsUGFnZVByb3h5OjpjYW5jZWwpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25h bFBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6bG9hZERhdGFXaXRoTmF2aWdhdGlvbik6CisgICAgICAgIChXZWJLaXQ6 OlByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKToKKyAgICAg ICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0pOgor ICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1l KToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlz aW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94 eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJL aXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2FnZSk6CisgICAgICAgIChX ZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlU3luY01lc3NhZ2UpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oOiBBZGRlZC4KKyAgICAgICAg KFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OnBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpQ cm92aXNpb25hbFBhZ2VQcm94eTo6bWFpbkZyYW1lIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6 UHJvdmlzaW9uYWxQYWdlUHJveHk6OnByb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBjb25zdCk6CisgICAg ICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpuYXZpZ2F0aW9uSUQgY29uc3QpOgor ICAgICAgICBBZGQgbmV3IFByb3Zpc2lvbmFsUGFnZVByb3h5IGNsYXNzIHRvIHdyYXAgdGhlIHBy b3Zpc2lvbmFsIGxvYWQgaW4gdGhlIG5ldyBwcm9jZXNzCisgICAgICAgIGFmdGVyIGEgc3dhcC4g VGhlIHByb3Zpc2lvbmFsIHBhZ2UgaXMgb3duZWQgYnkgdGhlIFdlYlBhZ2VQcm94eSBhbmQgd2Ug b25seSBjb21taXQKKyAgICAgICAgdGhlIHByb3Zpc2lvbmFsIHBhZ2Ugd2hlbiB0aGUgbG9hZCBp cyBjb21taXR0ZWQuIFVudGlsIHRoZW4sIHRoZSBXZWJQYWdlUHJveHkga2VlcHMKKyAgICAgICAg dXNpbmcgdGhlIG9sZCBwcm9jZXNzIGFuZCBkaXNwbGF5aW5nIHRoZSBjdXJyZW50IGNvbnRlbnQu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5Ojp+U3VzcGVuZGVkUGFnZVByb3h5KToKKyAgICAg ICAgKFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5Ojp1bnN1c3BlbmQpOgorICAgICAgICAoV2Vi S2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6OmRpZFByb2Nlc3NSZXF1ZXN0VG9TdXNwZW5kKToKKyAg ICAgICAgVW5yZWdpc3RlciB0aGUgU3VzcGVuZGVkUGFnZVByb3h5IGFzIGFuIElQQyBtZXNzYWdl IHJlY2VpdmVyIGEgbGl0dGxlIGJpdCBlYXJsaWVyCisgICAgICAgIHdoZW4gd2UncmUgZ29pbmcg dG8gdW5zdXNwZW5kIGl0LiBUaGlzIGF2b2lkcyBjb25mbGljdGluZyB3aXRoIHRoZSBQcm92aXNp b25hbFBhZ2VQcm94eQorICAgICAgICB3aGljaCB0cmllcyB0byByZWdpc3RlciBpdHNlbGYgYXMg YW4gSVBDIG1lc3NhZ2UgcmVjZWl2ZXIgZm9yIHRoZSBzYW1lIHBhZ2VJRCB3aGVuCisgICAgICAg IGEgcHJvY2Vzcy1zd2FwIG9jY3VycyBhbmQgd2UncmUgc3dpdGNoaW5nIHRvIGEgc3VzcGVuZGVk IHBhZ2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkZyYW1lUHJveHk6OmlzTWFpbkZyYW1lIGNvbnN0KToKKyAgICAgICAgV2Vi RnJhbWVQcm94eTo6aXNNYWluRnJhbWUoKSByZWxpZXMgb24gY2hlY2tpbmcgdGhhdCB0aGUgZnJh bWUgaXMgdGhlIFdlYlBhZ2VQcm94eSdzIG1fbWFpbkZyYW1lLgorICAgICAgICBOb3cgdGhhdCB0 aGUgV2ViUGFnZVByb3h5IGNhbiBoYXZlIGEgUHJvdmlzaW9uYWxQYWdlUHJveHksIGFsc28gY2hl Y2sgaWYgaXQgaXMgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5J3MKKyAgICAgICAgbV9tYWluRnJh bWUgdG8gbWFpbnRhaW4gcHJldmlvdXMgYmVoYXZpb3IuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpzd2FwVG9X ZWJQcm9jZXNzKToKKyAgICAgICAgc3dhcFRvV2ViUHJvY2VzcygpIG5vIGxvbmdlciB0YWtlcyBj YXJlIG9mIHVuc3VzcGVuZGluZyB0aGUgU3VzcGVuZGVkUGFnZSBiZWNhdXNlIHdlIG5vdyBjYWxs IHN3YXBUb1dlYlByb2Nlc3MoKQorICAgICAgICBsYXRlciwgd2hlbiBhIGxvYWQgaXMgYWN0dWFs bHkgY29tbWl0dGVkIGluIHRoZSBwcm92aXNpb25hbCBwYWdlIC8gcHJvY2Vzcy4gc3dhcFRvV2Vi UHJvY2VzcygpIG5vdyBhbHNvIG5lZWRzCisgICAgICAgIHRvIGluaXRpYWxpemUgc29tZSBkYXRh IG1lbWJlcnMgc3VjaCBhcyB0aGUgZHJhd2luZyBhcmVhIGFuZCB0aGUgbWFpbiBmcmFtZSBhcyBp dCBpcyB0cmFuc2ZlcnJpbmcgdGhlbSBvdmVyIGZyb20KKyAgICAgICAgdGhlIFByb3Zpc2lvbmFs UGFnZVByb3h5IHdoaWNoIHN0YXJ0ZWQgdGhlIHByb3Zpc2lvbmFsIGxvYWQuCisKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MpOgorICAg ICAgICBXZSBubyBsb25nZXIgbmVlZCBJc1N3YXBGcm9tU3VzcGVuZGVkIHBhcmFtZXRlciBhcyB0 aGlzIGlzIGNhbGxlZCBsYXRlciBub3csIGFmdGVyIGEgbG9hZCBoYXMgYWN0dWFsbHkgYmVlbgor ICAgICAgICBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHByb2Nlc3MuCisKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSk6CisgICAgICAgIC0gV2Ug bm8gbG9uZ2VyIG5lZWQgSXNTd2FwRnJvbVN1c3BlbmRlZCBwYXJhbWV0ZXIgYXMgdGhpcyBpcyBj YWxsZWQgbGF0ZXIgbm93LCBhZnRlciBhIGxvYWQgaGFzIGFjdHVhbGx5IGJlZW4KKyAgICAgICAg ICBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHByb2Nlc3MuCisgICAgICAgIC0gQWxzbyBk byBub3QgcmUtaW5pdGlhbGl6ZSBtX2RyYXdpbmdBcmVhIGlmIGl0IGlzIGFscmVhZHkgc2V0IGJl Y2F1c2Ugc3dhcFRvV2ViUHJvY2VzcygpIG5vdyB0cmFuc2ZlcnMgdGhlCisgICAgICAgICAgZHJh d2luZyBhcmVhIGZyb20gdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGJlZm9yZSBjYWxsaW5nIHRo aXMgbWV0aG9kLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3RX aXRoTmF2aWdhdGlvbik6CisgICAgICAgIE9ubHkgY2FsbCBzZXRQZW5kaW5nQVBJUmVxdWVzdFVS TCgpIGluIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oKSBvbmx5IGlmIFNob3VsZFRyZWF0QXND b250aW51aW5nTG9hZCBpcyBub3QKKyAgICAgICAgWWVzLiBUaGlzIGF2b2lkcyBoaXR0aW5nIHNv bWUgYXNzZXJ0aW9ucyBhcyB0aGlzIHdhcyBhbHJlYWR5IGNhbGxlZCBkdXJpbmcgdGhlIGZpcnN0 IEFQSSBjYWxsIGlmIG5lZWRlZC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJl Y2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uKToKKyAgICAgICAgSW4gY2FzZSBvZiBwcm9j ZXNzIHN3YXAsIHRlbGwgdGhlIHByZXZpb3VzIHByb2Nlc3MgdG8gaWdub3JlIHRoZSBsb2FkIGlu c3RlYWQgb2Ygc3VzcGVuZGluZyBpdCByaWdodCBhd2F5LgorICAgICAgICBTdXNwZW5zaW9uIG5v dyBoYXBwZW5zIGxhdGVyLCBvbmx5IGlmIHdlIGVuZCB1cCBjb21taXR0aW5nIHRoZSBwcm92aXNp b25hbCBsb2FkIGluIHRoZSBuZXcgcHJvY2Vzcy4KKyAgICAgICAgQWxzbyBkaXNjYXJkIHRoZSBT dXNwZW5kZWRQYWdlIGlmIGl0IGZhaWxlZCB0byBzdXNwZW5kICh3ZSBvbmx5IHJldXNlIGl0cyBw cm9jZXNzIGluIHRoaXMgY2FzZSkuIFRoaXMgdXNlZAorICAgICAgICB0byBoYXBwZW4gYSBiaXQg bGF0ZXIgYnV0IGl0IGlzIGNsZWFyZXIgaWYgd2UgZG8gdGhpcyBhcyBlYXJseSBhcyBwb3NzaWJs ZSBJIHRoaW5rLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y29tbWl0UHJvdmlz aW9uYWxQYWdlKToKKyAgICAgICAgV2hlbiB0aGUgbG9hZCBpcyBjb21taXR0ZWQgaW4gdGhlIG5l dyBwcm9jZXNzLCB3ZSBjYWxsIFdlYlBhZ2VQcm94eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKCku IEl0IHRha2VzIGNhcmUgb2Y6CisgICAgICAgIC0gQWN0dWFsbHkgc3dhcHBpbmcgdGhlIFdlYlBh Z2VQcm94eSB0byB0aGUgbmV3IHByb2Nlc3MgYnkgY2FsbGluZyBwcm9jZXNzRGlkVGVybWluYXRl KCkgLyBzd2FwVG9XZWJQcm9jZXNzKCkuCisgICAgICAgIC0gU3VzcGVuZGluZyB0aGUgY3VycmVu dCBwYWdlLgorICAgICAgICAtIExldHRpbmcgdGhlIGNsaWVudCBrbm93IHRoZSBsb2FkIGlzIGNv bWl0dGVkCisgICAgICAgIC0gRGVzdHJveSB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkuCisgICAg ICAgIFRoaXMgd29yayB1c2VkIHRvIGhhcHBlbiBlYXJsaWVyIGluIGNvbnRpbnVlTmF2aWdhdGlv bkluTmV3UHJvY2VzcygpLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y29udGlu dWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKToKKyAgICAgICAgTW92ZWQgc29tZSBvZiB0aGUgbG9n aWMgdG8gY29tbWl0UHJvdmlzaW9uYWxQYWdlKCkuIFdlIG5vdyBtZXJlbHkgc3RhcnQgdGhlIGxv YWQgaW4gYSBuZXcgUHJvdmlzaW9uYWxQYWdlUHJveHksCisgICAgICAgIHdpdGhvdXQgYWN0dWFs bHkgaGF2aW5nIHRoZSBXZWJQYWdlUHJveHkgc3dpdGNoIHRvIHRoZSBuZXcgcHJvY2VzcyB5ZXQu CisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVdpbmRvdyk6CisgICAgICAg IERyb3Agc29tZSBjb2RlIHRoYXQgaXMgbm8gbG9uZ2VyIG5lZWRlZCwgbm93IHRoYXQgdGhlIFBy b3Zpc2lvbmFsUGFnZVByb3h5IHRha2VzIGNhcmUgb2YgdGhpcy4KKworICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmRpZERlc3Ryb3lOYXZpZ2F0aW9uKToKKyAgICAgICAgT24gcHJvY2Vz cy1zd2FwLCB3aGVuIHRlbGxpbmcgdGhlIHByZXZpb3VzIHByb2Nlc3MgdG8gaWdub3JlIHRoZSBs b2FkIGFuZCBzdGFydGluZyB0aGUgbmV3IGxvYWQgaW4gYSBuZXcKKyAgICAgICAgUHJvdmlzaW9u YWxQYWdlUHJveHksIHRoZSBwcmV2aW91cyBXZWJQYWdlIGF0dGVtcHRzIHRvIGRlc3Ryb3kgdGhl IG5hdmlnYXRpb24uIEluIHRoaXMgY2FzZSwgd2UgaWdub3JlCisgICAgICAgIHRoZSBjYWxsIHNp bmNlIHRoZSBuYXZpZ2F0aW9uIGlzIG1lcmVseSB0YWtlbiBvdmVyIGJ5IHRoZSBQcm92aXNpb25h bFBhZ2VQcm94eS4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICBNb3ZlZCBzb21lIFBTT04gbG9naWMgdG8g dGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGluc3RlYWQuCisKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICBXaGVu IGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSgpIGlzIGNhbGxlZCBmb3IgYSBQcm92aXNp b25hbFBhZ2VQcm94eSwgZGVzdHJveSBpdC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYyk6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UpOgorICAgICAgICBDYXB0 dXJlIHRoZSBwcm9jZXNzIGluIHRoZSBsYW1iZGEsIHRvIG1ha2Ugc3VyZSB3ZSBzZW5kIHRoZSBw b2xpY3kgZGVjaXNpb24gdG8gdGhlIHNhbWUgcHJvY2VzcyB0aGF0CisgICAgICAgIGFza2VkIGZv ciBpdCwgc28gYXMgdG8gbm90IGdldCBjb25mdXNlZCBieSBwcm9jZXNzIHN3YXBzLgorCisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVzZXRTdGF0ZSk6CisgICAgICAgIERyb3Agc29t ZSBjb2RlIHRoYXQgaXMgbm8gbG9uZ2VyIG5lZWRlZC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycyk6CisgICAgICAgIE1vdmUgdGhlIGhhc1JlZ2lz dGVyZWRTZXJ2aWNlV29ya2VycyBmbGFnIGluaXRpYWxpemF0aW9uIGZyb20gdGhlIGNhbGwgc2l0 ZSB0byBoZXJlIG5vdyB0aGF0IHdlIGhhdmUKKyAgICAgICAgbW9yZSB0aGFuIG9uZSBjYWxsIHNp dGUuIFRoaXMgd2FzIGp1c3Qgc29tZSBiYWQgZmFjdG9yaW5nLgorCisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6UGFnZVByb2Nlc3NPdmVycmlkZSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6flBh Z2VQcm9jZXNzT3ZlcnJpZGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp0ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2Vz cyk6CisgICAgICAgIEFkZCB1dGlsaXR5IGNsYXNzIHRvIHRlbXBvcmFyaWx5IG92ZXJyaWRlIHRo ZSBXZWJQYWdlUHJveHkncyBtX3Byb2Nlc3Mgd2l0aCB0aGUgcHJvdmlzaW9uYWwgb25lIHdoZW4K KyAgICAgICAgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGludGVyYWN0cyB3aXRoIHRoZSBXZWJQ YWdlUHJveHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQg Y29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OnVwZGF0ZUJhY2tGb3J3 YXJkSXRlbSk6CisgICAgICAgIEJlZm9yZSB1cGRhdGluZyBhIEJhY2tGb3J3YXJkTGlzdEl0ZW0s IHdlIG5vcm1hbGx5IG1ha2Ugc3VyZSB0aGUgcHJvY2VzcyBoYXMgYSBXZWJQYWdlUHJveHkgd2l0 aCB0aGUKKyAgICAgICAgaXRlbSdzIHBhZ2VJRC4gV2UgaGF2ZSB0byB0d2VhayB0aGUgbG9naWMg YmVjYXVzZSB0aGVyZSBtYXkgbm93IGJlIG5vIFdlYlBhZ2VQcm94eSB3aXRoIHRoaXMgcGFnZUlE CisgICAgICAgIGFzc29jaWF0ZWQgd2l0aCB0aGlzIHByb2Nlc3MgeWV0LCBiZWNhdXNlIGl0IGlz IHN0aWxsIGEgUHJvdmlzaW9uYWxQYWdlUHJveHkuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzc1Byb3h5OjpjYW5UZXJtaW5hdGVDaGlsZFByb2Nlc3MpOgorICAgICAgICBEbyBub3QgdGVy bWluYXRlIHRoZSBXZWJQcm9jZXNzIGlmIHRoZXJlIGFyZSBQcm92aXNpb25hbFBhZ2VQcm94eSBv YmplY3RzIHVzaW5nIGl0LgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5o OgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OmFkZFByb3Zpc2lvbmFsUGFnZVBy b3h5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpyZW1vdmVQcm92aXNpb25h bFBhZ2VQcm94eSk6CisKKyAgICAgICAgKiBXZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv ajoKKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHA6CisgICAgICAg IChXZWJLaXQ6OnRvUG9saWN5QWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWU6OmRp ZFJlY2VpdmVQb2xpY3lEZWNpc2lvbik6CisgICAgICAgIFN0b3AgZGVhbGluZyB3aXRoIFdlYlBv bGljeUFjdGlvbjo6U3VzcGVuZCBhcyBpdCBubyBsb25nZXIgZXhpc3RzLgorCisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl OjpyZWluaXRpYWxpemVXZWJQYWdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZGlkUmVj ZWl2ZVBvbGljeURlY2lzaW9uKToKKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRJc1N1 c3BlbmRlZCk6CisgICAgICAgIFN1c3BlbmQgdGhlIFBhZ2Ugd2hlbiBzZXRJc1N1c3BlbmRlZCh0 cnVlKSBpcyBjYWxsZWQsIG5vdyB0aGF0IHRoZXJlIGlzIG5vIGxvbmdlciBhIFdlYlBvbGljeUFj dGlvbjo6U3VzcGVuZC4KKyAgICAgICAgc2V0SXNTdXNwZW5kZWQodHJ1ZSkgSVBDIGlzIHNlbnQg d2hlbiB3ZSBhY3R1YWxseSBjb21taXQgdGhlIHByb3Zpc2lvbmFsIHBhZ2UuCisKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1t OgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6VGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEpOgorCiAyMDE5LTAxLTEwICBBbGV4IENocmlzdGVuc2Vu ICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjM5ODE1 KSBodHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9zZXJ2aWNld29ya2VyLXByaXZhdGUtYnJvd3Np bmcuaHR0cHMuaHRtbCB0ZXN0IHRpbWVzIG91dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5jcHAKaW5kZXggNGMyNmE2OTgxYjQ2NGRhNTkxNmYwNWViNzM1OTY2OTE1N2VlOWZmZS4uZWJm OTUwYmE2YzJlZDkxZjYyMzJiZDJiNWVmYjlmNzk1NTdhYjU4ZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0yMDMyLDExICsyMDMyLDExIEBAIHZvaWQgRnJhbWVMb2Fk ZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCgpCiAKICAgICAgICAgT3B0aW9uYWw8SGFzSW5zZWN1 cmVDb250ZW50PiBoYXNJbnNlY3VyZUNvbnRlbnQgPSBjYWNoZWRQYWdlLT5jYWNoZWRNYWluRnJh bWUoKS0+aGFzSW5zZWN1cmVDb250ZW50KCk7CiAKKyAgICAgICAgZGlzcGF0Y2hEaWRDb21taXRM b2FkKGhhc0luc2VjdXJlQ29udGVudCk7CisKICAgICAgICAgLy8gRklYTUU6IFRoaXMgQVBJIHNo b3VsZCBiZSB0dXJuZWQgYXJvdW5kIHNvIHRoYXQgd2UgZ3JvdW5kIENhY2hlZFBhZ2UgaW50byB0 aGUgUGFnZS4KICAgICAgICAgY2FjaGVkUGFnZS0+cmVzdG9yZSgqbV9mcmFtZS5wYWdlKCkpOwog Ci0gICAgICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOwotCiAj aWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICAgICAgbV9mcmFtZS5wYWdlKCktPmNocm9tZSgp LnNldERpc3BhdGNoVmlld3BvcnREYXRhRGlkQ2hhbmdlU3VwcHJlc3NlZChmYWxzZSk7CiAgICAg ICAgIG1fZnJhbWUucGFnZSgpLT5jaHJvbWUoKS5kaXNwYXRjaFZpZXdwb3J0UHJvcGVydGllc0Rp ZENoYW5nZShtX2ZyYW1lLnBhZ2UoKS0+dmlld3BvcnRBcmd1bWVudHMoKSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcCBiL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCmluZGV4IGNh MmRmNDBlZTFkZDJjYTM2ZjNhNDhhMDQ3NTdmOTdiZGJiNjM2NDcuLjZkMDdjMDNhZDhjOTI3ZTU0 NTNjNWZkYTk1OTY3MDlhNzcyNjFlMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVk L1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVk L1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCkBAIC03Myw3ICs3Myw3IEBAIHZvaWQgV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKElQQzo6RW5jb2RlciYgZW5jb2RlcikgY29u c3QKICAgICBlbmNvZGVyLmVuY29kZUVudW0obGF5ZXJIb3N0aW5nTW9kZSk7CiAgICAgZW5jb2Rl ciA8PCBtaW1lVHlwZXNXaXRoQ3VzdG9tQ29udGVudFByb3ZpZGVyczsKICAgICBlbmNvZGVyIDw8 IGNvbnRyb2xsZWRCeUF1dG9tYXRpb247Ci0gICAgZW5jb2RlciA8PCBpc1N3YXBGcm9tU3VzcGVu ZGVkOworICAgIGVuY29kZXIgPDwgaXNQcm9jZXNzU3dhcDsKIAogI2lmIFBMQVRGT1JNKE1BQykK ICAgICBlbmNvZGVyIDw8IGNvbG9yU3BhY2U7CkBAIC0yMjcsNyArMjI3LDcgQEAgT3B0aW9uYWw8 V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycz4gV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZGVj b2RlKElQQzo6RGVjb2QKICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKICAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuY29udHJvbGxlZEJ5QXV0b21hdGlvbikpCiAgICAgICAg IHJldHVybiBXVEY6Om51bGxvcHQ7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJz LmlzU3dhcEZyb21TdXNwZW5kZWQpKQorICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVy cy5pc1Byb2Nlc3NTd2FwKSkKICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAogI2lmIFBM QVRGT1JNKE1BQykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVh dGlvblBhcmFtZXRlcnMuaCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBh cmFtZXRlcnMuaAppbmRleCBhZTQzMjVjYmQ1ZjFlNTY3NjE2NTg2ZjVlOWZhNzNlZTViMzViOTM3 Li5iMzgyY2VlZGQ0NDlhOGQ5YTBmODY5NDczNWYyNmMwNTk1ZGRlY2Q4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgKKysrIGIvU291 cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCkBAIC0xMjksNyAr MTI5LDcgQEAgc3RydWN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMgewogICAgIFZlY3RvcjxT dHJpbmc+IG1pbWVUeXBlc1dpdGhDdXN0b21Db250ZW50UHJvdmlkZXJzOwogCiAgICAgYm9vbCBj b250cm9sbGVkQnlBdXRvbWF0aW9uOwotICAgIGJvb2wgaXNTd2FwRnJvbVN1c3BlbmRlZCB7IGZh bHNlIH07CisgICAgYm9vbCBpc1Byb2Nlc3NTd2FwIHsgZmFsc2UgfTsKIAogI2lmIFBMQVRGT1JN KE1BQykKICAgICBDb2xvclNwYWNlRGF0YSBjb2xvclNwYWNlOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9X ZWJQb2xpY3lBY3Rpb24uaAppbmRleCAxNDJhNTE4ZGYwOTdlNWVmMmZhMTgwNDg0ZTA5ZDAzMzNj MTA1YjgxLi4zOTcxNzk1YzQ2YTUxYjM4ODE4YzU1Yjc2ZDY1M2EzNGI1Mjg5ZTljIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaApAQCAtMjksMTEgKzI5LDExIEBACiAKIG5h bWVzcGFjZSBXZWJLaXQgewogCisvLyBGSVhNRTogUmVtb3ZlIHRoaXMgdHlwZSBhbmQgdXNlIFdl YkNvcmU6OlBvbGljeUFjdGlvbiBpbnN0ZWFkLgogZW51bSBjbGFzcyBXZWJQb2xpY3lBY3Rpb24g OiB1aW50OF90IHsKICAgICBVc2UsCiAgICAgRG93bmxvYWQsCi0gICAgSWdub3JlLAotICAgIFN1 c3BlbmQKKyAgICBJZ25vcmUKIH07CiAKIH0KQEAgLTQ1LDggKzQ1LDcgQEAgdGVtcGxhdGU8PiBz dHJ1Y3QgRW51bVRyYWl0czxXZWJLaXQ6OldlYlBvbGljeUFjdGlvbj4gewogICAgICAgICBXZWJL aXQ6OldlYlBvbGljeUFjdGlvbiwKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OlVz ZSwKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OkRvd25sb2FkLAotICAgICAgICBX ZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6SWdub3JlLAotICAgICAgICBXZWJLaXQ6OldlYlBvbGlj eUFjdGlvbjo6U3VzcGVuZAorICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6SWdub3Jl CiAgICAgPjsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQgYi9T b3VyY2UvV2ViS2l0L1NvdXJjZXMudHh0CmluZGV4IGEwYjZmNzI4NDYwNDFjMjYzYTU0NzY3MTBl YWM5ODdmZWQxZDE2MDQuLjhhZWNiODY0NzI1MDJkMDI3YTM0YWYzNzE5ZGQ4MjhiMDA3ZGIxMTYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQKKysrIGIvU291cmNlL1dlYktp dC9Tb3VyY2VzLnR4dApAQCAtMjMwLDYgKzIzMCw3IEBAIFVJUHJvY2Vzcy9JbnNwZWN0b3JUYXJn ZXRQcm94eS5jcHAKIFVJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmNwcAogVUlQcm9jZXNzL1Byb2Nl c3NBc3NlcnRpb24uY3BwCiBVSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5jcHAKK1VJUHJvY2Vz cy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAKIFVJUHJvY2Vzcy9SZW1vdGVXZWJJbnNwZWN0b3JQ cm94eS5jcHAKIFVJUHJvY2Vzcy9SZXNwb25zaXZlbmVzc1RpbWVyLmNwcAogVUlQcm9jZXNzL1Nl cnZpY2VXb3JrZXJQcm9jZXNzUHJveHkuY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCBjZjE5MTljOTNhNzM4NTMwNzU5ZTM3ZjMzZGJi MTBiNGNkMDQ1ODc4Li5jNzlmY2IyMTBiNTE1NTUwODhlMWRmODZmY2E5NjU1MWM2MzJhOGQ1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAg LTQ0LDYgKzQ0LDcgQEAKICNpbXBvcnQgIk5hdmlnYXRpb25TdGF0ZS5oIgogI2ltcG9ydCAiT2Jq Q09iamVjdEdyYXBoLmgiCiAjaW1wb3J0ICJQYWdlQ2xpZW50LmgiCisjaW1wb3J0ICJQcm92aXNp b25hbFBhZ2VQcm94eS5oIgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJUcmVlU2Nyb2xsaW5nUGVyZm9y bWFuY2VEYXRhLmgiCiAjaW1wb3J0ICJSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5oIgogI2lt cG9ydCAiUmVtb3RlT2JqZWN0UmVnaXN0cnkuaCIKQEAgLTQ2NjQsNiArNDY2NSwxMSBAQCAtICh2 b2lkKV9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0YXRlCiB7CiAgICAgUmVmPFdlYktp dDo6V2ViUHJvY2Vzc1Byb3h5PiBwcm90ZWN0ZWRQcm9jZXNzUHJveHkoX3BhZ2UtPnByb2Nlc3Mo KSk7CiAgICAgcHJvdGVjdGVkUHJvY2Vzc1Byb3h5LT5yZXF1ZXN0VGVybWluYXRpb24oV2ViS2l0 OjpQcm9jZXNzVGVybWluYXRpb25SZWFzb246OlJlcXVlc3RlZEJ5Q2xpZW50KTsKKworICAgIGlm IChhdXRvKiBwcm92aXNpb25hbFBhZ2VQcm94eSA9IF9wYWdlLT5wcm92aXNpb25hbFBhZ2VQcm94 eSgpKSB7CisgICAgICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nlc3NQcm94eT4gcHJvdGVjdGVkUHJv Y2Vzc1Byb3h5KHByb3Zpc2lvbmFsUGFnZVByb3h5LT5wcm9jZXNzKCkpOworICAgICAgICBwcm90 ZWN0ZWRQcm9jZXNzUHJveHktPnJlcXVlc3RUZXJtaW5hdGlvbihXZWJLaXQ6OlByb2Nlc3NUZXJt aW5hdGlvblJlYXNvbjo6UmVxdWVzdGVkQnlDbGllbnQpOworICAgIH0KIH0KIAogI2lmIFBMQVRG T1JNKE1BQykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VDbGllbnQu aCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAppbmRleCAwYjg1OGM0NmVl NDc0ZDY5NmRkYzNkNDM1YmQ1NGMxMzIzMDAzYzJkLi42ZjNkZjg0NTJiMzFlMzRlYjdmYWY0YWNk MGZkN2UwNDdlZTlmMDc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdl Q2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCkBAIC00 OCw2ICs0OCw3IEBACiAKIE9CSkNfQ0xBU1MgQ0FMYXllcjsKIE9CSkNfQ0xBU1MgTlNGaWxlV3Jh cHBlcjsKK09CSkNfQ0xBU1MgTlNNZW51OwogT0JKQ19DTEFTUyBOU1NldDsKIE9CSkNfQ0xBU1Mg V0tEcmF3aW5nVmlldzsKIE9CSkNfQ0xBU1MgX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uNzlmNTIzNjY1NjQ2ZWFiNDE4NjIyNjY5NzY4ZThlZDM4NmQyYjM5MwotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmNw cApAQCAtMCwwICsxLDMwNSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxOSBBcHBsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBz b3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24s IGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAq IGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRh aW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0 aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25z IGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBw cm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQ Uk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICog QU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9U IExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElU WSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVE LiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJF IExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVY RU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9U IExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJ Q0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVS UlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBX SEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVE SU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBP RiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNp bmNsdWRlICJQcm92aXNpb25hbFBhZ2VQcm94eS5oIgorCisjaW5jbHVkZSAiQVBJTmF2aWdhdGlv bi5oIgorI2luY2x1ZGUgIkRyYXdpbmdBcmVhUHJveHkuaCIKKyNpbmNsdWRlICJMb2dnaW5nLmgi CisjaW5jbHVkZSAiUGFnZUNsaWVudC5oIgorI2luY2x1ZGUgIldlYkJhY2tGb3J3YXJkTGlzdC5o IgorI2luY2x1ZGUgIldlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uaCIKKyNpbmNsdWRlICJXZWJFcnJv cnMuaCIKKyNpbmNsdWRlICJXZWJOYXZpZ2F0aW9uU3RhdGUuaCIKKyNpbmNsdWRlICJXZWJQYWdl TWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQYWdlUHJveHkuaCIKKyNpbmNsdWRlICJXZWJQYWdl UHJveHlNZXNzYWdlcy5oIgorI2luY2x1ZGUgIldlYlByb2Nlc3NNZXNzYWdlcy5oIgorI2luY2x1 ZGUgIldlYlByb2Nlc3NQcm94eS5oIgorI2luY2x1ZGUgPFdlYkNvcmUvU2hvdWxkVHJlYXRBc0Nv bnRpbnVpbmdMb2FkLmg+CisKK25hbWVzcGFjZSBXZWJLaXQgeworCisjZGVmaW5lIFJFTEVBU0Vf TE9HX0lGX0FMTE9XRUQoY2hhbm5lbCwgZm10LCAuLi4pIFJFTEVBU0VfTE9HX0lGKG1fcGFnZS5p c0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQoKSwgY2hhbm5lbCwgIiVwIC0gUHJvdmlzaW9uYWxQYWdl UHJveHk6OiIgZm10LCB0aGlzLCAjI19fVkFfQVJHU19fKQorCitQcm92aXNpb25hbFBhZ2VQcm94 eTo6UHJvdmlzaW9uYWxQYWdlUHJveHkoV2ViUGFnZVByb3h5JiBwYWdlLCBSZWY8V2ViUHJvY2Vz c1Byb3h5PiYmIHByb2Nlc3MsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+IHN1 c3BlbmRlZFBhZ2UsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgYm9vbCBpc1NlcnZlclJlZGlyZWN0 LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFByb2Nlc3NTd2FwUmVx dWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCkKKyAgICA6IG1fcGFn ZShwYWdlKQorICAgICwgbV9wcm9jZXNzKFdURk1vdmUocHJvY2VzcykpCisgICAgLCBtX25hdmln YXRpb25JRChuYXZpZ2F0aW9uSUQpCisgICAgLCBtX2lzU2VydmVyUmVkaXJlY3QoaXNTZXJ2ZXJS ZWRpcmVjdCkKKyAgICAsIG1fcmVxdWVzdChyZXF1ZXN0KQorICAgICwgbV9wcm9jZXNzU3dhcFJl cXVlc3RlZEJ5Q2xpZW50KHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpCisjaWYgUExBVEZP Uk0oSU9TX0ZBTUlMWSkKKyAgICAsIG1fc3VzcGVuc2lvblRva2VuKG1fcHJvY2Vzcy0+dGhyb3R0 bGVyKCkuYmFja2dyb3VuZEFjdGl2aXR5VG9rZW4oKSkKKyNlbmRpZgoreworICAgIG1fcHJvY2Vz cy0+YWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNl aXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpLCAqdGhpcyk7CisgICAgbV9wcm9jZXNzLT5hZGRQ cm92aXNpb25hbFBhZ2VQcm94eSgqdGhpcyk7CisKKyAgICAvLyBJZiB3ZSBhcmUgcmVhdHRhY2hp bmcgdG8gYSBTdXNwZW5kZWRQYWdlLCB0aGVuIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdlIGFscmVh ZHkgZXhpc3RzIGFuZAorICAgIC8vIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKCkg d2lsbCBub3QgYmUgY2FsbGVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUuIEluIHN1Y2gKKyAg ICAvLyBjYXNlLCB3ZSBuZWVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUgdG8gcmVmbGVjdCB0 aGUgZmFjdCB0aGUgdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UKKyAgICAvLyBhbHJlYWR5IGV4aXN0 cyBhbmQgYWxyZWFkeSBoYXMgYSBtYWluIGZyYW1lLgorICAgIGlmIChzdXNwZW5kZWRQYWdlKSB7 CisgICAgICAgIEFTU0VSVCgmc3VzcGVuZGVkUGFnZS0+cHJvY2VzcygpID09IG1fcHJvY2Vzcy5w dHIoKSk7CisgICAgICAgIHN1c3BlbmRlZFBhZ2UtPnVuc3VzcGVuZCgpOworICAgICAgICBtX21h aW5GcmFtZSA9IFdlYkZyYW1lUHJveHk6OmNyZWF0ZShtX3BhZ2UsIHN1c3BlbmRlZFBhZ2UtPm1h aW5GcmFtZUlEKCkpOworICAgICAgICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChzdXNwZW5kZWRQ YWdlLT5tYWluRnJhbWVJRCgpLCAqbV9tYWluRnJhbWUpOworICAgIH0KKworICAgIGluaXRpYWxp emVXZWJQYWdlKCk7Cit9CisKK1Byb3Zpc2lvbmFsUGFnZVByb3h5Ojp+UHJvdmlzaW9uYWxQYWdl UHJveHkoKQoreworICAgIG1fcHJvY2Vzcy0+cmVtb3ZlUHJvdmlzaW9uYWxQYWdlUHJveHkoKnRo aXMpOworCisgICAgaWYgKG1fd2FzQ29tbWl0dGVkKQorICAgICAgICByZXR1cm47CisKKyAgICBt X3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5Ojpt ZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgbV9wcm9jZXNzLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpDbG9zZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAg aWYgKG1fZHJhd2luZ0FyZWEpIHsKKyAgICAgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0g bV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgICAgIG1f ZHJhd2luZ0FyZWEgPSBudWxscHRyOworICAgIH0KKworICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNw YXRjaChbcHJvY2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCldIHsKKyAgICAgICAgcHJvY2Vzcy0+ bWF5YmVTaHV0RG93bigpOworICAgIH0pOworfQorCitzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0Fy ZWFQcm94eT4gUHJvdmlzaW9uYWxQYWdlUHJveHk6OnRha2VEcmF3aW5nQXJlYSgpCit7CisgICAg cmV0dXJuIFdURk1vdmUobV9kcmF3aW5nQXJlYSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdl UHJveHk6OmNhbmNlbCgpCit7CisgICAgLy8gSWYgdGhlIHByb3Zpc2lvbmFsIGxvYWQgc3RhcnRl ZCwgdGhlbiBpbmRpY2F0ZSB0aGF0IGl0IGZhaWxlZCBkdWUgdG8gY2FuY2VsbGF0aW9uIGJ5IGNh bGxpbmcgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKCkuCisgICAgaWYgKG1fcHJvdmlz aW9uYWxMb2FkVVJMLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJjYW5jZWw6IFNpbXVsYXRpbmcgYSBkaWRG YWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUgZm9yIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wYWdl LnBhZ2VJRCgpKTsKKyAgICBBU1NFUlQobV9tYWluRnJhbWUpOworICAgIGF1dG8gZXJyb3IgPSBX ZWJLaXQ6OmNhbmNlbGxlZEVycm9yKG1fcmVxdWVzdCk7CisgICAgZXJyb3Iuc2V0VHlwZShXZWJD b3JlOjpSZXNvdXJjZUVycm9yOjpUeXBlOjpDYW5jZWxsYXRpb24pOworICAgIGRpZEZhaWxQcm92 aXNpb25hbExvYWRGb3JGcmFtZShtX21haW5GcmFtZS0+ZnJhbWVJRCgpLCB7IH0sIG1fbmF2aWdh dGlvbklELCBtX3Byb3Zpc2lvbmFsTG9hZFVSTCwgZXJyb3IsIFVzZXJEYXRhIHsgfSk7IC8vIFdp bGwgZGVsZXRlIHx0aGlzfC4KK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6cHJvY2Vz c0RpZEZpbmlzaExhdW5jaGluZygpCit7CisgICAgZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFm dGVyUHJvY2Vzc0xhdW5jaCgpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpmaW5p c2hJbml0aWFsaXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNoKCkKK3sKKyAgICBBU1NFUlQo bV9wcm9jZXNzLT5zdGF0ZSgpID09IFdlYlByb2Nlc3NQcm94eTo6U3RhdGU6OlJ1bm5pbmcpOwor CisgICAgLy8gRklYTUU6IFRoZSBXZWJQYWdlUHJveHkgZGVsYXlzIGFkZGluZyB0aGUgdmlzaXRl ZCBsaW5rIHN0b3JlIHVudGlsIGFmdGVyIHRoZSBwcm9jZXNzIGhhcyBsYXVuY2hlZAorICAgIC8v IHNvIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eSBkb2VzIHRoZSBzYW1lLiBIb3dldmVyLCBkbyB3 ZSByZWFsbHkgbmVlZCB0bz8KKyAgICBtX3Byb2Nlc3MtPmFkZFZpc2l0ZWRMaW5rU3RvcmUobV9w YWdlLnZpc2l0ZWRMaW5rU3RvcmUoKSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6 OmluaXRpYWxpemVXZWJQYWdlKCkKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBt X3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBtX2RyYXdp bmdBcmVhID0gbV9wYWdlLnBhZ2VDbGllbnQoKS5jcmVhdGVEcmF3aW5nQXJlYVByb3h5KCk7CisK KyAgICBhdXRvIHBhcmFtZXRlcnMgPSBtX3BhZ2UuY3JlYXRpb25QYXJhbWV0ZXJzKCk7CisgICAg cGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwID0gdHJ1ZTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlByb2Nlc3M6OkNyZWF0ZVdlYlBhZ2UobV9wYWdlLnBhZ2VJRCgpLCBwYXJhbWV0 ZXJzKSwgMCk7CisKKyAgICBpZiAobV9wcm9jZXNzLT5zdGF0ZSgpID09IFdlYlByb2Nlc3NQcm94 eTo6U3RhdGU6OlJ1bm5pbmcpCisgICAgICAgIGZpbmlzaEluaXRpYWxpemluZ1dlYlBhZ2VBZnRl clByb2Nlc3NMYXVuY2goKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6bG9hZERh dGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIGNvbnN0IElQQzo6 RGF0YVJlZmVyZW5jZSYgZGF0YSwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5n JiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEs IE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQoreworICAg IGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJv Y2VzcyhtX3Byb2Nlc3MpOworICAgIG1fcGFnZS5sb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKG5hdmln YXRpb24sIGRhdGEsIE1JTUVUeXBlLCBlbmNvZGluZywgYmFzZVVSTCwgdXNlckRhdGEsIFdlYkNv cmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNpdGVQb2xp Y2llcykpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhO YXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0JiYgcmVxdWVzdCwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSBz aG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIE9wdGlv bmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQoreworICAgIGF1dG8g cGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2Vzcyht X3Byb2Nlc3MpOworICAgIG1fcGFnZS5sb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRp b24sIFdURk1vdmUocmVxdWVzdCksIHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIHVzZXJE YXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3 ZWJzaXRlUG9saWNpZXMpKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6Z29Ub0Jh Y2tGb3J3YXJkSXRlbShBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0mIGl0ZW0sIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBv bGljaWVzKQoreworICAgIGF1dG8gaXRlbVN0YXRlcyA9IG1fcGFnZS5iYWNrRm9yd2FyZExpc3Qo KS5maWx0ZXJlZEl0ZW1TdGF0ZXMoW3RoaXMsIHRhcmdldEl0ZW0gPSAmaXRlbV0oYXV0byYgaXRl bSkgeworICAgICAgICBpZiAoYXV0byogcGFnZSA9IGl0ZW0uc3VzcGVuZGVkUGFnZSgpKSB7Cisg ICAgICAgICAgICBpZiAoJnBhZ2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpCisgICAg ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CisgICAgICAgIHJldHVybiAmaXRl bSAhPSB0YXJnZXRJdGVtOworICAgIH0pOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6VXBkYXRlQmFja0ZvcndhcmRMaXN0Rm9yUmVhdHRhY2goV1RGTW92ZShpdGVtU3Rh dGVzKSksIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtKG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIGl0 ZW0uaXRlbUlEKCksICpuYXZpZ2F0aW9uLmJhY2tGb3J3YXJkRnJhbWVMb2FkVHlwZSgpLCBXZWJD b3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9s aWNpZXMpKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKyAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNz VGltZXIoKS5zdGFydCgpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVh dGVNYWluRnJhbWUodWludDY0X3QgZnJhbWVJRCkKK3sKKyAgICBSRUxFQVNFX0xPR19JRl9BTExP V0VEKFByb2Nlc3NTd2FwcGluZywgImRpZENyZWF0ZU1haW5GcmFtZTogcGFnZUlEID0gJSIgUFJJ dTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSwgZnJhbWVJRCk7Cisg ICAgQVNTRVJUKCFtX21haW5GcmFtZSk7CisKKyAgICBtX21haW5GcmFtZSA9IFdlYkZyYW1lUHJv eHk6OmNyZWF0ZShtX3BhZ2UsIGZyYW1lSUQpOworCisgICAgLy8gQWRkIHRoZSBmcmFtZSB0byB0 aGUgcHJvY2VzcyB3aWRlIG1hcC4KKyAgICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChmcmFtZUlE LCAqbV9tYWluRnJhbWUpOworCisgICAgLy8gVGhpcyBuYXZpZ2F0aW9uIHdhcyBkZXN0cm95ZWQg c28gbm8gbmVlZCB0byBub3RpZnkgb2YgcmVkaXJlY3QuCisgICAgaWYgKCFtX3BhZ2UubmF2aWdh dGlvblN0YXRlKCkuaGFzTmF2aWdhdGlvbihtX25hdmlnYXRpb25JRCkpCisgICAgICAgIHJldHVy bjsKKworICAgIC8vIFJlc3RvcmUgdGhlIG1haW4gZnJhbWUncyBjb21taXR0ZWQgVVJMIGFzIHNv bWUgY2xpZW50cyBtYXkgcmVseSBvbiBpdCB1bnRpbCB0aGUgbmV4dCBsb2FkIGlzIGNvbW1pdHRl ZC4KKyAgICBpZiAoYXV0byogbWFpbkZyYW1lID0gbV9wYWdlLm1haW5GcmFtZSgpKQorICAgICAg ICBtX21haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5zZXRVUkwobWFpbkZyYW1lLT5mcmFtZUxv YWRTdGF0ZSgpLnVybCgpKTsKKworICAgIC8vIE5vcm1hbGx5LCBub3RpZmljYXRpb24gb2YgYSBz ZXJ2ZXIgcmVkaXJlY3QgY29tZXMgZnJvbSB0aGUgV2ViQ29udGVudCBwcm9jZXNzLgorICAgIC8v IElmIHdlIGFyZSBwcm9jZXNzIHN3YXBwaW5nIGluIHJlc3BvbnNlIHRvIGEgc2VydmVyIHJlZGly ZWN0IHRoZW4gdGhhdCBub3RpZmljYXRpb24gd2lsbCBub3QgY29tZSBmcm9tIHRoZSBuZXcgV2Vi Q29udGVudCBwcm9jZXNzLgorICAgIC8vIEluIHRoaXMgY2FzZSB3ZSBoYXZlIHRoZSBVSVByb2Nl c3Mgc3ludGhlc2l6ZSB0aGUgcmVkaXJlY3Qgbm90aWZpY2F0aW9uIGF0IHRoZSBhcHByb3ByaWF0 ZSB0aW1lLgorICAgIGlmIChtX2lzU2VydmVyUmVkaXJlY3QpIHsKKyAgICAgICAgbV9tYWluRnJh bWUtPmZyYW1lTG9hZFN0YXRlKCkuZGlkU3RhcnRQcm92aXNpb25hbExvYWQobV9yZXF1ZXN0LnVy bCgpKTsKKworICAgICAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9y YXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICAgICAgbV9wYWdlLmRpZFJlY2Vp dmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKG1fbWFpbkZyYW1lLT5m cmFtZUlEKCksIG1fbmF2aWdhdGlvbklELCBXVEZNb3ZlKG1fcmVxdWVzdCksIHsgfSk7CisgICAg fQorfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9h ZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYg dXJsLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQorewor ICAgIC8vIElmIHRoZSBwcmV2aW91cyBwcm92aXNpb25hbCBsb2FkIHVzZWQgdGhlIHNhbWUgcHJv Y2Vzcywgd2UgbWF5IHJlY2VpdmUgSVBDIGZvciB0aGlzIHByZXZpb3VzIHByb3Zpc2lvbmFsJ3Mg bWFpbiBmcmFtZSB0aGF0IHdlIG5lZWQgdG8gaWdub3JlLgorICAgIGlmICghbV9tYWluRnJhbWUg fHwgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSAhPSBmcmFtZUlEKQorICAgICAgICByZXR1cm47CisK KyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yRnJhbWU6IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIg UFJJdTY0ICIsIG5hdmlnYXRpb25JRCA9ICUiIFBSSXU2NCwgbV9wYWdlLnBhZ2VJRCgpLCBmcmFt ZUlELCBuYXZpZ2F0aW9uSUQpOworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFsTG9hZFVSTC5pc051 bGwoKSk7CisgICAgbV9wcm92aXNpb25hbExvYWRVUkwgPSB1cmw7CisKKyAgICAvLyBNZXJlbHkg Zm9sbG93aW5nIGEgc2VydmVyIHNpZGUgcmVkaXJlY3Qgc28gdGhlcmUgaXMgbm8gbmVlZCB0byBz ZW5kIGEgZGlkU3RhcnRQcm92aXNpb25hbExvYWQgYWdhaW4uCisgICAgaWYgKG1faXNTZXJ2ZXJS ZWRpcmVjdCkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gQ2xpZW50cyBleHBlY3QgdGhlIFBh Z2UncyBtYWluIGZyYW1lJ3MgZXhwZWN0ZWRVUkwgdG8gYmUgdGhlIHByb3Zpc2lvbmFsIG9uZSB3 aGVuIGEgcHJvdmlzaW9uYWwgbG9hZCBpcyBzdGFydGVkLgorICAgIGlmIChhdXRvKiBwYWdlTWFp bkZyYW1lID0gbV9wYWdlLm1haW5GcmFtZSgpKQorICAgICAgICBwYWdlTWFpbkZyYW1lLT5kaWRT dGFydFByb3Zpc2lvbmFsTG9hZCh1cmwpOworCisgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRl ID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgbV9w YWdlLmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoZnJhbWVJRCwgbmF2aWdhdGlvbklE LCBXVEZNb3ZlKHVybCksIFdURk1vdmUodW5yZWFjaGFibGVVUkwpLCB1c2VyRGF0YSk7Cit9CisK K3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFt ZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZy YW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBw cm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYgZXJyb3IsIGNvbnN0 IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBt X3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKworICAgIFJFTEVB U0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiZGlkRmFpbFByb3Zpc2lvbmFsTG9h ZEZvckZyYW1lOiBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCBu YXZpZ2F0aW9uSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSwgZnJhbWVJRCwgbmF2aWdh dGlvbklEKTsKKyAgICBtX3Byb3Zpc2lvbmFsTG9hZFVSTCA9IHsgfTsKKworICAgIC8vIE1ha2Ug c3VyZSB0aGUgUGFnZSdzIG1haW4gZnJhbWUncyBleHBlY3RlZFVSTCBnZXRzIGNsZWFyZWQgc2lu Y2Ugd2UgdXBkYXRlZCBpdCBpbiBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZC4KKyAgICBpZiAoYXV0 byogcGFnZU1haW5GcmFtZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAgICAgcGFnZU1haW5G cmFtZS0+ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZCgpOworCisgICAgbV9wYWdlLmRpZEZhaWxQcm92 aXNpb25hbExvYWRGb3JGcmFtZShmcmFtZUlELCBmcmFtZVNlY3VyaXR5T3JpZ2luLCBuYXZpZ2F0 aW9uSUQsIHByb3Zpc2lvbmFsVVJMLCBlcnJvciwgdXNlckRhdGEpOyAvLyBXaWxsIGRlbGV0ZSB8 dGhpc3wuCit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JG cmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmlu ZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90 IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYgY2VydGlmaWNh dGVJbmZvLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhh c0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0 YSYgdXNlckRhdGEpCit7CisgICAgLy8gSWYgdGhlIHByZXZpb3VzIHByb3Zpc2lvbmFsIGxvYWQg dXNlZCB0aGUgc2FtZSBwcm9jZXNzLCB3ZSBtYXkgcmVjZWl2ZSBJUEMgZm9yIHRoaXMgcHJldmlv dXMgcHJvdmlzaW9uYWwncyBtYWluIGZyYW1lIHRoYXQgd2UgbmVlZCB0byBpZ25vcmUuCisgICAg aWYgKCFtX21haW5GcmFtZSB8fCBtX21haW5GcmFtZS0+ZnJhbWVJRCgpICE9IGZyYW1lSUQpCisg ICAgICAgIHJldHVybjsKKworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBw aW5nLCAiZGlkQ29tbWl0TG9hZEZvckZyYW1lOiBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJ RCA9ICUiIFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQo KSwgZnJhbWVJRCwgbmF2aWdhdGlvbklEKTsKKyAgICBtX3Byb3Zpc2lvbmFsTG9hZFVSTCA9IHsg fTsKKyAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisKKyAgICBt X3dhc0NvbW1pdHRlZCA9IHRydWU7CisgICAgbV9wYWdlLmNvbW1pdFByb3Zpc2lvbmFsUGFnZShm cmFtZUlELCBuYXZpZ2F0aW9uSUQsIG1pbWVUeXBlLCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92 aWRlciwgZnJhbWVMb2FkVHlwZSwgY2VydGlmaWNhdGVJbmZvLCBjb250YWluc1BsdWdpbkRvY3Vt ZW50LCBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIHVzZXJEYXRhKTsgLy8gV2lsbCBkZWxldGUg fHRoaXN8LgorfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2Fn ZShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIElQQzo6RGVjb2RlciYgZGVjb2RlcikKK3sK KyAgICBBU1NFUlQoZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkgPT0gTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpKTsKKworICAgIGlmIChkZWNvZGVyLm1l c3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU3RhcnRQcm9ncmVzczo6 bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjpEaWRDaGFuZ2VQcm9ncmVzczo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIu bWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpCYWNrRm9yd2FyZEFkZEl0 ZW06Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6TG9nRGlhZ25vc3RpY01lc3NhZ2U6Om5hbWUoKQorICAgICAgICB8fCBk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6TG9nRGlhZ25v c3RpY01lc3NhZ2VXaXRoRW5oYW5jZWRQcml2YWN5OjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rl ci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNldE5ldHdvcmtSZXF1 ZXN0c0luUHJvZ3Jlc3M6Om5hbWUoKQorI2lmIFBMQVRGT1JNKENPQ09BKQorICAgICAgICB8fCBk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UmVnaXN0ZXJX ZWJQcm9jZXNzQWNjZXNzaWJpbGl0eVRva2VuOjpuYW1lKCkKKyNlbmRpZgorICAgICAgICB8fCBk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5t ZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlN0YXJ0VVJMU2NoZW1lVGFz azo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpEZWNpZGVQb2xpY3lGb3JSZXNwb25zZTo6bmFtZSgpCisgICAgICAgIHx8 IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRQZXJm b3JtQ2xpZW50UmVkaXJlY3Q6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1l KCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JG cmFtZTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpEaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YTo6bmFtZSgpKQor ICAgIHsKKyAgICAgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFy aWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgICAgIG1fcGFnZS5kaWRSZWNlaXZl TWVzc2FnZShjb25uZWN0aW9uLCBkZWNvZGVyKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwor ICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6 RGlkQ3JlYXRlTWFpbkZyYW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdl PE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENyZWF0ZU1haW5GcmFtZT4oZGVjb2RlciwgdGhp cywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOworICAgICAgICBy ZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOjpuYW1lKCkp IHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRp ZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25h bFBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OkRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZTo6bmFtZSgpKSB7 CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRG YWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBh Z2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6RGlkQ29tbWl0TG9hZEZvckZyYW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBD OjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENvbW1pdExvYWRGb3JG cmFtZT4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDb21taXRMb2Fk Rm9yRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgTE9HKFByb2Nlc3NTd2Fw cGluZywgIlVuaGFuZGxlZCBtZXNzYWdlICVzOjolcyBmcm9tIHByb3Zpc2lvbmFsIHByb2Nlc3Mi LCBkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKS50b1N0cmluZygpLmRhdGEoKSwgZGVjb2Rl ci5tZXNzYWdlTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgpKTsKK30KKwordm9pZCBQcm92aXNpb25h bFBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYgY29ubmVj dGlvbiwgSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVy PiYgZW5jb2RlcikKK3sKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OkJhY2tGb3J3YXJkSXRlbUF0SW5kZXg6Om5hbWUoKSB8fCBkZWNvZGVy Lm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6QmFja0ZvcndhcmRHb1Rv SXRlbTo6bmFtZSgpKSB7CisgICAgICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFn ZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgICAgICBtX3BhZ2Uu ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKGNvbm5lY3Rpb24sIGRlY29kZXIsIGVuY29kZXIpOworICAg ICAgICByZXR1cm47CisgICAgfQorCisgICAgTE9HKFByb2Nlc3NTd2FwcGluZywgIlVuaGFuZGxl ZCBzeW5jIG1lc3NhZ2UgJXM6OiVzIGZyb20gcHJvdmlzaW9uYWwgcHJvY2VzcyIsIGRlY29kZXIu bWVzc2FnZVJlY2VpdmVyTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgpLCBkZWNvZGVyLm1lc3NhZ2VO YW1lKCkudG9TdHJpbmcoKS5kYXRhKCkpOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5Lmgg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjgyNzQwMDY1MGFjMThiYzYxZGU1YTYzNjI4NzVhMGM3MDQyNTU0NWIKLS0tIC9kZXYvbnVs bAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oCkBA IC0wLDAgKzEsOTIgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTkgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUg cGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUg bWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRo ZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBi aW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIg aW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlk ZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklE RUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBB TlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E IEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4g Tk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFC TEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExB UlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsg TE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJ T04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhF UiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBO RUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhF IFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjcHJhZ21hIG9uY2UKKworI2luY2x1ZGUgIk1l c3NhZ2VSZWNlaXZlci5oIgorCituYW1lc3BhY2UgV2ViQ29yZSB7CitjbGFzcyBSZXNvdXJjZVJl cXVlc3Q7Cit9CisKK25hbWVzcGFjZSBXZWJLaXQgeworCitjbGFzcyBEcmF3aW5nQXJlYVByb3h5 OworY2xhc3MgU3VzcGVuZGVkUGFnZVByb3h5OworY2xhc3MgV2ViRnJhbWVQcm94eTsKK2NsYXNz IFdlYlBhZ2VQcm94eTsKK2NsYXNzIFdlYlByb2Nlc3NQcm94eTsKKworY2xhc3MgUHJvdmlzaW9u YWxQYWdlUHJveHkgOiBwdWJsaWMgSVBDOjpNZXNzYWdlUmVjZWl2ZXIgeworICAgIFdURl9NQUtF X0ZBU1RfQUxMT0NBVEVEOworcHVibGljOgorICAgIFByb3Zpc2lvbmFsUGFnZVByb3h5KFdlYlBh Z2VQcm94eSYsIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5k ZWRQYWdlUHJveHk+LCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGJvb2wgaXNTZXJ2ZXJSZWRpcmVj dCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRC eUNsaWVudCk7CisgICAgflByb3Zpc2lvbmFsUGFnZVByb3h5KCk7CisKKyAgICBXZWJQYWdlUHJv eHkmIHBhZ2UoKSB7IHJldHVybiBtX3BhZ2U7IH0KKyAgICBXZWJGcmFtZVByb3h5KiBtYWluRnJh bWUoKSBjb25zdCB7IHJldHVybiBtX21haW5GcmFtZS5nZXQoKTsgfQorICAgIFdlYlByb2Nlc3NQ cm94eSYgcHJvY2VzcygpIHsgcmV0dXJuIG1fcHJvY2Vzcy5nZXQoKTsgfQorICAgIFByb2Nlc3NT d2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCgpIGNvbnN0 IHsgcmV0dXJuIG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDsgfQorICAgIHVpbnQ2NF90 IG5hdmlnYXRpb25JRCgpIGNvbnN0IHsgcmV0dXJuIG1fbmF2aWdhdGlvbklEOyB9CisKKyAgICBz dGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gdGFrZURyYXdpbmdBcmVhKCk7CisKKyAg ICB2b2lkIGxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgY29uc3QgSVBD OjpEYXRhUmVmZXJlbmNlJiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBl bmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIE9w dGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOworICAgIHZvaWQg bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QmJiwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgQVBJ OjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RG OjpudWxsb3B0KTsKKyAgICB2b2lkIGdvVG9CYWNrRm9yd2FyZEl0ZW0oQVBJOjpOYXZpZ2F0aW9u JiwgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+ JiYpOworICAgIHZvaWQgY2FuY2VsKCk7CisKKyAgICB2b2lkIHByb2Nlc3NEaWRGaW5pc2hMYXVu Y2hpbmcoKTsKKworcHJpdmF0ZToKKyAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgorICAgIHZv aWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgZmlu YWw7CisgICAgdm9pZCBkaWRSZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBD OjpEZWNvZGVyJiwgc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mKSBmaW5hbDsKKworICAg IHZvaWQgZGlkQ3JlYXRlTWFpbkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpOworICAgIHZvaWQgZGlk U3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBu YXZpZ2F0aW9uSUQsIFVSTCYmLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEm KTsKKyAgICB2b2lkIGRpZENvbW1pdExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50 NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXND dXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNv cmU6OkNlcnRpZmljYXRlSW5mbyYsIGJvb2wgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9u YWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQs IGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJh bWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBm cmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYg cHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBjb25zdCBVc2Vy RGF0YSYpOworCisgICAgdm9pZCBpbml0aWFsaXplV2ViUGFnZSgpOworICAgIHZvaWQgZmluaXNo SW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCgpOworCisgICAgV2ViUGFnZVBy b3h5JiBtX3BhZ2U7CisgICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gbV9wcm9jZXNzOworICAgIHN0 ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBtX2RyYXdpbmdBcmVhOworICAgIFJlZlB0 cjxXZWJGcmFtZVByb3h5PiBtX21haW5GcmFtZTsKKyAgICB1aW50NjRfdCBtX25hdmlnYXRpb25J RDsKKyAgICBib29sIG1faXNTZXJ2ZXJSZWRpcmVjdDsKKyAgICBXZWJDb3JlOjpSZXNvdXJjZVJl cXVlc3QgbV9yZXF1ZXN0OworICAgIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgbV9wcm9j ZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50OworICAgIGJvb2wgbV93YXNDb21taXR0ZWQgeyBmYWxz ZSB9OworICAgIFVSTCBtX3Byb3Zpc2lvbmFsTG9hZFVSTDsKKworI2lmIFBMQVRGT1JNKElPU19G QU1JTFkpCisgICAgUHJvY2Vzc1Rocm90dGxlcjo6QmFja2dyb3VuZEFjdGl2aXR5VG9rZW4gbV9z dXNwZW5zaW9uVG9rZW47CisjZW5kaWYKK307CisKK30gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAKaW5kZXggZjE5 OGE4MTUzM2Y3NmIyZThlMmJmNzFkNGEzYjlkMjc0MGM5NTA3OC4uZmY3NmQ5ZjdmOTdhYzZmYTRm YmIzMDJmNjQ2NjYxZDE2NzhhZTI1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9T dXNwZW5kZWRQYWdlUHJveHkuY3BwCkBAIC0xMDAsNyArMTAwLDkgQEAgU3VzcGVuZGVkUGFnZVBy b3h5Ojp+U3VzcGVuZGVkUGFnZVByb3h5KCkKICAgICAvLyBJZiB0aGUgc3VzcGVuZGVkIHBhZ2Ug d2FzIG5vdCBjb25zdW1lZCBiZWZvcmUgZ2V0dGluZyBkZXN0cm95ZWQsIHRoZW4gY2xvc2UgdGhl IGNvcnJlc3BvbmRpbmcgcGFnZQogICAgIC8vIG9uIHRoZSBXZWJQcm9jZXNzIHNpZGUuCiAgICAg bV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpDbG9zZSgpLCBtX3BhZ2UucGFnZUlE KCkpOwotICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQ YWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKworICAg IGlmIChtX3N1c3BlbnNpb25TdGF0ZSA9PSBTdXNwZW5zaW9uU3RhdGU6OlN1c3BlbmRpbmcpCisg ICAgICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKIAogICAgIC8v IFdlIGNhbGwgbWF5YmVTaHV0RG93bigpIGFzeW5jaHJvbm91c2x5IHNpbmNlIHRoZSBTdXNwZW5k ZWRQYWdlIGlzIGN1cnJlbnRseSBiZWluZyByZW1vdmVkIGZyb20gdGhlIFdlYlByb2Nlc3NQb29s CiAgICAgLy8gYW5kIHdlIHdhbnQgdG8gYXZvaWQgcmUtZW50ZXJpbmcgV2ViUHJvY2Vzc1Bvb2wg bWV0aG9kcy4KQEAgLTEzNCw3ICsxMzYsNiBAQCB2b2lkIFN1c3BlbmRlZFBhZ2VQcm94eTo6dW5z dXNwZW5kKCkKICAgICBBU1NFUlQobV9zdXNwZW5zaW9uU3RhdGUgPT0gU3VzcGVuc2lvblN0YXRl OjpTdXNwZW5kZWQpOwogCiAgICAgbV9zdXNwZW5zaW9uU3RhdGUgPSBTdXNwZW5zaW9uU3RhdGU6 OlJlc3VtZWQ7Ci0gICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOwog ICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0SXNTdXNwZW5kZWQoZmFs c2UpLCBtX3BhZ2UucGFnZUlEKCkpOwogfQogCkBAIC0xNTEsNiArMTUyLDggQEAgdm9pZCBTdXNw ZW5kZWRQYWdlUHJveHk6OmRpZFByb2Nlc3NSZXF1ZXN0VG9TdXNwZW5kKFN1c3BlbnNpb25TdGF0 ZSBuZXdTdXNwZW5zaW8KICAgICBtX3N1c3BlbnNpb25Ub2tlbiA9IG51bGxwdHI7CiAjZW5kaWYK IAorICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKwogICAgIGlm IChtX3JlYWR5VG9VbnN1c3BlbmRIYW5kbGVyKQogICAgICAgICBtX3JlYWR5VG9VbnN1c3BlbmRI YW5kbGVyKHRoaXMpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi RnJhbWVQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNw cAppbmRleCBjNzdhMjZiNzQyN2MzMWM4MjhlMmVhYTIyMWY4MDcwYjc3YWRkMjYyLi41M2M3MTk2 YzJhYTBhMzNkMjIwNzU4MTkwY2Q0YmQ5NWE1Y2QwMjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJGcmFtZVByb3h5LmNwcApAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUgIldlYkZy YW1lUHJveHkuaCIKIAogI2luY2x1ZGUgIkFQSU5hdmlnYXRpb24uaCIKKyNpbmNsdWRlICJQcm92 aXNpb25hbFBhZ2VQcm94eS5oIgogI2luY2x1ZGUgIldlYkNlcnRpZmljYXRlSW5mby5oIgogI2lu Y2x1ZGUgIldlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eS5oIgogI2luY2x1ZGUgIldlYlBhZ2VN ZXNzYWdlcy5oIgpAQCAtNzQsNyArNzUsNyBAQCBib29sIFdlYkZyYW1lUHJveHk6OmlzTWFpbkZy YW1lKCkgY29uc3QKICAgICBpZiAoIW1fcGFnZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0g ICAgcmV0dXJuIHRoaXMgPT0gbV9wYWdlLT5tYWluRnJhbWUoKTsKKyAgICByZXR1cm4gdGhpcyA9 PSBtX3BhZ2UtPm1haW5GcmFtZSgpIHx8IChtX3BhZ2UtPnByb3Zpc2lvbmFsUGFnZVByb3h5KCkg JiYgdGhpcyA9PSBtX3BhZ2UtPnByb3Zpc2lvbmFsUGFnZVByb3h5KCktPm1haW5GcmFtZSgpKTsK IH0KIAogdm9pZCBXZWJGcmFtZVByb3h5Ojpsb2FkVVJMKGNvbnN0IFVSTCYgdXJsKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMzkyNzQzYmQ1Njc5Y2JkMjI2 N2EyYzEwZWNjZTE5NWE2MWMzM2QyOS4uZDg5NGNmOGY0NDUxYzhjNWI3N2FhMWI5MTFkYTkyYzM5 OTA3NThjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC03 Nyw2ICs3Nyw3IEBACiAjaW5jbHVkZSAiUGx1Z2luSW5mb3JtYXRpb24uaCIKICNpbmNsdWRlICJQ bHVnaW5Qcm9jZXNzTWFuYWdlci5oIgogI2luY2x1ZGUgIlByaW50SW5mby5oIgorI2luY2x1ZGUg IlByb3Zpc2lvbmFsUGFnZVByb3h5LmgiCiAjaW5jbHVkZSAiU2FmZUJyb3dzaW5nV2FybmluZy5o IgogI2luY2x1ZGUgIlNoYXJlU2hlZXRDYWxsYmFja0lELmgiCiAjaW5jbHVkZSAiU2hhcmVkQnVm ZmVyRGF0YVJlZmVyZW5jZS5oIgpAQCAtNzY4LDM4ICs3NjksMjYgQEAgYm9vbCBXZWJQYWdlUHJv eHk6OnN1c3BlbmRDdXJyZW50UGFnZUlmUG9zc2libGUoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0 aW9uLCBPcHQKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OnN3YXBU b1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVuaXF1ZV9w dHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSwgSXNTd2Fw RnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9pZCBXZWJQYWdlUHJveHk6OnN3 YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVuaXF1 ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4mJiBkcmF3aW5nQXJlYSwgUmVmUHRyPFdlYkZyYW1lUHJv eHk+JiYgbWFpbkZyYW1lKQogewogICAgIEFTU0VSVCghbV9pc0Nsb3NlZCk7CiAgICAgUkVMRUFT RV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAic3dhcFRvV2ViUHJvY2Vzczogd2ViUElEID0gJWks IHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3Bh Z2VJRCk7CiAKICAgICBtX3Byb2Nlc3MgPSBXVEZNb3ZlKHByb2Nlc3MpOworICAgIEFTU0VSVCgh bV9kcmF3aW5nQXJlYSk7CisgICAgc2V0RHJhd2luZ0FyZWEoV1RGTW92ZShkcmF3aW5nQXJlYSkp OworICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOworICAgIG1fbWFpbkZyYW1lID0gV1RGTW92ZSht YWluRnJhbWUpOwogICAgIG1faXNWYWxpZCA9IHRydWU7CiAKLSAgICAvLyBJZiB3ZSBhcmUgcmVh dHRhY2hpbmcgdG8gYSBTdXNwZW5kZWRQYWdlLCB0aGVuIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdl IGFscmVhZHkgZXhpc3RzIGFuZAotICAgIC8vIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZy YW1lKCkgd2lsbCBub3QgYmUgY2FsbGVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUuIEluIHN1 Y2gKLSAgICAvLyBjYXNlLCB3ZSBuZWVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUgdG8gcmVm bGVjdCB0aGUgZmFjdCB0aGUgdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UKLSAgICAvLyBhbHJlYWR5 IGV4aXN0cyBhbmQgYWxyZWFkeSBoYXMgYSBtYWluIGZyYW1lLgotICAgIGlmIChkZXN0aW5hdGlv blN1c3BlbmRlZFBhZ2UpIHsKLSAgICAgICAgaWYgKCFkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2Ut PmZhaWxlZFRvU3VzcGVuZCgpKSB7Ci0gICAgICAgICAgICBBU1NFUlQoIW1fbWFpbkZyYW1lKTsK LSAgICAgICAgICAgIEFTU0VSVCgmZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5wcm9jZXNzKCkg PT0gbV9wcm9jZXNzLnB0cigpKTsKLSAgICAgICAgICAgIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFn ZS0+dW5zdXNwZW5kKCk7Ci0gICAgICAgICAgICBtX21haW5GcmFtZSA9IFdlYkZyYW1lUHJveHk6 OmNyZWF0ZSgqdGhpcywgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpKTsK LSAgICAgICAgICAgIG1fcHJvY2Vzcy0+ZnJhbWVDcmVhdGVkKGRlc3RpbmF0aW9uU3VzcGVuZGVk UGFnZS0+bWFpbkZyYW1lSUQoKSwgKm1fbWFpbkZyYW1lKTsKLSAgICAgICAgfSBlbHNlIHsKLSAg ICAgICAgICAgIC8vIFdlIGZhaWxlZCB0byBzdXNwZW5kIHRoZSBwYWdlIHNvIGRlc3Ryb3kgaXQg bm93IGFuZCBtZXJlbHkgcmV1c2UgaXRzIFdlYkNvbnRlbnQgcHJvY2Vzcy4KLSAgICAgICAgICAg IGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSA9IG51bGxwdHI7Ci0gICAgICAgIH0KLSAgICB9Ci0K ICAgICBtX3Byb2Nlc3MtPmFkZEV4aXN0aW5nV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQsIFdlYlBy b2Nlc3NQcm94eTo6QmVnaW5zVXNpbmdEYXRhU3RvcmU6Ok5vKTsKICAgICBtX3Byb2Nlc3MtPmFk ZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJO YW1lKCksIG1fcGFnZUlELCAqdGhpcyk7CiAKLSAgICBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nl c3MoaXNTd2FwRnJvbVN1c3BlbmRlZCk7CisgICAgLy8gTm8gbmVlZCB0byBpbml0aWFsaXplIHRo ZSBXZWJQYWdlIHNpbmNlIGl0IHdhcyBjcmVhdGVkIHdoZW4gd2UgY3JlYXRlZCB0aGUgUHJvdmlz aW9uYWxQYWdlUHJveHkuCisgICAgZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKFNob3VsZElu aXRpYWxpemVXZWJQYWdlOjpObyk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpmaW5pc2hBdHRh Y2hpbmdUb1dlYlByb2Nlc3MoSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVk KQordm9pZCBXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhTaG91bGRJ bml0aWFsaXplV2ViUGFnZSBzaG91bGRJbml0aWFsaXplUGFnZSkKIHsKICAgICBBU1NFUlQobV9w cm9jZXNzLT5zdGF0ZSgpICE9IENoaWxkUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6VGVybWluYXRlZCk7 CiAKQEAgLTgzNSw3ICs4MjQsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNoaW5n VG9XZWJQcm9jZXNzKElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1cwogICAgIG1fZWRp dGFibGVJbWFnZUNvbnRyb2xsZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEVkaXRhYmxlSW1hZ2VDb250 cm9sbGVyPigqdGhpcyk7CiAjZW5kaWYKIAotICAgIGluaXRpYWxpemVXZWJQYWdlKGlzU3dhcEZy b21TdXNwZW5kZWQpOworICAgIGlmIChzaG91bGRJbml0aWFsaXplUGFnZSA9PSBTaG91bGRJbml0 aWFsaXplV2ViUGFnZTo6WWVzKQorICAgICAgICBpbml0aWFsaXplV2ViUGFnZSgpOwogCiAgICAg bV9pbnNwZWN0b3ItPnVwZGF0ZUZvck5ld1BhZ2VQcm9jZXNzKHRoaXMpOwogCkBAIC05MDAsMTIg Kzg5MCwxMSBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OnJlYXR0YWNo VG9XZWJQcm9jZXNzV2l0aEl0ZW0oV2ViQmFja0ZvcndhcgogICAgIHJldHVybiBXVEZNb3ZlKG5h dmlnYXRpb24pOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoSXNT d2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9pZCBXZWJQYWdlUHJveHk6 OnNldERyYXdpbmdBcmVhKHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmIGRyYXdp bmdBcmVhKQogewotICAgIEFTU0VSVChpc1ZhbGlkKCkpOwotCi0gICAgbV9kcmF3aW5nQXJlYSA9 IHBhZ2VDbGllbnQoKS5jcmVhdGVEcmF3aW5nQXJlYVByb3h5KCk7Ci0gICAgQVNTRVJUKG1fZHJh d2luZ0FyZWEpOworICAgIG1fZHJhd2luZ0FyZWEgPSBXVEZNb3ZlKGRyYXdpbmdBcmVhKTsKKyAg ICBpZiAoIW1fZHJhd2luZ0FyZWEpCisgICAgICAgIHJldHVybjsKIAogI2lmIEVOQUJMRShBU1lO Q19TQ1JPTExJTkcpICYmIFBMQVRGT1JNKENPQ09BKQogICAgIGlmIChtX2RyYXdpbmdBcmVhLT50 eXBlKCkgPT0gRHJhd2luZ0FyZWFUeXBlUmVtb3RlTGF5ZXJUcmVlKSB7CkBAIC05MTYsMTUgKzkw NSwxNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoSXNTd2FwRnJvbVN1 c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQogI2VuZGlmCiAgICAgfQogI2VuZGlmCit9CiAK LSAgICBhdXRvIHBhcmFtZXRlcnMgPSBjcmVhdGlvblBhcmFtZXRlcnMoKTsKLSAgICBwYXJhbWV0 ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQgPSBpc1N3YXBGcm9tU3VzcGVuZGVkID09IElzU3dhcEZy b21TdXNwZW5kZWQ6OlllczsKK3ZvaWQgV2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSgp Cit7CisgICAgQVNTRVJUKGlzVmFsaWQoKSk7CiAKLSNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIp Ci0gICAgcGFyYW1ldGVycy5oYXNSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMgPSBwcm9jZXNzKCku cHJvY2Vzc1Bvb2woKS5tYXlIYXZlUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXJzKG1fd2Vic2l0ZURh dGFTdG9yZSk7Ci0jZW5kaWYKKyAgICBzZXREcmF3aW5nQXJlYShwYWdlQ2xpZW50KCkuY3JlYXRl RHJhd2luZ0FyZWFQcm94eSgpKTsKKyAgICBBU1NFUlQobV9kcmF3aW5nQXJlYSk7CiAKLSAgICBw cm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6Q3JlYXRlV2ViUGFnZShtX3BhZ2VJ RCwgcGFyYW1ldGVycyksIDApOworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9j ZXNzOjpDcmVhdGVXZWJQYWdlKG1fcGFnZUlELCBjcmVhdGlvblBhcmFtZXRlcnMoKSksIDApOwog CiAgICAgbV9uZWVkc1RvRmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5j aCA9IHRydWU7CiAgICAgZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5j aCgpOwpAQCAtMTA3Niw3ICsxMDY2LDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRSZXF1ZXN0 V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBSZXNvdXIKICAgICBh dXRvIHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CiAKICAgICBh dXRvIHVybCA9IHJlcXVlc3QudXJsKCk7Ci0gICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdB UElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCB1cmwpOworICAgIGlmIChzaG91bGRUcmVhdEFzQ29u dGludWluZ0xvYWQgIT0gU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMpCisgICAgICAg IG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFuc2FjdGlvbiwgdXJs KTsKIAogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICByZWF0dGFjaFRvV2ViUHJvY2Vzcygp OwpAQCAtMTI5NCw2ICsxMjg1LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnN0b3BMb2FkaW5nKCkK ICAgICB9CiAKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlN0b3BMb2Fk aW5nKCksIG1fcGFnZUlEKTsKKyAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7CiAgICAg bV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKIH0KIApAQCAtMjY5Nyw3 ICsyNjg5LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURl Y2lzaW9uKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24KICAgICAgICAgfQogCiAgICAgICAg IGlmIChwcm9jZXNzRm9yTmF2aWdhdGlvbi5wdHIoKSAhPSAmcHJvY2VzcygpKSB7Ci0gICAgICAg ICAgICBwb2xpY3lBY3Rpb24gPSBpc1BhZ2VPcGVuZWRCeURPTVNob3dpbmdJbml0aWFsRW1wdHlE b2N1bWVudCgpID8gV2ViUG9saWN5QWN0aW9uOjpJZ25vcmUgOiBXZWJQb2xpY3lBY3Rpb246OlN1 c3BlbmQ7CisgICAgICAgICAgICBwb2xpY3lBY3Rpb24gPSBXZWJQb2xpY3lBY3Rpb246Oklnbm9y ZTsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAi ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiwgc3dhcHBpbmcgcHJvY2VzcyAlaSB3aXRo IHByb2Nlc3MgJWkgZm9yIG5hdmlnYXRpb24sIHJlYXNvbjogJXtwdWJsaWN9cyIsIHByb2Nlc3NJ ZGVudGlmaWVyKCksIHByb2Nlc3NGb3JOYXZpZ2F0aW9uLT5wcm9jZXNzSWRlbnRpZmllcigpLCBy ZWFzb24udXRmOCgpLmRhdGEoKSk7CiAgICAgICAgICAgICBMT0coUHJvY2Vzc1N3YXBwaW5nLCAi KFByb2Nlc3NTd2FwcGluZykgU3dpdGNoaW5nIGZyb20gcHJvY2VzcyAlaSB0byBuZXcgcHJvY2Vz cyAoJWkpIGZvciBuYXZpZ2F0aW9uICUiIFBSSXU2NCAiICclcyciLCBwcm9jZXNzSWRlbnRpZmll cigpLCBwcm9jZXNzRm9yTmF2aWdhdGlvbi0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbmF2aWdhdGlv bi0+bmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24tPmxvZ2dpbmdTdHJpbmcoKSk7CiAgICAgICAg IH0gZWxzZQpAQCAtMjcwNiw4ICsyNjk4LDE0IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZl ZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbihXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uCiAg ICAgICAgIGJvb2wgc2hvdWxkUHJvY2Vzc1N3YXAgPSBwcm9jZXNzRm9yTmF2aWdhdGlvbi5wdHIo KSAhPSAmcHJvY2VzcygpOwogICAgICAgICByZWNlaXZlZFBvbGljeURlY2lzaW9uKHBvbGljeUFj dGlvbiwgbmF2aWdhdGlvbi5wdHIoKSwgc2hvdWxkUHJvY2Vzc1N3YXAgPyBXVEY6Om51bGxvcHQg OiBXVEZNb3ZlKGRhdGEpLCBXVEZNb3ZlKHNlbmRlcikpOwogCi0gICAgICAgIGlmIChzaG91bGRQ cm9jZXNzU3dhcCkKLSAgICAgICAgICAgIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2Vzcyhu YXZpZ2F0aW9uLCBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UgPyBwcm9jZXNzKCkucHJvY2Vzc1Bv b2woKS50YWtlU3VzcGVuZGVkUGFnZSgqZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlKSA6IG51bGxw dHIsIFdURk1vdmUocHJvY2Vzc0Zvck5hdmlnYXRpb24pLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5 Q2xpZW50LCBXVEZNb3ZlKGRhdGEpKTsKKyAgICAgICAgaWYgKCFzaG91bGRQcm9jZXNzU3dhcCkK KyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBhdXRvIHN1c3BlbmRlZFBhZ2UgPSBkZXN0 aW5hdGlvblN1c3BlbmRlZFBhZ2UgPyBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS50YWtlU3VzcGVu ZGVkUGFnZSgqZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlKSA6IG51bGxwdHI7CisgICAgICAgIGlm IChzdXNwZW5kZWRQYWdlICYmIHN1c3BlbmRlZFBhZ2UtPmZhaWxlZFRvU3VzcGVuZCgpKQorICAg ICAgICAgICAgc3VzcGVuZGVkUGFnZSA9IG51bGxwdHI7CisKKyAgICAgICAgY29udGludWVOYXZp Z2F0aW9uSW5OZXdQcm9jZXNzKG5hdmlnYXRpb24sIFdURk1vdmUoc3VzcGVuZGVkUGFnZSksIFdU Rk1vdmUocHJvY2Vzc0Zvck5hdmlnYXRpb24pLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50 LCBXVEZNb3ZlKGRhdGEpKTsKICAgICB9KTsKIH0KIApAQCAtMjc0MywyNCArMjc0MSw0NSBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6cmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihXZWJQb2xpY3lBY3Rpb24g YWN0aW9uLCBBUEk6Ok5hdmlnYXRpbwogICAgIHNlbmRlci0+c2VuZChhY3Rpb24sIG5hdmlnYXRp b24gPyBuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSA6IDAsIGRvd25sb2FkSUQsIFdURk1vdmUo d2Vic2l0ZVBvbGljaWVzKSk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojpjb250aW51ZU5hdmln YXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBzdGQ6OnVuaXF1 ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmIHN1c3BlbmRlZFBhZ2VQcm94eSwgUmVmPFdlYlBy b2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYg d2Vic2l0ZVBvbGljaWVzKQordm9pZCBXZWJQYWdlUHJveHk6OmNvbW1pdFByb3Zpc2lvbmFsUGFn ZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYg bWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90IGZy YW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYgY2VydGlmaWNhdGVJ bmZvLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0lu c2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYg dXNlckRhdGEpCiB7Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiY29udGlu dWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0 LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKLSAgICBMT0coTG9h ZGluZywgIkNvbnRpbnVpbmcgbmF2aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMnIGluIGEgbmV3IHdl YiBwcm9jZXNzIiwgbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi5sb2dnaW5n U3RyaW5nKCkpOworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFnZSk7CisgICAgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiY29tbWl0UHJvdmlzaW9uYWxQYWdlOiBwcmV2aW91c1BJ RCA9ICVpLCBuZXdQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nl c3NJZGVudGlmaWVyKCksIG1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCkucHJvY2Vzc0lkZW50 aWZpZXIoKSwgbV9wYWdlSUQpOwogCi0gICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gcHJldmlvdXNQ cm9jZXNzID0gbV9wcm9jZXNzLmNvcHlSZWYoKTsKICAgICBPcHRpb25hbDx1aW50NjRfdD4gbWFp bkZyYW1lSURJblByZXZpb3VzUHJvY2VzcyA9IG1fbWFpbkZyYW1lID8gbWFrZU9wdGlvbmFsKG1f bWFpbkZyYW1lLT5mcmFtZUlEKCkpIDogV1RGOjpudWxsb3B0OwotICAgIGF1dG8gbWFpbkZyYW1l VVJMID0gbV9tYWluRnJhbWUgPyBtX21haW5GcmFtZS0+dXJsKCkgOiBVUkwoKTsKIAotICAgIEFT U0VSVChtX3Byb2Nlc3MucHRyKCkgIT0gcHJvY2Vzcy5wdHIoKSk7CisgICAgQVNTRVJUKG1fcHJv Y2Vzcy5wdHIoKSAhPSAmbV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3MoKSk7CiAKICAgICBwcm9j ZXNzRGlkVGVybWluYXRlKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbjo6TmF2aWdhdGlvblN3YXAp OwogCiAgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2VJRCk7Ci0gICAgYm9vbCBkaWRT dXNwZW5kUHJldmlvdXNQYWdlID0gc3VzcGVuZEN1cnJlbnRQYWdlSWZQb3NzaWJsZShuYXZpZ2F0 aW9uLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5 Q2xpZW50KTsKKyAgICBhdXRvKiBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0YXRlKCkubmF2aWdh dGlvbihtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkpOworICAgIGJvb2wgZGlkU3Vz cGVuZFByZXZpb3VzUGFnZSA9IG5hdmlnYXRpb24gPyBzdXNwZW5kQ3VycmVudFBhZ2VJZlBvc3Np YmxlKCpuYXZpZ2F0aW9uLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzLCBtX3Byb3Zpc2lv bmFsUGFnZS0+cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCgpKSA6IGZhbHNlOwogICAgIG1f cHJvY2Vzcy0+cmVtb3ZlV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQsIFdlYlByb2Nlc3NQcm94eTo6 RW5kc1VzaW5nRGF0YVN0b3JlOjpObyk7CiAKLSAgICBzd2FwVG9XZWJQcm9jZXNzKFdURk1vdmUo cHJvY2VzcyksIFdURk1vdmUoc3VzcGVuZGVkUGFnZVByb3h5KSwgZGlkU3VzcGVuZFByZXZpb3Vz UGFnZSA/IElzU3dhcEZyb21TdXNwZW5kZWQ6OlllcyA6IElzU3dhcEZyb21TdXNwZW5kZWQ6Ok5v KTsKKyAgICAvLyBUaGVyZSBpcyBubyB3YXkgd2UnbGwgYmUgYWJsZSB0byByZXR1cm4gdG8gdGhl IHBhZ2UgaW4gdGhlIHByZXZpb3VzIHBhZ2Ugc28gY2xvc2UgaXQuCisgICAgaWYgKCFkaWRTdXNw ZW5kUHJldmlvdXNQYWdlKQorICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OkNsb3NlKCksIHBhZ2VJRCgpKTsKKworICAgIHN3YXBUb1dlYlByb2Nlc3MobV9wcm92aXNp b25hbFBhZ2UtPnByb2Nlc3MoKSwgbV9wcm92aXNpb25hbFBhZ2UtPnRha2VEcmF3aW5nQXJlYSgp LCBtX3Byb3Zpc2lvbmFsUGFnZS0+bWFpbkZyYW1lKCkpOworCisgICAgZGlkQ29tbWl0TG9hZEZv ckZyYW1lKGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgbWltZVR5cGUsIGZyYW1lSGFzQ3VzdG9tQ29u dGVudFByb3ZpZGVyLCBmcmFtZUxvYWRUeXBlLCBjZXJ0aWZpY2F0ZUluZm8sIGNvbnRhaW5zUGx1 Z2luRG9jdW1lbnQsIGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgdXNlckRhdGEpOworCisgICAg bV9wcm92aXNpb25hbFBhZ2UgPSBudWxscHRyOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6Y29u dGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwg c3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiBzdXNwZW5kZWRQYWdlUHJveHks IFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgbmV3UHJvY2VzcywgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRC eUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBPcHRpb25hbDxXZWJzaXRlUG9s aWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBSRUxFQVNFX0xPR19JRl9BTExP V0VEKExvYWRpbmcsICJjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3M6IHdlYlBJRCA9ICVp LCBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9w YWdlSUQpOworICAgIExPRyhMb2FkaW5nLCAiQ29udGludWluZyBuYXZpZ2F0aW9uICUiIFBSSXU2 NCAiICclcycgaW4gYSBuZXcgd2ViIHByb2Nlc3MiLCBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgp LCBuYXZpZ2F0aW9uLmxvZ2dpbmdTdHJpbmcoKSk7CisKKyAgICBpZiAobV9wcm92aXNpb25hbFBh Z2UpIHsKKyAgICAgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSAhPSBu YXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpKQorICAgICAgICAgICAgbV9wcm92aXNpb25hbFBhZ2Ut PmNhbmNlbCgpOworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7CisgICAgfQor CisgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBzdGQ6Om1ha2VfdW5pcXVlPFByb3Zpc2lvbmFsUGFn ZVByb3h5PigqdGhpcywgbmV3UHJvY2Vzcy5jb3B5UmVmKCksIFdURk1vdmUoc3VzcGVuZGVkUGFn ZVByb3h5KSwgbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi5jdXJyZW50UmVx dWVzdElzUmVkaXJlY3QoKSwgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpLCBwcm9jZXNzU3dh cFJlcXVlc3RlZEJ5Q2xpZW50KTsKIAogICAgIGlmIChhdXRvKiBpdGVtID0gbmF2aWdhdGlvbi50 YXJnZXRJdGVtKCkpIHsKICAgICAgICAgTE9HKExvYWRpbmcsICJXZWJQYWdlUHJveHkgJXAgY29u dGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzIHRvIGJhY2sgaXRlbSBVUkwgJXMiLCB0aGlzLCBp dGVtLT51cmwoKS51dGY4KCkuZGF0YSgpKTsKQEAgLTI3NjgsNjcgKzI3ODcsMjIgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhBUEk6Ok5hdmlnYXRp b24mIG5hdmlnYXRpb24sIHMKICAgICAgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFnZUxvYWRT dGF0ZS50cmFuc2FjdGlvbigpOwogICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0UGVuZGluZ0FQ SVJlcXVlc3RVUkwodHJhbnNhY3Rpb24sIGl0ZW0tPnVybCgpKTsKIAotICAgICAgICBhdXRvIGl0 ZW1TdGF0ZXMgPSBtX2JhY2tGb3J3YXJkTGlzdC0+ZmlsdGVyZWRJdGVtU3RhdGVzKFt0aGlzLCB0 YXJnZXRJdGVtID0gaXRlbV0oV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYgaXRlbSkgewotICAgICAg ICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBpdGVtLnN1c3BlbmRlZFBhZ2UoKSkgewotICAgICAgICAg ICAgICAgIGlmICgmcGFnZS0+cHJvY2VzcygpID09IG1fcHJvY2Vzcy5wdHIoKSkKLSAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgcmV0 dXJuICZpdGVtICE9IHRhcmdldEl0ZW07Ci0gICAgICAgIH0pOwotICAgICAgICBtX3Byb2Nlc3Mt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlVwZGF0ZUJhY2tGb3J3YXJkTGlzdEZvclJlYXR0YWNo KFdURk1vdmUoaXRlbVN0YXRlcykpLCBtX3BhZ2VJRCk7Ci0gICAgICAgIG1fcHJvY2Vzcy0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uLm5hdmln YXRpb25JRCgpLCBpdGVtLT5pdGVtSUQoKSwgKm5hdmlnYXRpb24uYmFja0ZvcndhcmRGcmFtZUxv YWRUeXBlKCksIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNp dGVQb2xpY2llcykpLCBtX3BhZ2VJRCk7Ci0gICAgICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5l c3NUaW1lcigpLnN0YXJ0KCk7Ci0KKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UtPmdvVG9CYWNr Rm9yd2FyZEl0ZW0obmF2aWdhdGlvbiwgKml0ZW0sIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7 CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBpZiAobV9iYWNrRm9yd2FyZExpc3QtPmN1 cnJlbnRJdGVtKCkgJiYgKG5hdmlnYXRpb24ubG9ja0JhY2tGb3J3YXJkTGlzdCgpID09IExvY2tC YWNrRm9yd2FyZExpc3Q6OlllcyB8fCBuYXZpZ2F0aW9uLmxvY2tIaXN0b3J5KCkgPT0gTG9ja0hp c3Rvcnk6OlllcykpIHsKICAgICAgICAgLy8gSWYgV2ViQ29yZSBpcyBzdXBwb3NlZCB0byBsb2Nr IHRoZSBoaXN0b3J5IGZvciB0aGlzIGxvYWQsIHRoZW4gdGhlIG5ldyBwcm9jZXNzIG5lZWRzIHRv IGtub3cgYWJvdXQgdGhlIGN1cnJlbnQgaGlzdG9yeSBpdGVtIHNvIGl0IGNhbiB1cGRhdGUKICAg ICAgICAgLy8gaXQgaW5zdGVhZCBvZiBjcmVhdGluZyBhIG5ldyBvbmUuCi0gICAgICAgIG1fcHJv Y2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0Q3VycmVudEhpc3RvcnlJdGVtRm9yUmVh dHRhY2gobV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCktPml0ZW1TdGF0ZSgpKSwgbV9w YWdlSUQpOworICAgICAgICBuZXdQcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRD dXJyZW50SGlzdG9yeUl0ZW1Gb3JSZWF0dGFjaChtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0 ZW0oKS0+aXRlbVN0YXRlKCkpLCBtX3BhZ2VJRCk7CiAgICAgfQogCiAgICAgLy8gRklYTUU6IFdv cmsgb3V0IHRpbWluZyBvZiByZXNwb25kaW5nIHdpdGggdGhlIGxhc3QgcG9saWN5IGRlbGVnYXRl LCBldGMKICAgICBBU1NFUlQoIW5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKS5pc0VtcHR5KCkp OwogICAgIGlmIChhdXRvJiBzdWJzdGl0dXRlRGF0YSA9IG5hdmlnYXRpb24uc3Vic3RpdHV0ZURh dGEoKSkKLSAgICAgICAgbG9hZERhdGFXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCB7IHN1YnN0 aXR1dGVEYXRhLT5jb250ZW50LmRhdGEoKSwgc3Vic3RpdHV0ZURhdGEtPmNvbnRlbnQuc2l6ZSgp IH0sIHN1YnN0aXR1dGVEYXRhLT5NSU1FVHlwZSwgc3Vic3RpdHV0ZURhdGEtPmVuY29kaW5nLCBz dWJzdGl0dXRlRGF0YS0+YmFzZVVSTCwgc3Vic3RpdHV0ZURhdGEtPnVzZXJEYXRhLmdldCgpLCBT aG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMp KTsKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UtPmxvYWREYXRhV2l0aE5hdmlnYXRpb24obmF2 aWdhdGlvbiwgeyBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5kYXRhKCksIHN1YnN0aXR1dGVEYXRh LT5jb250ZW50LnNpemUoKSB9LCBzdWJzdGl0dXRlRGF0YS0+TUlNRVR5cGUsIHN1YnN0aXR1dGVE YXRhLT5lbmNvZGluZywgc3Vic3RpdHV0ZURhdGEtPmJhc2VVUkwsIHN1YnN0aXR1dGVEYXRhLT51 c2VyRGF0YS5nZXQoKSwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKICAgICBlbHNlCi0gICAg ICAgIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgUmVzb3VyY2VSZXF1ZXN0 IHsgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpIH0sIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRl cm5hbFVSTHNQb2xpY3k6OlNob3VsZEFsbG93RXh0ZXJuYWxTY2hlbWVzLCBudWxscHRyLCBTaG91 bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsK LQotICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOwotICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5k bGVyID0gW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCBuYXZpZ2F0aW9uSUQg PSBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCByZXF1ZXN0ID0gIG5hdmlnYXRpb24uY3VycmVu dFJlcXVlc3QoKSwgbWFpbkZyYW1lVVJMLCBpc1NlcnZlclJlZGlyZWN0ID0gbmF2aWdhdGlvbi5j dXJyZW50UmVxdWVzdElzUmVkaXJlY3QoKV0oKSBtdXRhYmxlIHsKLSAgICAgICAgaWYgKCF3ZWFr VGhpcykKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBBU1NFUlQobV9tYWluRnJhbWUp OwotICAgICAgICAvLyBUaGlzIG5hdmlnYXRpb24gd2FzIGRlc3Ryb3llZCBzbyBubyBuZWVkIHRv IG5vdGlmeSBvZiByZWRpcmVjdC4KLSAgICAgICAgaWYgKCFuYXZpZ2F0aW9uU3RhdGUoKS5uYXZp Z2F0aW9uKG5hdmlnYXRpb25JRCkpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgLy8g UmVzdG9yZSB0aGUgbWFpbiBmcmFtZSdzIGNvbW1pdHRlZCBVUkwgYXMgc29tZSBjbGllbnRzIG1h eSByZWx5IG9uIGl0IHVudGlsIHRoZSBuZXh0IGxvYWQgaXMgY29tbWl0dGVkLgotICAgICAgICBt X21haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5zZXRVUkwobWFpbkZyYW1lVVJMKTsKLQotICAg ICAgICAvLyBOb3JtYWxseSwgbm90aWZpY2F0aW9uIG9mIGEgc2VydmVyIHJlZGlyZWN0IGNvbWVz IGZyb20gdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KLSAgICAgICAgLy8gSWYgd2UgYXJlIHByb2Nl c3Mgc3dhcHBpbmcgaW4gcmVzcG9uc2UgdG8gYSBzZXJ2ZXIgcmVkaXJlY3QgdGhlbiB0aGF0IG5v dGlmaWNhdGlvbiB3aWxsIG5vdCBjb21lIGZyb20gdGhlIG5ldyBXZWJDb250ZW50IHByb2Nlc3Mu Ci0gICAgICAgIC8vIEluIHRoaXMgY2FzZSB3ZSBoYXZlIHRoZSBVSVByb2Nlc3Mgc3ludGhlc2l6 ZSB0aGUgcmVkaXJlY3Qgbm90aWZpY2F0aW9uIGF0IHRoZSBhcHByb3ByaWF0ZSB0aW1lLgotICAg ICAgICBpZiAoaXNTZXJ2ZXJSZWRpcmVjdCkgewotICAgICAgICAgICAgbV9tYWluRnJhbWUtPmZy YW1lTG9hZFN0YXRlKCkuZGlkU3RhcnRQcm92aXNpb25hbExvYWQocmVxdWVzdC51cmwoKSk7Ci0g ICAgICAgICAgICBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JG cmFtZShtX21haW5GcmFtZS0+ZnJhbWVJRCgpLCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUocmVxdWVz dCksIHsgfSk7Ci0gICAgICAgIH0KLSAgICB9OwotCi0gICAgaWYgKCFtX3Byb2Nlc3MtPnByb2Nl c3NQb29sKCkuY29uZmlndXJhdGlvbigpLnByb2Nlc3NTd2Fwc09uV2luZG93T3BlbldpdGhPcGVu ZXIoKSB8fCAhaXNQYWdlT3BlbmVkQnlET01TaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSB8 fCAhbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcykgewotICAgICAgICAvLyBUaGVyZSBpcyBu byB3YXkgd2UnbGwgYmUgYWJsZSB0byByZXR1cm4gdG8gdGhlIHBhZ2UgaW4gdGhlIHByZXZpb3Vz IHBhZ2Ugc28gY2xvc2UgaXQuCi0gICAgICAgIGlmICghZGlkU3VzcGVuZFByZXZpb3VzUGFnZSkK LSAgICAgICAgICAgIHByZXZpb3VzUHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xv c2UoKSwgbV9wYWdlSUQpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgbV9tYWluRnJh bWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIgPSBbdGhpcywgcHJldmlvdXNQcm9jZXNzID0gV1RGTW92 ZShwcmV2aW91c1Byb2Nlc3MpLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzID0gKm1haW5G cmFtZUlESW5QcmV2aW91c1Byb2Nlc3NdKGNvbnN0IEdsb2JhbFdpbmRvd0lkZW50aWZpZXImIHdp bmRvd0lkZW50aWZpZXIpIHsKLSAgICAgICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKLSAgICAgICAg R2xvYmFsRnJhbWVJZGVudGlmaWVyIG5hdmlnYXRlZEZyYW1lSWRlbnRpZmllckluTmV3UHJvY2Vz cyB7IHBhZ2VJRCgpLCBtX21haW5GcmFtZS0+ZnJhbWVJRCgpIH07Ci0gICAgICAgIHByZXZpb3Vz UHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RnJhbWVCZWNhbWVSZW1vdGUobWFpbkZy YW1lSURJblByZXZpb3VzUHJvY2VzcywgbmF2aWdhdGVkRnJhbWVJZGVudGlmaWVySW5OZXdQcm9j ZXNzLCB3aW5kb3dJZGVudGlmaWVyKSwgcGFnZUlEKCkpOwotICAgIH07CisgICAgICAgIG1fcHJv dmlzaW9uYWxQYWdlLT5sb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIFJlc291 cmNlUmVxdWVzdCB7IG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKSB9LCBXZWJDb3JlOjpTaG91 bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGRBbGxvd0V4dGVybmFsU2NoZW1lcywgbnVs bHB0ciwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKIH0KIAogYm9vbCBXZWJQYWdlUHJveHk6 OmlzUGFnZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgY29uc3QKQEAg LTM2OTMsMTEgKzM2NjcsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1l KHVpbnQ2NF90IGZyYW1lSUQpCiAKICAgICAvLyBBZGQgdGhlIGZyYW1lIHRvIHRoZSBwcm9jZXNz IHdpZGUgbWFwLgogICAgIG1fcHJvY2Vzcy0+ZnJhbWVDcmVhdGVkKGZyYW1lSUQsICptX21haW5G cmFtZSk7Ci0KLSAgICBpZiAobV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIpIHsKLSAgICAgICAg bV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIoKTsKLSAgICAgICAgbV9tYWluRnJhbWVDcmVhdGlv bkhhbmRsZXIgPSBudWxscHRyOwotICAgIH0KIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZENy ZWF0ZVN1YmZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCkBAIC0zNzIyLDEwICszNjkxLDYgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVN1YmZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCiAKIHZv aWQgV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVXaW5kb3codWludDY0X3QgZnJhbWVJRCwgR2xvYmFs V2luZG93SWRlbnRpZmllciYmIHdpbmRvd0lkZW50aWZpZXIpCiB7Ci0gICAgaWYgKG1fbWFpbkZy YW1lICYmIG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkgPT0gZnJhbWVJRCkgewotICAgICAgICBpZiAo YXV0byBtYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIgPSBXVEZNb3ZlKG1fbWFpbkZyYW1l V2luZG93Q3JlYXRpb25IYW5kbGVyKSkKLSAgICAgICAgICAgIG1haW5GcmFtZVdpbmRvd0NyZWF0 aW9uSGFuZGxlcih3aW5kb3dJZGVudGlmaWVyKTsKLSAgICB9CiB9CiAKIGRvdWJsZSBXZWJQYWdl UHJveHk6OmVzdGltYXRlZFByb2dyZXNzKCkgY29uc3QKQEAgLTM3NzgsNiArMzc0MywxMCBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRGVzdHJveU5hdmlnYXRpb24odWludDY0X3QgbmF2aWdhdGlv bklEKQogewogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7 CiAKKyAgICAvLyBPbiBwcm9jZXNzLXN3YXAsIHRoZSBwcmV2aW91cyBwcm9jZXNzIHRyaWVzIHRv IGRlc3Ryb3kgdGhlIG5hdmlnYXRpb24gYnV0IHRoZSBwcm92aXNpb25hbCBwcm9jZXNzIGlzIGFj dHVhbGx5IHRha2luZyBvdmVyIHRoZSBuYXZpZ2F0aW9uLgorICAgIGlmIChtX3Byb3Zpc2lvbmFs UGFnZSAmJiBtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkgPT0gbmF2aWdhdGlvbklE KQorICAgICAgICByZXR1cm47CisKICAgICAvLyBGSVhNRTogTWVzc2FnZSBjaGVjayB0aGUgbmF2 aWdhdGlvbklELgogICAgIG1fbmF2aWdhdGlvblN0YXRlLT5kaWREZXN0cm95TmF2aWdhdGlvbihu YXZpZ2F0aW9uSUQpOwogfQpAQCAtMzc5NSwxNCArMzc2NCw2IEBAIHZvaWQgV2ViUGFnZVByb3h5 OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2 NF90IG5hCiAgICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpICYmIG5hdmlnYXRpb25JRCkKICAg ICAgICAgbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRpb24obmF2aWdhdGlv bklEKTsKIAotICAgIC8vIElmIHRoaXMgc2VlbWluZ2x5IG5ldyBsb2FkIGlzIGFjdHVhbGx5IGNv bnRpbnVpbmcgYSBzZXJ2ZXIgcmVkaXJlY3QgZm9yIGEgcHJldmlvdXMgbmF2aWdhdGlvbiBpbiBh IG5ldyBwcm9jZXNzLAotICAgIC8vIHRoZW4gd2UgaWdub3JlIHRoaXMgbm90aWZpY2F0aW9uLgot ICAgIGlmIChuYXZpZ2F0aW9uICYmIG5hdmlnYXRpb24tPmN1cnJlbnRSZXF1ZXN0SXNSZWRpcmVj dCgpKSB7Ci0gICAgICAgIGF1dG8gbmF2aWdhdGlvblByb2Nlc3NJZGVudGlmaWVyID0gbmF2aWdh dGlvbi0+Y3VycmVudFJlcXVlc3RQcm9jZXNzSWRlbnRpZmllcigpOwotICAgICAgICBpZiAobmF2 aWdhdGlvblByb2Nlc3NJZGVudGlmaWVyICYmICpuYXZpZ2F0aW9uUHJvY2Vzc0lkZW50aWZpZXIg IT0gbV9wcm9jZXNzLT5jb3JlUHJvY2Vzc0lkZW50aWZpZXIoKSkKLSAgICAgICAgICAgIHJldHVy bjsKLSAgICB9Ci0KICAgICBMT0coTG9hZGluZywgIldlYlBhZ2VQcm94eSAlIiBQUkl1NjQgIiBp biBwcm9jZXNzIHBpZCAlaSBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lIHRvIGZyYW1l SUQgJSIgUFJJdTY0ICIsIG5hdmlnYXRpb25JRCAlIiBQUkl1NjQgIiwgdXJsICVzIiwgbV9wYWdl SUQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgZnJhbWVJRCwgbmF2aWdhdGlvbklE LCB1cmwuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RChMb2FkaW5nLCAiZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTogd2ViUElEID0gJWks IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnBy b2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlELCBmcmFtZUlEKTsKIApAQCAtMzkxMCw2ICszODcx LDExIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUo dWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2VjdXJpCiAKICAgICBQYWdlQ2xpZW50UHJvdGVjdG9y IHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlICYm IG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSA9PSBuYXZpZ2F0aW9uSUQgJiYgJm1f cHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCkgIT0gbV9wcm9jZXNzLnB0cigpKSB7CisgICAgICAg IC8vIFRoZSBsb2FkIGRpZCBub3QgZmFpbCwgaXQgbWVyZWx5IGhhcHBlbmluZyBpbiBhIG5ldyBw cm92aXNpb25hbCBwcm9jZXNzLgorICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgV2ViRnJh bWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwogICAgIE1FU1NB R0VfQ0hFQ0soZnJhbWUpOwogCkBAIC0zOTQ4LDYgKzM5MTQsMTAgQEAgdm9pZCBXZWJQYWdlUHJv eHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25z dCBTZWN1cmkKICAgICB9CiAKICAgICBtX2ZhaWxpbmdQcm92aXNpb25hbExvYWRVUkwgPSB7IH07 CisKKyAgICAvLyBJZiB0aGUgcHJvdmlzaW9uYWwgcGFnZSdzIGxvYWQgZmFpbHMgdGhlbiB3ZSBk ZXN0cm95IHRoZSBwcm92aXNpb25hbCBwYWdlLgorICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZSAm JiBtX3Byb3Zpc2lvbmFsUGFnZS0+bWFpbkZyYW1lKCkgPT0gZnJhbWUpCisgICAgICAgIG1fcHJv dmlzaW9uYWxQYWdlID0gbnVsbHB0cjsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmNsZWFyTG9h ZERlcGVuZGVudENhbGxiYWNrcygpCkBAIC00MzM5LDggKzQzMDksOCBAQCB2b2lkIFdlYlBhZ2VQ cm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jKHVpbnQ2NF90IGZyYW1l SUQsIFdlYkNvcgogICAgIGF1dG8qIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlE KTsKICAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKIAotICAgIGRlY2lkZVBvbGljeUZvck5hdmln YXRpb25BY3Rpb24oKmZyYW1lLCBXVEZNb3ZlKGZyYW1lU2VjdXJpdHlPcmlnaW4pLCBuYXZpZ2F0 aW9uSUQsIFdURk1vdmUobmF2aWdhdGlvbkFjdGlvbkRhdGEpLCBXVEZNb3ZlKGZyYW1lSW5mb0Rh dGEpLCBvcmlnaW5hdGluZ1BhZ2VJRCwgb3JpZ2luYWxSZXF1ZXN0LCBXVEZNb3ZlKHJlcXVlc3Qp LCBXVEZNb3ZlKHJlcXVlc3RCb2R5KSwgV1RGTW92ZShyZWRpcmVjdFJlc3BvbnNlKSwgdXNlckRh dGEsIFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBt YWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRF0gKGF1dG8uLi4gYXJncykgewotICAg ICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xpY3lE ZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQpOworICAgIGRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oKmZyYW1lLCBXVEZNb3ZlKGZyYW1lU2VjdXJp dHlPcmlnaW4pLCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUobmF2aWdhdGlvbkFjdGlvbkRhdGEpLCBX VEZNb3ZlKGZyYW1lSW5mb0RhdGEpLCBvcmlnaW5hdGluZ1BhZ2VJRCwgb3JpZ2luYWxSZXF1ZXN0 LCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKHJlcXVlc3RCb2R5KSwgV1RGTW92ZShyZWRpcmVj dFJlc3BvbnNlKSwgdXNlckRhdGEsIFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMs IHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRCwgcHJv Y2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCldIChhdXRvLi4uIGFyZ3MpIHsKKyAgICAgICAgcHJv Y2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZy YW1lSUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CiAgICAgfSkpOwogfQogCkBA IC00NTc0LDEyICs0NTQ0LDEyIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JS ZXNwb25zZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cml0eU9yaWdpCiAgICAgTUVTU0FH RV9DSEVDS19VUkwocmVzcG9uc2UudXJsKCkpOwogCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlv bj4gbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25JRCA/IG1fbmF2aWdhdGlvblN0YXRlLT5uYXZpZ2F0 aW9uKG5hdmlnYXRpb25JRCkgOiBudWxscHRyOwotICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtlUmVm KGZyYW1lLT5zZXRVcFBvbGljeUxpc3RlbmVyUHJveHkoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBt YWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRCwgbmF2aWdhdGlvbiA9IFdURk1vdmUo bmF2aWdhdGlvbildIChXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCBBUEk6OldlYnNpdGVQ b2xpY2llcyosIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0 ZWRCeUNsaWVudCwgUmVmUHRyPFNhZmVCcm93c2luZ1dhcm5pbmc+JiYgc2FmZUJyb3dzaW5nV2Fy bmluZykgbXV0YWJsZSB7CisgICAgYXV0byBsaXN0ZW5lciA9IG1ha2VSZWYoZnJhbWUtPnNldFVw UG9saWN5TGlzdGVuZXJQcm94eShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMp LCBmcmFtZUlELCBsaXN0ZW5lcklELCBuYXZpZ2F0aW9uID0gV1RGTW92ZShuYXZpZ2F0aW9uKSwg cHJvY2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCldIChXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0 aW9uLCBBUEk6OldlYnNpdGVQb2xpY2llcyosIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQg cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgUmVmUHRyPFNhZmVCcm93c2luZ1dhcm5pbmc+ JiYgc2FmZUJyb3dzaW5nV2FybmluZykgbXV0YWJsZSB7CiAgICAgICAgIC8vIEZJWE1FOiBBc3Nl cnQgdGhlIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiBpcyBudWxscHRyIGhlcmUgb25jZSBjbGllbnRz IG9mIFdLRnJhbWVQb2xpY3lMaXN0ZW5lclVzZVdpdGhQb2xpY2llcyBnbyBhd2F5LgogICAgICAg ICBSRUxFQVNFX0FTU0VSVChwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50ID09IFByb2Nlc3NT d2FwUmVxdWVzdGVkQnlDbGllbnQ6Ok5vKTsKICAgICAgICAgQVNTRVJUX1VOVVNFRChzYWZlQnJv d3NpbmdXYXJuaW5nLCAhc2FmZUJyb3dzaW5nV2FybmluZyk7Ci0gICAgICAgIHJlY2VpdmVkUG9s aWN5RGVjaXNpb24ocG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uLmdldCgpLCBXVEY6Om51bGxvcHQs IFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZN b3ZlKHByb3RlY3RlZFRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklEXSAoYXV0by4uLiBhcmdzKSB7 Ci0gICAgICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2Vp dmVQb2xpY3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQp OworICAgICAgICByZWNlaXZlZFBvbGljeURlY2lzaW9uKHBvbGljeUFjdGlvbiwgbmF2aWdhdGlv bi5nZXQoKSwgV1RGOjpudWxsb3B0LCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlz LCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKSwgZnJhbWVJRCwgbGlzdGVu ZXJJRCwgcHJvY2VzcyA9IFdURk1vdmUocHJvY2VzcyldIChhdXRvLi4uIGFyZ3MpIHsKKyAgICAg ICAgICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xpY3lE ZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQpOwogICAgICAg ICB9KSk7CiAgICAgfSwgU2hvdWxkRXhwZWN0U2FmZUJyb3dzaW5nUmVzdWx0OjpObykpOwogCkBA IC02NDg2LDggKzY0NTYsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cHJvY2Vzc1dpbGxCZWNvbWVG b3JlZ3JvdW5kKCkKIHZvaWQgV2ViUGFnZVByb3h5OjpyZXNldFN0YXRlKFJlc2V0U3RhdGVSZWFz b24gcmVzZXRTdGF0ZVJlYXNvbikKIHsKICAgICBtX21haW5GcmFtZSA9IG51bGxwdHI7Ci0gICAg bV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIgPSBudWxscHRyOwotICAgIG1fbWFpbkZyYW1lV2lu ZG93Q3JlYXRpb25IYW5kbGVyID0gbnVsbHB0cjsKIAogI2lmIFBMQVRGT1JNKENPQ09BKQogICAg IG1fc2Nyb2xsaW5nUGVyZm9ybWFuY2VEYXRhID0gbnVsbHB0cjsKQEAgLTY3NzgsNiArNjc0Niwx MCBAQCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJh bWV0ZXJzKCkKICAgICBwYXJhbWV0ZXJzLmFwcGxpY2F0aW9uTWFuaWZlc3QgPSBtX2NvbmZpZ3Vy YXRpb24tPmFwcGxpY2F0aW9uTWFuaWZlc3QoKSA/IE9wdGlvbmFsPFdlYkNvcmU6OkFwcGxpY2F0 aW9uTWFuaWZlc3Q+KG1fY29uZmlndXJhdGlvbi0+YXBwbGljYXRpb25NYW5pZmVzdCgpLT5hcHBs aWNhdGlvbk1hbmlmZXN0KCkpIDogV1RGOjpudWxsb3B0OwogI2VuZGlmCiAKKyNpZiBFTkFCTEUo U0VSVklDRV9XT1JLRVIpCisgICAgcGFyYW1ldGVycy5oYXNSZWdpc3RlcmVkU2VydmljZVdvcmtl cnMgPSBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS5tYXlIYXZlUmVnaXN0ZXJlZFNlcnZpY2VXb3Jr ZXJzKG1fd2Vic2l0ZURhdGFTdG9yZSk7CisjZW5kaWYKKwogICAgIHBhcmFtZXRlcnMubmVlZHNG b250QXR0cmlidXRlcyA9IG1fbmVlZHNGb250QXR0cmlidXRlczsKIAogICAgIG1fcHJvY2Vzcy0+ YWRkV2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJveHkobV91c2VyQ29udGVudENvbnRyb2xsZXIs IHBhcmFtZXRlcnMpOwpAQCAtODUzOSw2ICs4NTExLDIxIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpz aW11bGF0ZURldmljZU9yaWVudGF0aW9uQ2hhbmdlKGRvdWJsZSBhbHBoYSwgZG91YmxlIGJldGEs IGRvCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTaW11bGF0ZURldmlj ZU9yaWVudGF0aW9uQ2hhbmdlKGFscGhhLCBiZXRhLCBnYW1tYSksIG1fcGFnZUlEKTsKIH0KIAor V2ViUGFnZVByb3h5OjpQYWdlUHJvY2Vzc092ZXJyaWRlOjpQYWdlUHJvY2Vzc092ZXJyaWRlKFdl YlBhZ2VQcm94eSYgcGFnZSwgV2ViUHJvY2Vzc1Byb3h5JiBuZXdQcm9jZXNzKQorICAgIDogbV9w YWdlKCZwYWdlKQorICAgICwgbV9wcmV2aW91c1Byb2Nlc3MocGFnZS5wcm9jZXNzKCkpCit7Cisg ICAgcGFnZS5tX3Byb2Nlc3MgPSBuZXdQcm9jZXNzOworfQorCitXZWJQYWdlUHJveHk6OlBhZ2VQ cm9jZXNzT3ZlcnJpZGU6OlBhZ2VQcm9jZXNzT3ZlcnJpZGUoUGFnZVByb2Nlc3NPdmVycmlkZSYm KSA9IGRlZmF1bHQ7CisKK1dlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6flBhZ2VQ cm9jZXNzT3ZlcnJpZGUoKQoreworICAgIGlmIChtX3BhZ2UpCisgICAgICAgIG1fcGFnZS0+bV9w cm9jZXNzID0gV1RGTW92ZShtX3ByZXZpb3VzUHJvY2Vzcyk7Cit9CisKICNpZiBFTkFCTEUoREFU QV9ERVRFQ1RJT04pCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkZXRlY3REYXRhSW5BbGxGcmFtZXMo V2ViQ29yZTo6RGF0YURldGVjdG9yVHlwZXMgdHlwZXMsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo Y29uc3QgRGF0YURldGVjdGlvblJlc3VsdCYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBjZDgwMWI4MDhjNDZlNDUwZDhjZGFk NDk3MDhmNDdmOGYwMTM3MDI5Li4zOWZkMjU5YWI4MzhkZTM2ZmI5NjhlOGVkY2RiZDY4ZGZjNmE0 NmVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMjI1LDYgKzIy NSw3IEBAIGNsYXNzIE5hdGl2ZVdlYktleWJvYXJkRXZlbnQ7CiBjbGFzcyBOYXRpdmVXZWJNb3Vz ZUV2ZW50OwogY2xhc3MgTmF0aXZlV2ViV2hlZWxFdmVudDsKIGNsYXNzIFBhZ2VDbGllbnQ7Citj bGFzcyBQcm92aXNpb25hbFBhZ2VQcm94eTsKIGNsYXNzIFJlbW90ZUxheWVyVHJlZUhvc3Q7CiBj bGFzcyBSZW1vdGVMYXllclRyZWVTY3JvbGxpbmdQZXJmb3JtYW5jZURhdGE7CiBjbGFzcyBSZW1v dGVMYXllclRyZWVUcmFuc2FjdGlvbjsKQEAgLTM3OSw2ICszODAsNyBAQCBwdWJsaWM6CiAKICAg ICBib29sIGFkZHNWaXNpdGVkTGlua3MoKSBjb25zdCB7IHJldHVybiBtX2FkZHNWaXNpdGVkTGlu a3M7IH0KICAgICB2b2lkIHNldEFkZHNWaXNpdGVkTGlua3MoYm9vbCBhZGRzVmlzaXRlZExpbmtz KSB7IG1fYWRkc1Zpc2l0ZWRMaW5rcyA9IGFkZHNWaXNpdGVkTGlua3M7IH0KKyAgICBWaXNpdGVk TGlua1N0b3JlJiB2aXNpdGVkTGlua1N0b3JlKCkgeyByZXR1cm4gbV92aXNpdGVkTGlua1N0b3Jl OyB9CiAKICAgICB2b2lkIGV4aXRGdWxsc2NyZWVuSW1tZWRpYXRlbHkoKTsKICAgICB2b2lkIGZ1 bGxzY3JlZW5NYXlSZXR1cm5Ub0lubGluZSgpOwpAQCAtNDU4LDggKzQ2MCw4IEBAIHB1YmxpYzoK ICAgICBBUEk6Okljb25Mb2FkaW5nQ2xpZW50JiBpY29uTG9hZGluZ0NsaWVudCgpIHsgcmV0dXJu ICptX2ljb25Mb2FkaW5nQ2xpZW50OyB9CiAgICAgdm9pZCBzZXRJY29uTG9hZGluZ0NsaWVudChz dGQ6OnVuaXF1ZV9wdHI8QVBJOjpJY29uTG9hZGluZ0NsaWVudD4mJik7CiAKLSAgICBlbnVtIGNs YXNzIElzU3dhcEZyb21TdXNwZW5kZWQgeyBObywgWWVzIH07Ci0gICAgdm9pZCBpbml0aWFsaXpl V2ViUGFnZShJc1N3YXBGcm9tU3VzcGVuZGVkID0gSXNTd2FwRnJvbVN1c3BlbmRlZDo6Tm8pOwor ICAgIHZvaWQgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsKKyAgICB2b2lkIHNldERyYXdpbmdBcmVhKHN0 ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmKTsKIAogICAgIFdlYWtQdHI8U2VjS2V5 UHJveHlTdG9yZT4gc2VjS2V5UHJveHlTdG9yZShjb25zdCBXZWJDb3JlOjpBdXRoZW50aWNhdGlv bkNoYWxsZW5nZSYpOwogICAgICAgICAKQEAgLTEwMjUsNiArMTAyNywxOSBAQCBwdWJsaWM6CiAg ICAgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKCkgeyByZXR1cm4gbV9wcm9jZXNzOyB9CiAgICAg UHJvY2Vzc0lEIHByb2Nlc3NJZGVudGlmaWVyKCkgY29uc3Q7CiAKKyAgICBjbGFzcyBQYWdlUHJv Y2Vzc092ZXJyaWRlIHsKKyAgICBwdWJsaWM6CisgICAgICAgIFBhZ2VQcm9jZXNzT3ZlcnJpZGUo V2ViUGFnZVByb3h5JiwgV2ViUHJvY2Vzc1Byb3h5JiBuZXdQcm9jZXNzKTsKKyAgICAgICAgUGFn ZVByb2Nlc3NPdmVycmlkZShQYWdlUHJvY2Vzc092ZXJyaWRlJiYpOworICAgICAgICB+UGFnZVBy b2Nlc3NPdmVycmlkZSgpOworCisgICAgcHJpdmF0ZToKKyAgICAgICAgUmVmUHRyPFdlYlBhZ2VQ cm94eT4gbV9wYWdlOworICAgICAgICBSZWY8V2ViUHJvY2Vzc1Byb3h5PiBtX3ByZXZpb3VzUHJv Y2VzczsKKyAgICB9OworCisgICAgUGFnZVByb2Nlc3NPdmVycmlkZSB0ZW1wb3JhcmlseU92ZXJy aWRlUHJvY2VzcyhXZWJQcm9jZXNzUHJveHkmIG5ld1Byb2Nlc3MpIHsgcmV0dXJuIFBhZ2VQcm9j ZXNzT3ZlcnJpZGUoKnRoaXMsIG5ld1Byb2Nlc3MpOyB9CisKICAgICBXZWJQcmVmZXJlbmNlcyYg cHJlZmVyZW5jZXMoKSB7IHJldHVybiBtX3ByZWZlcmVuY2VzOyB9CiAgICAgdm9pZCBzZXRQcmVm ZXJlbmNlcyhXZWJQcmVmZXJlbmNlcyYpOwogCkBAIC0xNDE0LDYgKzE0MjksMjEgQEAgcHVibGlj OgogICAgIEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyJiBlZGl0YWJsZUltYWdlQ29udHJvbGxlcigp IHsgcmV0dXJuICptX2VkaXRhYmxlSW1hZ2VDb250cm9sbGVyOyB9CiAjZW5kaWYKIAorICAgIFBy b3Zpc2lvbmFsUGFnZVByb3h5KiBwcm92aXNpb25hbFBhZ2VQcm94eSgpIGNvbnN0IHsgcmV0dXJu IG1fcHJvdmlzaW9uYWxQYWdlLmdldCgpOyB9CisgICAgdm9pZCBjb21taXRQcm92aXNpb25hbFBh Z2UodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcm IG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBm cmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mLCBib29sIGNvbnRh aW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4g Zm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYpOworCisgICAgdm9pZCBk aWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90 IG5hdmlnYXRpb25JRCwgVVJMJiYsIFVSTCYmIHVucmVhY2hhYmxlVVJMLCBjb25zdCBVc2VyRGF0 YSYpOworICAgIHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZy YW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9y aWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJM LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2 b2lkIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVp bnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0JiYsIGNvbnN0IFVzZXJEYXRhJik7CisKKyAgICB2b2lkIGxvYWREYXRhV2l0aE5hdmln YXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiwgY29uc3Qg U3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBi YXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250 aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9w dCk7CisgICAgdm9pZCBsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYs IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxV UkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXND b250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVs bG9wdCk7CisKKyAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgorICAgIC8vIEltcGxlbWVudGVk IGluIGdlbmVyYXRlZCBXZWJQYWdlUHJveHlNZXNzYWdlUmVjZWl2ZXIuY3BwCisgICAgdm9pZCBk aWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImKSBvdmVycmlk ZTsKKyAgICB2b2lkIGRpZFJlY2VpdmVTeW5jTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6 OkRlY29kZXImLCBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVyPiYpIG92ZXJyaWRlOworCiBw cml2YXRlOgogICAgIFdlYlBhZ2VQcm94eShQYWdlQ2xpZW50JiwgV2ViUHJvY2Vzc1Byb3h5Jiwg dWludDY0X3QgcGFnZUlELCBSZWY8QVBJOjpQYWdlQ29uZmlndXJhdGlvbj4mJik7CiAgICAgdm9p ZCBwbGF0Zm9ybUluaXRpYWxpemUoKTsKQEAgLTE0MzgsMTIgKzE0NjgsNiBAQCBwcml2YXRlOgog CiAgICAgdm9pZCBzZXRVc2VyQWdlbnQoU3RyaW5nJiYpOwogCi0gICAgLy8gSVBDOjpNZXNzYWdl UmVjZWl2ZXIKLSAgICAvLyBJbXBsZW1lbnRlZCBpbiBnZW5lcmF0ZWQgV2ViUGFnZVByb3h5TWVz c2FnZVJlY2VpdmVyLmNwcAotICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0 aW9uJiwgSVBDOjpEZWNvZGVyJikgb3ZlcnJpZGU7Ci0gICAgdm9pZCBkaWRSZWNlaXZlU3luY01l c3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJiwgc3RkOjp1bmlxdWVfcHRyPElQ Qzo6RW5jb2Rlcj4mKSBvdmVycmlkZTsKLQotCiAgICAgLy8gSVBDOjpNZXNzYWdlU2VuZGVyCiAg ICAgYm9vbCBzZW5kTWVzc2FnZShzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVyPiwgT3B0aW9u U2V0PElQQzo6U2VuZE9wdGlvbj4pIG92ZXJyaWRlOwogICAgIElQQzo6Q29ubmVjdGlvbiogbWVz c2FnZVNlbmRlckNvbm5lY3Rpb24oKSBvdmVycmlkZTsKQEAgLTE0NjUsMTIgKzE0ODksOSBAQCBw cml2YXRlOgogICAgIHZvaWQgZGlkQ3JlYXRlU3ViZnJhbWUodWludDY0X3QgZnJhbWVJRCk7CiAg ICAgdm9pZCBkaWRDcmVhdGVXaW5kb3codWludDY0X3QgZnJhbWVJRCwgV2ViQ29yZTo6R2xvYmFs V2luZG93SWRlbnRpZmllciYmKTsKIAotICAgIHZvaWQgZGlkU3RhcnRQcm92aXNpb25hbExvYWRG b3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmLCBV UkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmKTsKLSAgICB2b2lkIGRpZFJlY2Vp dmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1l SUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIGNv bnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCB3aWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0Rm9yRnJh bWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGRvdWJsZSBkZWxheSwgV2Vi Q29yZTo6TG9ja0JhY2tGb3J3YXJkTGlzdCk7CiAgICAgdm9pZCBkaWRDYW5jZWxDbGllbnRSZWRp cmVjdEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpOwogICAgIHZvaWQgZGlkQ2hhbmdlUHJvdmlz aW9uYWxVUkxGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQs IFVSTCYmKTsKLSAgICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRf dCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJp dHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25h bFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIGNvbnN0IFVzZXJEYXRhJik7CiAg ICAgdm9pZCBkaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3Qg bmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9t Q29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpD ZXJ0aWZpY2F0ZUluZm8mLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdl YkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25z dCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUodWlu dDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBVc2VyRGF0YSYpOwog ICAgIHZvaWQgZGlkRmluaXNoTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90 IG5hdmlnYXRpb25JRCwgY29uc3QgVXNlckRhdGEmKTsKQEAgLTE1NzQsMTggKzE1OTUsMTYgQEAg cHJpdmF0ZToKICAgICB2b2lkIHNldENhblNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50 cyhib29sIGNhblNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50cykgeyBtX2NhblNob3J0 Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50cyA9IGNhblNob3J0Q2lyY3VpdEhvcml6b250YWxX aGVlbEV2ZW50czsgfQogCiAgICAgdm9pZCByZWF0dGFjaFRvV2ViUHJvY2VzcygpOwotICAgIHZv aWQgc3dhcFRvV2ViUHJvY2VzcyhSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmLCBzdGQ6OnVuaXF1ZV9w dHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmLCBJc1N3YXBGcm9tU3VzcGVuZGVkKTsKKyAgICB2b2lk IHN3YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiwgc3RkOjp1bmlxdWVfcHRy PERyYXdpbmdBcmVhUHJveHk+JiYsIFJlZlB0cjxXZWJGcmFtZVByb3h5PiYmIG1haW5GcmFtZSk7 CiAgICAgdm9pZCBkaWRGYWlsVG9TdXNwZW5kQWZ0ZXJQcm9jZXNzU3dhcCgpOwogICAgIHZvaWQg ZGlkU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAoKTsKIAotICAgIHZvaWQgZmluaXNoQXR0YWNoaW5n VG9XZWJQcm9jZXNzKElzU3dhcEZyb21TdXNwZW5kZWQgPSBJc1N3YXBGcm9tU3VzcGVuZGVkOjpO byk7CisgICAgZW51bSBjbGFzcyBTaG91bGRJbml0aWFsaXplV2ViUGFnZSB7IE5vLCBZZXMgfTsK KyAgICB2b2lkIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhTaG91bGRJbml0aWFsaXplV2Vi UGFnZSA9IFNob3VsZEluaXRpYWxpemVXZWJQYWdlOjpZZXMpOwogCiAgICAgUmVmUHRyPEFQSTo6 TmF2aWdhdGlvbj4gcmVhdHRhY2hUb1dlYlByb2Nlc3NGb3JSZWxvYWQoKTsKICAgICBSZWZQdHI8 QVBJOjpOYXZpZ2F0aW9uPiByZWF0dGFjaFRvV2ViUHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tGb3J3 YXJkTGlzdEl0ZW0mKTsKIAotICAgIHZvaWQgbG9hZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5h dmlnYXRpb24mLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBjb25zdCBTdHJpbmcmIE1JTUVU eXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6 T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBP cHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKLSAgICB2b2lk IGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQ STo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2Fk LCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKLQogICAg IHZvaWQgcmVxdWVzdE5vdGlmaWNhdGlvblBlcm1pc3Npb24odWludDY0X3Qgbm90aWZpY2F0aW9u SUQsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nKTsKICAgICB2b2lkIHNob3dOb3RpZmljYXRp b24oY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcm IGljb25VUkwsIGNvbnN0IFN0cmluZyYgdGFnLCBjb25zdCBTdHJpbmcmIGxhbmcsIFdlYkNvcmU6 Ok5vdGlmaWNhdGlvbkRpcmVjdGlvbiwgY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2 NF90IG5vdGlmaWNhdGlvbklEKTsKICAgICB2b2lkIGNhbmNlbE5vdGlmaWNhdGlvbih1aW50NjRf dCBub3RpZmljYXRpb25JRCk7CkBAIC0xOTUxLDggKzE5NzAsNiBAQCBwcml2YXRlOgogICAgIFJl ZjxXZWJzaXRlRGF0YVN0b3JlPiBtX3dlYnNpdGVEYXRhU3RvcmU7CiAKICAgICBSZWZQdHI8V2Vi RnJhbWVQcm94eT4gbV9tYWluRnJhbWU7Ci0gICAgRnVuY3Rpb248dm9pZCgpPiBtX21haW5GcmFt ZUNyZWF0aW9uSGFuZGxlcjsKLSAgICBGdW5jdGlvbjx2b2lkKGNvbnN0IFdlYkNvcmU6Okdsb2Jh bFdpbmRvd0lkZW50aWZpZXImKT4gbV9tYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXI7CiAK ICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9mb2N1c2VkRnJhbWU7CiAgICAgUmVmUHRyPFdl YkZyYW1lUHJveHk+IG1fZnJhbWVTZXRMYXJnZXN0RnJhbWU7CkBAIC0yMzIyLDYgKzIzMzksOCBA QCBwcml2YXRlOgogICAgIGJvb2wgbV9uZWVkc0ZvbnRBdHRyaWJ1dGVzIHsgZmFsc2UgfTsKICAg ICBib29sIG1fbWF5SGF2ZVVuaXZlcnNhbEZpbGVSZWFkU2FuZGJveEV4dGVuc2lvbiB7IGZhbHNl IH07CiAKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJvdmlzaW9uYWxQYWdlUHJveHk+IG1fcHJvdmlz aW9uYWxQYWdlOworCiAjaWYgSEFWRShQRU5DSUxLSVQpCiAgICAgc3RkOjp1bmlxdWVfcHRyPEVk aXRhYmxlSW1hZ2VDb250cm9sbGVyPiBtX2VkaXRhYmxlSW1hZ2VDb250cm9sbGVyOwogI2VuZGlm CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3Bw IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAppbmRleCBkYjFm ZDU4YjkzZGZmNTg2NWQxM2ZjNTQxYjZlNWQ4NzQ2ZWI4ZTBhLi5kYWJlZGJjMGE3NDQxMjZiZGU2 OGQ1OTQ2ZDc1MzFmZWY3NWM3NTU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBy b2Nlc3NQcm94eS5jcHAKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAj aW5jbHVkZSAiUGx1Z2luSW5mb1N0b3JlLmgiCiAjaW5jbHVkZSAiUGx1Z2luUHJvY2Vzc01hbmFn ZXIuaCIKKyNpbmNsdWRlICJQcm92aXNpb25hbFBhZ2VQcm94eS5oIgogI2luY2x1ZGUgIlRleHRD aGVja2VyLmgiCiAjaW5jbHVkZSAiVGV4dENoZWNrZXJTdGF0ZS5oIgogI2luY2x1ZGUgIlVJTWVz c2FnZVBvcnRDaGFubmVsUHJvdmlkZXIuaCIKQEAgLTU4NCw2ICs1ODUsMTUgQEAgYm9vbCBXZWJQ cm9jZXNzUHJveHk6OmZ1bGxLZXlib2FyZEFjY2Vzc0VuYWJsZWQoKQogfQogI2VuZGlmCiAKK2Jv b2wgV2ViUHJvY2Vzc1Byb3h5OjpoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQodWludDY0X3QgcGFn ZUlEKSBjb25zdAoreworICAgIGZvciAoYXV0byogcHJvdmlzaW9uYWxQYWdlIDogbV9wcm92aXNp b25hbFBhZ2VzKSB7CisgICAgICAgIGlmIChwcm92aXNpb25hbFBhZ2UtPnBhZ2UoKS5wYWdlSUQo KSA9PSBwYWdlSUQpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJu IGZhbHNlOworfQorCiB2b2lkIFdlYlByb2Nlc3NQcm94eTo6dXBkYXRlQmFja0ZvcndhcmRJdGVt KGNvbnN0IEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSYgaXRlbVN0YXRlKQogewogICAgIGlmIChh dXRvKiBpdGVtID0gV2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6aXRlbUZvcklEKGl0ZW1TdGF0ZS5p ZGVudGlmaWVyKSkgewpAQCAtNTkxLDcgKzYwMSw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojp1 cGRhdGVCYWNrRm9yd2FyZEl0ZW0oY29uc3QgQmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlJiBpdGVt CiAgICAgICAgIC8vIHRoZSBiYWNrL2ZvcndhcmQgaXRlbXMgcGFnZS4KICAgICAgICAgLy8gZS5n LiBUaGUgb2xkIHdlYiBwcm9jZXNzIGlzIG5hdmlnYXRpbmcgdG8gYWJvdXQ6YmxhbmsgZm9yIHN1 c3BlbnNpb24uCiAgICAgICAgIC8vIFdlIGlnbm9yZSB0aGVzZSB1cGRhdGVzLgotICAgICAgICBp ZiAobV9wYWdlTWFwLmNvbnRhaW5zKGl0ZW0tPnBhZ2VJRCgpKSkKKyAgICAgICAgaWYgKG1fcGFn ZU1hcC5jb250YWlucyhpdGVtLT5wYWdlSUQoKSkgfHwgaGFzUHJvdmlzaW9uYWxQYWdlV2l0aElE KGl0ZW0tPnBhZ2VJRCgpKSkKICAgICAgICAgICAgIGl0ZW0tPnNldFBhZ2VTdGF0ZShpdGVtU3Rh dGUucGFnZVN0YXRlKTsKICAgICB9CiB9CkBAIC03ODAsNiArNzkwLDEyIEBAIHZvaWQgV2ViUHJv Y2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVuY2hpbmcoUHJvY2Vzc0xhdW5jaGVyKiBsYXVuY2hlciwg SVBDOjpDb25uZWN0CiAgICAgICAgIHBhZ2UtPnByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmcoKTsK ICAgICB9CiAKKyAgICBmb3IgKGF1dG8qIHByb3Zpc2lvbmFsUGFnZSA6IG1fcHJvdmlzaW9uYWxQ YWdlcykgeworICAgICAgICBBU1NFUlQodGhpcyA9PSAmcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNz KCkpOworICAgICAgICBwcm92aXNpb25hbFBhZ2UtPnByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmco KTsKKyAgICB9CisKKwogICAgIFJFTEVBU0VfQVNTRVJUKCFtX3dlYkNvbm5lY3Rpb24pOwogICAg IG1fd2ViQ29ubmVjdGlvbiA9IFdlYkNvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmNyZWF0ZSh0aGlz KTsKIApAQCAtODczLDcgKzg4OSw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjptYXliZVNodXRE b3duKCkKIAogYm9vbCBXZWJQcm9jZXNzUHJveHk6OmNhblRlcm1pbmF0ZUNoaWxkUHJvY2Vzcygp CiB7Ci0gICAgaWYgKCFtX3BhZ2VNYXAuaXNFbXB0eSgpIHx8IG1fcHJvY2Vzc1Bvb2wtPmhhc1N1 c3BlbmRlZFBhZ2VGb3IoKnRoaXMpKQorICAgIGlmICghbV9wYWdlTWFwLmlzRW1wdHkoKSB8fCBt X3Byb2Nlc3NQb29sLT5oYXNTdXNwZW5kZWRQYWdlRm9yKCp0aGlzKSB8fCAhbV9wcm92aXNpb25h bFBhZ2VzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKCFtX3By b2Nlc3NQb29sLT5zaG91bGRUZXJtaW5hdGUodGhpcykpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlByb2Nlc3NQcm94eS5oCmluZGV4IDc1ZjY1YTdmN2ViMWFjYzgxOTk5MWNlNGY5ZjY5ODZj OTViNjFmZjMuLjUwNDI2MzBkZTM3MWQ4NWE4MjgzNzQzNDhhYTk2OTE3MzljOWNkNzAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCkBAIC03MCw2ICs3MCw3IEBA IG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgTmV0d29ya1Byb2Nlc3NQcm94eTsKIGNsYXNzIE9i akNPYmplY3RHcmFwaDsKIGNsYXNzIFBhZ2VDbGllbnQ7CitjbGFzcyBQcm92aXNpb25hbFBhZ2VQ cm94eTsKIGNsYXNzIFVzZXJNZWRpYUNhcHR1cmVNYW5hZ2VyUHJveHk7CiBjbGFzcyBWaXNpdGVk TGlua1N0b3JlOwogY2xhc3MgV2ViQmFja0ZvcndhcmRMaXN0SXRlbTsKQEAgLTEyNCw2ICsxMjUs OSBAQCBwdWJsaWM6CiAgICAgZW51bSBjbGFzcyBFbmRzVXNpbmdEYXRhU3RvcmUgOiBib29sIHsg Tm8sIFllcyB9OwogICAgIHZvaWQgcmVtb3ZlV2ViUGFnZShXZWJQYWdlUHJveHkmLCB1aW50NjRf dCBwYWdlSUQsIEVuZHNVc2luZ0RhdGFTdG9yZSk7CiAKKyAgICB2b2lkIGFkZFByb3Zpc2lvbmFs UGFnZVByb3h5KFByb3Zpc2lvbmFsUGFnZVByb3h5JiBwcm92aXNpb25hbFBhZ2UpIHsgQVNTRVJU KCFtX3Byb3Zpc2lvbmFsUGFnZXMuY29udGFpbnMoJnByb3Zpc2lvbmFsUGFnZSkpOyBtX3Byb3Zp c2lvbmFsUGFnZXMuYWRkKCZwcm92aXNpb25hbFBhZ2UpOyB9CisgICAgdm9pZCByZW1vdmVQcm92 aXNpb25hbFBhZ2VQcm94eShQcm92aXNpb25hbFBhZ2VQcm94eSYgcHJvdmlzaW9uYWxQYWdlKSB7 IEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFnZXMuY29udGFpbnMoJnByb3Zpc2lvbmFsUGFnZSkpOyBt X3Byb3Zpc2lvbmFsUGFnZXMucmVtb3ZlKCZwcm92aXNpb25hbFBhZ2UpOyB9CisKICAgICB0eXBl bmFtZSBXZWJQYWdlUHJveHlNYXA6OlZhbHVlc0NvbnN0SXRlcmF0b3JSYW5nZSBwYWdlcygpIGNv bnN0IHsgcmV0dXJuIG1fcGFnZU1hcC52YWx1ZXMoKTsgfQogICAgIHVuc2lnbmVkIHBhZ2VDb3Vu dCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZU1hcC5zaXplKCk7IH0KICAgICB1bnNpZ25lZCB2aXNp YmxlUGFnZUNvdW50KCkgY29uc3QgeyByZXR1cm4gbV92aXNpYmxlUGFnZUNvdW50ZXIudmFsdWUo KTsgfQpAQCAtMzMwLDYgKzMzNCw4IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGxvZ0RpYWdub3N0 aWNNZXNzYWdlRm9yUmVzb3VyY2VMaW1pdFRlcm1pbmF0aW9uKGNvbnN0IFN0cmluZyYgbGltaXRL ZXkpOwogCisgICAgYm9vbCBoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQodWludDY0X3QgcGFnZUlE KSBjb25zdDsKKwogICAgIGVudW0gY2xhc3MgSXNXZWFrIHsgTm8sIFllcyB9OwogICAgIHRlbXBs YXRlPHR5cGVuYW1lIFQ+IGNsYXNzIFdlYWtPclN0cm9uZ1B0ciB7CiAgICAgcHVibGljOgpAQCAt MzczLDYgKzM3OSw3IEBAIHByaXZhdGU6CiAKICAgICBXZWJQYWdlUHJveHlNYXAgbV9wYWdlTWFw OwogICAgIFdlYkZyYW1lUHJveHlNYXAgbV9mcmFtZU1hcDsKKyAgICBIYXNoU2V0PFByb3Zpc2lv bmFsUGFnZVByb3h5Kj4gbV9wcm92aXNpb25hbFBhZ2VzOwogICAgIFVzZXJJbml0aWF0ZWRBY3Rp b25NYXAgbV91c2VySW5pdGlhdGVkQWN0aW9uTWFwOwogCiAgICAgSGFzaFNldDxWaXNpdGVkTGlu a1N0b3JlKj4gbV92aXNpdGVkTGlua1N0b3JlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv V2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC54 Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDUwN2VkYjczZTc0YzNhNTdmNGVmNDcyZjVi NTQ2Y2IyZGIwNjdhYTkuLjcwNzliMjY5ODg1ZGY2N2EwZTgxOTA5MTZmMGJhMDU4NmJhMzEyMGIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2oKKysrIGIvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpA QCAtMzA5NSw2ICszMDk1LDggQEAKIAkJNDY2QkMwMzgxRkEyNjZDOTAwMkZBOUMxIC8qIFdlYlNX Q29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNw cDsgcGF0aCA9IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJNDY2QkMwMzkxRkEyNjZDOTAwMkZBOUMxIC8qIFdlYlNXQ29udGV4 dE1hbmFnZXJDb25uZWN0aW9uLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdl YlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTQ2NkJDMDNBMUZBMjY2QzkwMDJGQTlDMSAvKiBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVj dGlvbi5tZXNzYWdlcy5pbiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7IHBhdGggPSBXZWJTV0NvbnRleHRNYW5h Z2VyQ29ubmVjdGlvbi5tZXNzYWdlcy5pbjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJ NDY4MzU2OUEyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmggKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFByb3Zpc2lvbmFsUGFnZVByb3h5Lmg7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTQ2ODM1NjlCMjFFODFDQzcwMDZFMjdBMyAvKiBQcm92 aXNpb25hbFBhZ2VQcm94eS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGgg PSBQcm92aXNpb25hbFBhZ2VQcm94eS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CTQ2QTJCNjA2MUU1Njc1QTIwMEMzREVEQSAvKiBCYWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVu ZXNzVGltZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gQmFja2dy b3VuZFByb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJNDZBMkI2MDcxRTU2NzVBMjAwQzNERURBIC8qIEJhY2tncm91bmRQcm9jZXNzUmVz cG9uc2l2ZW5lc3NUaW1lci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBCYWNr Z3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVuZXNzVGltZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJNDZERjA2MzkxRjM5MDVFNTAwMTk4MEJCIC8qIE5ldHdvcmtDT1JTUHJlZmxpZ2h0 Q2hlY2tlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBOZXR3b3Jr Q09SU1ByZWZsaWdodENoZWNrZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAt NzM1MCw2ICs3MzUyLDggQEAKIAkJCQk4NkU2N0EyMjE5MEY0MTE4MDAwMDRBQjcgLyogUHJvY2Vz c1Rocm90dGxlci5jcHAgKi8sCiAJCQkJODZFNjdBMjExOTBGNDExODAwMDA0QUI3IC8qIFByb2Nl c3NUaHJvdHRsZXIuaCAqLywKIAkJCQk4MzA0OEFFNTFBQ0E0NURDMDA4MkM4MzIgLyogUHJvY2Vz c1Rocm90dGxlckNsaWVudC5oICovLAorCQkJCTQ2ODM1NjlCMjFFODFDQzcwMDZFMjdBMyAvKiBQ cm92aXNpb25hbFBhZ2VQcm94eS5jcHAgKi8sCisJCQkJNDY4MzU2OUEyMUU4MUNDNzAwNkUyN0Ez IC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmggKi8sCiAJCQkJQTU1QkE4MUIxQkEyNUIxRTAwN0NE MzNEIC8qIFJlbW90ZVdlYkluc3BlY3RvclByb3h5LmNwcCAqLywKIAkJCQlBNTVCQTgxOTFCQTI1 QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkuaCAqLywKIAkJCQlBNTVCQTgx QTFCQTI1QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkubWVzc2FnZXMuaW4g Ki8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFt ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAKaW5k ZXggMDA3NDliNDc3YTI0Y2U4Y2NjODI1MDFkOTRlMDhiNjBlZTFhNjI2My4uZmZlZDAwYzgyMDZh OTRmMGU0ZmZjN2ZmM2E4YTlkZmY4NjEzZmFjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcApAQCAtMjYzLDggKzI2Myw2IEBAIHN0YXRpYyBXZWJD b3JlOjpQb2xpY3lBY3Rpb24gdG9Qb2xpY3lBY3Rpb24oV2ViUG9saWN5QWN0aW9uIHBvbGljeUFj dGlvbikKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6SWdub3JlOwogICAg IGNhc2UgV2ViUG9saWN5QWN0aW9uOjpEb3dubG9hZDoKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6 OlBvbGljeUFjdGlvbjo6RG93bmxvYWQ7Ci0gICAgY2FzZSBXZWJQb2xpY3lBY3Rpb246OlN1c3Bl bmQ6Ci0gICAgICAgIGJyZWFrOwogICAgIH0KICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAg ICByZXR1cm4gV2ViQ29yZTo6UG9saWN5QWN0aW9uOjpJZ25vcmU7CkBAIC0yNzIsMTEgKzI3MCw4 IEBAIHN0YXRpYyBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gdG9Qb2xpY3lBY3Rpb24oV2ViUG9saWN5 QWN0aW9uIHBvbGljeUFjdGlvbikKIAogdm9pZCBXZWJGcmFtZTo6ZGlkUmVjZWl2ZVBvbGljeURl Y2lzaW9uKHVpbnQ2NF90IGxpc3RlbmVySUQsIFdlYlBvbGljeUFjdGlvbiBhY3Rpb24sIHVpbnQ2 NF90IG5hdmlnYXRpb25JRCwgRG93bmxvYWRJRCBkb3dubG9hZElELCBPcHRpb25hbDxXZWJzaXRl UG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKIHsKLSAgICBpZiAoIW1fY29yZUZyYW1l IHx8ICFtX3BvbGljeUxpc3RlbmVySUQgfHwgbGlzdGVuZXJJRCAhPSBtX3BvbGljeUxpc3RlbmVy SUQgfHwgIW1fcG9saWN5RnVuY3Rpb24pIHsKLSAgICAgICAgaWYgKGFjdGlvbiA9PSBXZWJQb2xp Y3lBY3Rpb246OlN1c3BlbmQpCi0gICAgICAgICAgICBwYWdlKCktPnNlbmQoTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6RGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAoKSk7CisgICAgaWYg KCFtX2NvcmVGcmFtZSB8fCAhbV9wb2xpY3lMaXN0ZW5lcklEIHx8IGxpc3RlbmVySUQgIT0gbV9w b2xpY3lMaXN0ZW5lcklEIHx8ICFtX3BvbGljeUZ1bmN0aW9uKQogICAgICAgICByZXR1cm47Ci0g ICAgfQogCiAgICAgRnJhbWVQb2xpY3lGdW5jdGlvbiBmdW5jdGlvbiA9IFdURk1vdmUobV9wb2xp Y3lGdW5jdGlvbik7CiAgICAgYm9vbCBmb3JOYXZpZ2F0aW9uQWN0aW9uID0gbV9wb2xpY3lGdW5j dGlvbkZvck5hdmlnYXRpb25BY3Rpb24gPT0gRm9yTmF2aWdhdGlvbkFjdGlvbjo6WWVzOwpAQCAt MjkyLDE2ICsyODcsNyBAQCB2b2lkIFdlYkZyYW1lOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24o dWludDY0X3QgbGlzdGVuZXJJRCwgV2ViUG9saWN5QWN0aW9uIGFjdAogICAgICAgICAgICAgZG9j dW1lbnRMb2FkZXItPnNldE5hdmlnYXRpb25JRChuYXZpZ2F0aW9uSUQpOwogICAgIH0KIAotICAg IGJvb2wgc2hvdWxkU3VzcGVuZCA9IGZhbHNlOwotICAgIGlmIChhY3Rpb24gPT0gV2ViUG9saWN5 QWN0aW9uOjpTdXNwZW5kKSB7Ci0gICAgICAgIHNob3VsZFN1c3BlbmQgPSB0cnVlOwotICAgICAg ICBhY3Rpb24gPSBXZWJQb2xpY3lBY3Rpb246Oklnbm9yZTsKLSAgICB9Ci0KICAgICBmdW5jdGlv bih0b1BvbGljeUFjdGlvbihhY3Rpb24pKTsKLQotICAgIGlmIChzaG91bGRTdXNwZW5kKQotICAg ICAgICBwYWdlKCktPnN1c3BlbmRGb3JQcm9jZXNzU3dhcCgpOwogfQogCiB2b2lkIFdlYkZyYW1l OjpzdGFydERvd25sb2FkKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwg Y29uc3QgU3RyaW5nJiBzdWdnZXN0ZWROYW1lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCAyNWQ2ZGZiNzFkMDNhNDk2NjQ0YzYyMzJmNmZiNDIx OGZhOGQyZmJiLi5lNDkxODI0N2E2NzY2ZDY0MmNiZDM2MmZjMzUzNTE1NjA5YzY3NmVhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtNDAxLDcg KzQwMSw3IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBXZWJQYWdlQ3JlYXRp b25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICAsIG1fb3ZlcnJpZGVDb250ZW50U2VjdXJp dHlQb2xpY3kgeyBwYXJhbWV0ZXJzLm92ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5IH0KICAg ICAsIG1fY3B1TGltaXQocGFyYW1ldGVycy5jcHVMaW1pdCkKICNpZiBQTEFURk9STShNQUMpCi0g ICAgLCBtX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNpdGlvbihwYXJhbWV0ZXJz LmlzU3dhcEZyb21TdXNwZW5kZWQpCisgICAgLCBtX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25Q YWdlVHJhbnNpdGlvbihwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXApCiAjZW5kaWYKIHsKICAgICBB U1NFUlQobV9wYWdlSUQpOwpAQCAtNDcxLDcgKzQ3MSw3IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWlu dDY0X3QgcGFnZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAg ICBtX2RyYXdpbmdBcmVhLT5zZXRQYWludGluZ0VuYWJsZWQoZmFsc2UpOwogICAgIG1fZHJhd2lu Z0FyZWEtPnNldFNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQocGFyYW1ldGVycy5zaG91bGRT Y2FsZVZpZXdUb0ZpdERvY3VtZW50KTsKIAotICAgIGlmIChwYXJhbWV0ZXJzLmlzU3dhcEZyb21T dXNwZW5kZWQpCisgICAgaWYgKHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkKICAgICAgICAgZnJl ZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6U3dhcEZyb21TdXNwZW5kZWQpOwog CiAjaWYgRU5BQkxFKEFTWU5DX1NDUk9MTElORykKQEAgLTY5Niw3ICs2OTYsNyBAQCB2b2lkIFdl YlBhZ2U6OnJlaW5pdGlhbGl6ZVdlYlBhZ2UoV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYmIHBh cmFtZXRlcnMpCiAgICAgICAgIG1fZHJhd2luZ0FyZWEtPnVwZGF0ZVByZWZlcmVuY2VzKHBhcmFt ZXRlcnMuc3RvcmUpOwogICAgICAgICBtX2RyYXdpbmdBcmVhLT5zZXRQYWludGluZ0VuYWJsZWQo dHJ1ZSk7CiAjaWYgUExBVEZPUk0oTUFDKQotICAgICAgICBtX3Nob3VsZEF0dGFjaERyYXdpbmdB cmVhT25QYWdlVHJhbnNpdGlvbiA9IHBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZDsKKyAg ICAgICAgbV9zaG91bGRBdHRhY2hEcmF3aW5nQXJlYU9uUGFnZVRyYW5zaXRpb24gPSBwYXJhbWV0 ZXJzLmlzUHJvY2Vzc1N3YXA7CiAjZW5kaWYKICAgICAgICAgdW5mcmVlemVMYXllclRyZWUoTGF5 ZXJUcmVlRnJlZXplUmVhc29uOjpQYWdlU3VzcGVuZGVkKTsKICAgICB9CkBAIC0zMDUzLDEyICsz MDUzLDYgQEAgdm9pZCBXZWJQYWdlOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24odWludDY0X3Qg ZnJhbWVJRCwgdWludDY0X3QgbGlzdGVuZXJJRCwgV2UKICAgICBXZWJGcmFtZSogZnJhbWUgPSBX ZWJQcm9jZXNzOjpzaW5nbGV0b24oKS53ZWJGcmFtZShmcmFtZUlEKTsKICAgICBpZiAoIWZyYW1l KQogICAgICAgICByZXR1cm47Ci0gICAgaWYgKHBvbGljeUFjdGlvbiA9PSBXZWJQb2xpY3lBY3Rp b246OlN1c3BlbmQpIHsKLSAgICAgICAgQVNTRVJUKGZyYW1lID09IG1fbWFpbkZyYW1lKTsKLSAg ICAgICAgc2V0SXNTdXNwZW5kZWQodHJ1ZSk7Ci0KLSAgICAgICAgV2ViUHJvY2Vzczo6c2luZ2xl dG9uKCkuc2VuZFByZXdhcm1JbmZvcm1hdGlvbihtYWluV2ViRnJhbWUoKS0+dXJsKCkpOwotICAg IH0KICAgICBmcmFtZS0+ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGxpc3RlbmVySUQsIHBvbGlj eUFjdGlvbiwgbmF2aWdhdGlvbklELCBkb3dubG9hZElELCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2ll cykpOwogfQogCkBAIC02MzEyLDYgKzYzMDYsMTAgQEAgdm9pZCBXZWJQYWdlOjpzZXRJc1N1c3Bl bmRlZChib29sIHN1c3BlbmRlZCkKICAgICBpZiAobV9pc1N1c3BlbmRlZCkgewogICAgICAgICAv LyBVbmZyb3plbiBvbiBkcmF3aW5nIGFyZWEgcmVzZXQuCiAgICAgICAgIGZyZWV6ZUxheWVyVHJl ZShMYXllclRyZWVGcmVlemVSZWFzb246OlBhZ2VTdXNwZW5kZWQpOworCisgICAgICAgIFdlYlBy b2Nlc3M6OnNpbmdsZXRvbigpLnNlbmRQcmV3YXJtSW5mb3JtYXRpb24obWFpbldlYkZyYW1lKCkt PnVybCgpKTsKKworICAgICAgICBzdXNwZW5kRm9yUHJvY2Vzc1N3YXAoKTsKICAgICB9IGVsc2UK ICAgICAgICAgbV9zaG91bGRSZXNldERyYXdpbmdBcmVhQWZ0ZXJTdXNwZW5kID0gdHJ1ZTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQppbmRleCA5MWFkNzFhZGUx YjdkYjRmOWRjZTY0ZDRmMzMwNDY3YjIyYjgzM2NjLi44M2I2NTk5MjcwYjUxYzdiYjE4ZWZlNzM3 YTU5MmUwMjU3MWEyODA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KKysrIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh Lm1tCkBAIC05Nyw3ICs5Nyw3IEBAIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpUaWxl ZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYShXZWJQYWdlJiB3ZWJQYWdlLCBjCiAgICAgdXBkYXRl TGF5ZXJIb3N0aW5nQ29udGV4dCgpOwogICAgIHNldENvbG9yU3BhY2UocGFyYW1ldGVycy5jb2xv clNwYWNlKTsKIAotICAgIGlmICghcGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKQorICAg IGlmICghcGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwKQogICAgICAgICBhdHRhY2goKTsKIH0KIApk aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGNkNWY4 ZTlkYTU1ZjBkYjMxMDk1YTMzNzE5NTg0NTc1YWI1ZTNmNWIuLjU1YWUyZDI4NDRkMTM4YWIwODUw OWY4ODAwYzViZGViNDU3ZjY2NjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOS0wMS0xNCAgQ2hyaXMgRHVtZXog IDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFJlZ3Jlc3Npb24oUFNPTikgVmlldyBiZWNv bWVzIGJsYW5rIGFmdGVyIGNsaWNrIGEgY3Jvc3Mtc2l0ZSBkb3dubG9hZCBsaW5rCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMzNjEKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZCBBUEkgdGVzdCBjb3ZlcmFnZS4KKworICAgICAgICAqIFRl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW06 CisgICAgICAgICgtW1BTT05OYXZpZ2F0aW9uRGVsZWdhdGUgd2ViVmlldzpkZWNpZGVQb2xpY3lG b3JOYXZpZ2F0aW9uUmVzcG9uc2U6ZGVjaXNpb25IYW5kbGVyOl0pOgorCiAyMDE5LTAxLTEwICBD b21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmll d2VkLCByb2xsaW5nIG91dCByMjM5ODI1LgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbSBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0K aW5kZXggZjM1ZDhiYWEzNTNmMDcwMjRmZDQwZTdkNTI3NDUzYTc0MjEwYzNiYS4uZDViZDVlYzc3 NmJkNWUxN2IwYmQ5Yzk0MDAyY2NiNTQ0N2NhNWQwOCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQorKysg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZp Z2F0aW9uLm1tCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNyBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTctMjAxOSBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMKQEAgLTcyLDYgKzcyLDcgQEAgc3RhdGljIGJvb2wgc2VydmVyUmVkaXJlY3RlZDsKIHN0 YXRpYyBIYXNoU2V0PHBpZF90PiBzZWVuUElEczsKIHN0YXRpYyBib29sIHdpbGxQZXJmb3JtQ2xp ZW50UmVkaXJlY3Q7CiBzdGF0aWMgYm9vbCBkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3Q7CitzdGF0 aWMgYm9vbCBzaG91bGRDb252ZXJ0VG9Eb3dubG9hZDsKIHN0YXRpYyBSZXRhaW5QdHI8TlNVUkw+ IGNsaWVudFJlZGlyZWN0U291cmNlVVJMOwogc3RhdGljIFJldGFpblB0cjxOU1VSTD4gY2xpZW50 UmVkaXJlY3REZXN0aW5hdGlvblVSTDsKIApAQCAtMTI4LDYgKzEyOSwxMSBAQCAtICh2b2lkKXdl YlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlv bjooV0tOYXZpZ2F0aQogICAgIGRpZFJlcG9uZFRvUG9saWN5RGVjaXNpb25DYWxsID0gdHJ1ZTsK IH0KIAorLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25SZXNwb25zZTooV0tOYXZpZ2F0aW9uUmVzcG9uc2UgKiluYXZpZ2F0aW9uUmVz cG9uc2UgZGVjaXNpb25IYW5kbGVyOih2b2lkICheKShXS05hdmlnYXRpb25SZXNwb25zZVBvbGlj eSkpZGVjaXNpb25IYW5kbGVyCit7CisgICAgZGVjaXNpb25IYW5kbGVyKHNob3VsZENvbnZlcnRU b0Rvd25sb2FkID8gX1dLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5QmVjb21lRG93bmxvYWQgOiBX S05hdmlnYXRpb25SZXNwb25zZVBvbGljeUFsbG93KTsKK30KKwogLSAodm9pZCl3ZWJWaWV3OihX S1dlYlZpZXcgKil3ZWJWaWV3IGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFs TmF2aWdhdGlvbjooV0tOYXZpZ2F0aW9uICopbmF2aWdhdGlvbgogewogICAgIHNlZW5QSURzLmFk ZChbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKQEAgLTE0MDUsNyArMTQxMSw3IEBA IFRFU1QoUHJvY2Vzc1N3YXAsIFNlcnZlclJlZGlyZWN0KQogCiAgICAgRVhQRUNUX0ZBTFNFKHNl cnZlclJlZGlyZWN0ZWQpOwogICAgIEVYUEVDVF9FUSgzLCBudW1iZXJPZkRlY2lkZVBvbGljeUNh bGxzKTsKLSAgICBFWFBFQ1RfRVEoMnUsIHNlZW5QSURzLnNpemUoKSk7CisgICAgRVhQRUNUX0VR KDN1LCBzZWVuUElEcy5zaXplKCkpOwogfQogCiBURVNUKFByb2Nlc3NTd2FwLCBTZXJ2ZXJSZWRp cmVjdDIpCkBAIC0xNDY3LDYgKzE0NzMsMTA5IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIFNlcnZlclJl ZGlyZWN0MikKICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFp bjEuaHRtbCIsIFtbd2ViVmlldyBVUkxdIGFic29sdXRlU3RyaW5nXSk7CiB9CiAKK3N0YXRpYyBj b25zdCBjaGFyKiBsaW5rVG9XZWJLaXRCeXRlcyA9IFIiUFNPTlJFU09VUkNFKAorPGJvZHk+Cisg IDxhIGlkPSJ0ZXN0TGluayIgaHJlZj0icHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCI+ TGluazwvYT4KKzwvYm9keT4KKylQU09OUkVTT1VSQ0UiOworCitURVNUKFByb2Nlc3NTd2FwLCBQ b2xpY3lDYW5jZWxBZnRlclNlcnZlclJlZGlyZWN0KQoreworICAgIGF1dG8gcHJvY2Vzc1Bvb2xD b25maWd1cmF0aW9uID0gYWRvcHROUyhbW19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbiBhbGxv Y10gaW5pdF0pOworICAgIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKS5wcm9jZXNzU3dh cHNPbk5hdmlnYXRpb24gPSBZRVM7CisgICAgYXV0byBwcm9jZXNzUG9vbCA9IGFkb3B0TlMoW1tX S1Byb2Nlc3NQb29sIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOnByb2Nlc3NQb29sQ29u ZmlndXJhdGlvbi5nZXQoKV0pOworCisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFk b3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZp ZXdDb25maWd1cmF0aW9uIHNldFByb2Nlc3NQb29sOnByb2Nlc3NQb29sLmdldCgpXTsKKyAgICBh dXRvIGhhbmRsZXIgPSBhZG9wdE5TKFtbUFNPTlNjaGVtZSBhbGxvY10gaW5pdF0pOworICAgIFto YW5kbGVyIGFkZE1hcHBpbmdGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy5nb29nbGUuY29tL21h aW4uaHRtbCIgdG9EYXRhOmxpbmtUb1dlYktpdEJ5dGVzXTsKKyAgICBbaGFuZGxlciBhZGRSZWRp cmVjdEZyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIiB0b1VS TFN0cmluZzpAInBzb246Ly93d3cuYXBwbGUuY29tL2lnbm9yZS5odG1sIl07CisgICAgW3dlYlZp ZXdDb25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBmb3JVUkxT Y2hlbWU6QCJwc29uIl07CisKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3 IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3Vy YXRpb246d2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBhdXRvIG5hdmlnYXRpb25E ZWxlZ2F0ZSA9IGFkb3B0TlMoW1tQU09OTmF2aWdhdGlvbkRlbGVnYXRlIGFsbG9jXSBpbml0XSk7 CisgICAgW3dlYlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOm5hdmlnYXRpb25EZWxlZ2F0ZS5n ZXQoKV07CisKKyAgICBuYXZpZ2F0aW9uRGVsZWdhdGUtPmRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb24gPSBeKFdLTmF2aWdhdGlvbkFjdGlvbiAqYWN0aW9uLCB2b2lkICheZGVjaXNpb25I YW5kbGVyKShXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3kpKSB7CisgICAgICAgIGlmIChbYWN0aW9u LnJlcXVlc3QuVVJMLmFic29sdXRlU3RyaW5nIGhhc1N1ZmZpeDpAImlnbm9yZS5odG1sIl0pIHsK KyAgICAgICAgICAgIGRlY2lzaW9uSGFuZGxlcihXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lDYW5j ZWwpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGRlY2lzaW9uSGFu ZGxlcihXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvdyk7CisgICAgfTsKKworICAgIE5TVVJM UmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVS TFdpdGhTdHJpbmc6QCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1sIl1dOworICAgIFt3 ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6 cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisgICAgYXV0byBwaWRBZnRlckZpcnN0TG9h ZCA9IFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl07CisKKyAgICBFWFBFQ1RfRVEoMSwg bnVtYmVyT2ZEZWNpZGVQb2xpY3lDYWxscyk7CisKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFT Y3JpcHQ6QCJ0ZXN0TGluay5jbGljaygpIiBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOworCisgICAg VGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZmYWlsZWQpOworICAgIGZhaWxlZCA9IGZhbHNlOwor ICAgIGRvbmUgPSBmYWxzZTsKKworICAgIEVYUEVDVF9FUSgzLCBudW1iZXJPZkRlY2lkZVBvbGlj eUNhbGxzKTsKKworICAgIC8vIFdlIHNob3VsZCBzdGlsbCBiZSBvbiBnb29nbGUuY29tLgorICAg IEVYUEVDVF9FUShwaWRBZnRlckZpcnN0TG9hZCwgW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlm aWVyXSk7CisgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5nb29nbGUuY29tL21haW4u aHRtbCIsIFtbd2ViVmlldyBVUkxdIGFic29sdXRlU3RyaW5nXSk7CisKKyAgICBbd2ViVmlldyBl dmFsdWF0ZUphdmFTY3JpcHQ6QCJ0ZXN0TGluay5pbm5lclRleHQiIGNvbXBsZXRpb25IYW5kbGVy OiBbJl0gKGlkIGlubmVyVGV4dCwgTlNFcnJvciAqZXJyb3IpIHsKKyAgICAgICAgRVhQRUNUX1dL X1NUUkVRKEAiTGluayIsIGlubmVyVGV4dCk7CisgICAgICAgIGRvbmUgPSB0cnVlOworICAgIH1d OworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNl OworfQorCitURVNUKFByb2Nlc3NTd2FwLCBDcm9zc1NpdGVEb3dubG9hZCkKK3sKKyAgICBhdXRv IHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tfV0tQcm9jZXNzUG9vbENvbmZp Z3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0 KCkucHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uID0gWUVTOworICAgIGF1dG8gcHJvY2Vzc1Bvb2wg PSBhZG9wdE5TKFtbV0tQcm9jZXNzUG9vbCBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjpw cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKworICAgIGF1dG8gd2ViVmlld0NvbmZp Z3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0p OworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRQcm9jZXNzUG9vbDpwcm9jZXNzUG9vbC5n ZXQoKV07CisgICAgYXV0byBoYW5kbGVyID0gYWRvcHROUyhbW1BTT05TY2hlbWUgYWxsb2NdIGlu aXRdKTsKKyAgICBbaGFuZGxlciBhZGRNYXBwaW5nRnJvbVVSTFN0cmluZzpAInBzb246Ly93d3cu Z29vZ2xlLmNvbS9tYWluLmh0bWwiIHRvRGF0YTpsaW5rVG9XZWJLaXRCeXRlc107CisgICAgW2hh bmRsZXIgYWRkTWFwcGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFp bi5odG1sIiB0b0RhdGE6IkhlbGxvIl07CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFVS TFNjaGVtZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBmb3JVUkxTY2hlbWU6QCJwc29uIl07CisKKyAg ICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1l Ok5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246d2ViVmlld0NvbmZpZ3Vy YXRpb24uZ2V0KCldKTsKKyAgICBhdXRvIG5hdmlnYXRpb25EZWxlZ2F0ZSA9IGFkb3B0TlMoW1tQ U09OTmF2aWdhdGlvbkRlbGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcgc2V0TmF2 aWdhdGlvbkRlbGVnYXRlOm5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBOU1VSTFJl cXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxX aXRoU3RyaW5nOkAicHNvbjovL3d3dy5nb29nbGUuY29tL21haW4uaHRtbCJdXTsKKyAgICBbd2Vi VmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1 bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworICAgIGF1dG8gcGlkQWZ0ZXJGaXJzdExvYWQg PSBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworCisgICAgc2hvdWxkQ29udmVydFRv RG93bmxvYWQgPSB0cnVlOworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAInRlc3RM aW5rLmNsaWNrKCkiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07CisKKyAgICBUZXN0V2ViS2l0QVBJ OjpVdGlsOjpydW4oJmZhaWxlZCk7CisgICAgZmFpbGVkID0gZmFsc2U7CisgICAgc2hvdWxkQ29u dmVydFRvRG93bmxvYWQgPSBmYWxzZTsKKworICAgIC8vIFdlIHNob3VsZCBzdGlsbCBiZSBvbiBn b29nbGUuY29tLgorICAgIEVYUEVDVF9FUShwaWRBZnRlckZpcnN0TG9hZCwgW3dlYlZpZXcgX3dl YlByb2Nlc3NJZGVudGlmaWVyXSk7CisgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5n b29nbGUuY29tL21haW4uaHRtbCIsIFtbd2ViVmlldyBVUkxdIGFic29sdXRlU3RyaW5nXSk7CisK KyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJ0ZXN0TGluay5pbm5lclRleHQiIGNv bXBsZXRpb25IYW5kbGVyOiBbJl0gKGlkIGlubmVyVGV4dCwgTlNFcnJvciAqZXJyb3IpIHsKKyAg ICAgICAgRVhQRUNUX1dLX1NUUkVRKEAiTGluayIsIGlubmVyVGV4dCk7CisgICAgICAgIGRvbmUg PSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7Cisg ICAgZG9uZSA9IGZhbHNlOworfQorCiBlbnVtIGNsYXNzIFNob3VsZEVuYWJsZVBTT04geyBObywg WWVzIH07CiBzdGF0aWMgdm9pZCBydW5DbGllbnRTaWRlUmVkaXJlY3RUZXN0KFNob3VsZEVuYWJs ZVBTT04gc2hvdWxkRW5hYmxlUFNPTikKIHsKQEAgLTIyMzIsMTIgKzIzNDEsMjcgQEAgVEVTVChQ cm9jZXNzU3dhcCwgUGFnZVNob3dIaWRlKQogCiAgICAgRVhQRUNUX0VRKDd1LCBbcmVjZWl2ZWRN ZXNzYWdlcyBjb3VudF0pOwogICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0 Lm9yZy9tYWluLmh0bWwgLSBwYWdlc2hvdyBOT1QgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdl cy5nZXQoKVswXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3Jn L21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClb MV0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRt bCAtIHBhZ2VzaG93IE5PVCBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsK LSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBw YWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKLSAgICBFWFBF Q1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cg cGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs0XSk7Ci0gICAgRVhQRUNUX1dLX1NU UkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3Rl ZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBz b246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2Vp dmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAgIGlmIChbcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsx XSBoYXNQcmVmaXg6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIl0pIHsKKyAgICAg ICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBh Z2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0pOworICAgICAgICBF WFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlc2hv dyBOT1QgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7CisgICAgfSBlbHNl IHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5o dG1sIC0gcGFnZXNob3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0p OworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5o dG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7Cisg ICAgfQorICAgIGlmIChbcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSBoYXNQcmVmaXg6QCJwc29u Oi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwiXSkgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEo QCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCBy ZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNv bjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2Vp dmVkTWVzc2FnZXMuZ2V0KClbNF0pOworICAgIH0gZWxzZSB7CisgICAgICAgIEVYUEVDVF9XS19T VFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0 ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVR KEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwg cmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs0XSk7CisgICAgfQorICAgIGlmIChbcmVjZWl2ZWRNZXNz YWdlcy5nZXQoKVs1XSBoYXNQcmVmaXg6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1s Il0pIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21h aW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0p OworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0 bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAg ICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNv bS9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgp WzVdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21h aW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0p OworICAgIH0KIH0KIAogLy8gRGlzYWJsaW5nIHRoZSBwYWdlIGNhY2hlIGV4cGxpY2l0bHkgaXMg KGZvciBzb21lIHJlYXNvbikgbm90IGF2YWlsYWJsZSBvbiBpT1MuCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMjFmNzc4ODI1 ZDcxYjdmNjE2NTkyYzI2YzI5NzNhMDFkZjk4MDRmYy4uN2NkNzk2NGJlYjE3NjNlNDE2ODlhNDk3 OTMxOTdjNjgxMmRhMzVkNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAxLTE0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBW aWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2tpcCB0ZXN0IHRlc3RpbmcgdGhlIGNyb3NzLXBy b2Nlc3MgRE9NV2luZG93IEFQSSBhcyBJIGJyb2tlIGl0IHdpdGggdGhpcyBwYXRjaC4KKyAgICAg ICAgVGhlIGZlYXR1cmUgaXMgZmFyIGZyb20gcmVhZHkgYW5kIG9mZiBieSBkZWZhdWx0IGFueXdh eS4gSSB3aWxsIGFkZCBzdXBwb3J0IGJhY2sKKyAgICAgICAgaW4gYSBmb2xsb3ctdXAuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAxOS0wMS0xMCAgQ29t bWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjIzOTgyNS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L3drMi9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBl Y3RhdGlvbnMKaW5kZXggOGU5NTllZGFmZmQ4OTI3ZWY5YzJhYWMzMTZlOWUzMTAwY2QxNDBjYi4u OWQ5MGJlOGI0OGU1N2M5NjBiY2RhNjg2Y2UyNDQwZDcxMzhiYjBmNiAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTczMyw4ICs3MzMsOCBAQCBodHRwL3Rl c3RzL3Jlc291cmNlTG9hZFN0YXRpc3RpY3MvcmVtb3ZlLWJsb2NraW5nLWluLXJlZGlyZWN0Lmh0 bWwgWyBTa2lwIF0KIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGljcy9ub24tcHJldmFs ZW50LXJlc291cmNlcy1jYW4tYWNjZXNzLWNvb2tpZXMtaW4tYS10aGlyZC1wYXJ0eS1jb250ZXh0 Lmh0bWwgWyBTa2lwIF0KIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGljcy9jYXAtY2Fj aGUtbWF4LWFnZS1mb3ItcHJldmFsZW50LXJlc291cmNlLmh0bWwgWyBTa2lwIF0KIAotIyBQcm9j ZXNzIHN3YXBwaW5nIGlzIG9ubHkgaW1wbGVtZW50ZWQgb24gV2ViS2l0Mi4KLWh0dHAvdGVzdHMv bmF2aWdhdGlvbi9wcm9jZXNzLXN3YXAtd2luZG93LW9wZW4uaHRtbCBbIFBhc3MgXQorIyBUaGlz IGZlYXR1cmUgaXMgY3VycmVudGx5IGRpc2FibGVkIGJ5IGRlZmF1bHQgYW5kIHVuZmluaXNoZWQg PHJkYXI6Ly9wcm9ibGVtLzM4OTI1MDc3Pi4KK2h0dHAvdGVzdHMvbmF2aWdhdGlvbi9wcm9jZXNz LXN3YXAtd2luZG93LW9wZW4uaHRtbCBbIFNraXAgXQogCiAjIENyb3NzLU9yaWdpbi1SZXNvdXJj ZS1Qb2xpY3kgcmVzcG9uc2UgaGVhZGVyIGlzIG9ubHkgaW1wbGVtZW50ZWQgaW4gV2ViS2l0Mi4K IGh0dHAvd3B0L2Nyb3NzLW9yaWdpbi1yZXNvdXJjZS1wb2xpY3kvIFsgUGFzcyBdCg== 359092 2019-01-14 16:06:45 -0800 2019-01-14 19:21:38 -0800 Patch bug-193361-20190114160644.patch text/plain 100001 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5ODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Y4YjllNWYwMzU1YTQ0 MzU0Yjc4OTdlMTRhNjE0MDQwYzVmNWY0MC4uMzUwNjUyYjM0MzQ2YWUyYTU3MTkyODM2ZTZlMWI2 NGQ0MjI2MjhlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAxLTE0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBW aWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAg ICAgIFdoZW4gcmVzdG9yaW5nIGZyb20gUGFnZUNhY2hlLCBtYWtlIHN1cmUgd2Ugbm90aWZ5IHRo ZSBjbGllbnQgdGhhdCB0aGUgbG9hZCB3YXMgY29tbWl0dGVkCisgICAgICAgICpiZWZvcmUqIHdl IHRlbGwgaXQgdGhhdCB0aGUgbmF2aWdhdGlvbiBpcyBjb21wbGV0ZS4gVGhpcyB3b3VsZCBjb25m dXNlIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eQorICAgICAgICBsb2dpYyBpbiB0aGUgVUlQcm9j ZXNzLgorCiAyMDE5LTAxLTEwICBKdXN0aW4gRmFuICA8anVzdGluX2ZhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW1dlYkdQVV0gQWRkIEJpbmRHcm91cEJpbmRpbmcsIEJpbmRHcm91cERlc2NyaXB0 b3IsIGFuZCBCdWZmZXJCaW5kaW5nIGRpY3Rpb25hcmllcyBmcm9tIEFQSQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAw ZjAwYWJjZDhkYzUyZGViNmE3ZWViMTc2NmU4YjAxNjIxMDY1OGU2Li43NjM0YWZiODNlMjcwZGVj YzQ2NzMxM2U0N2NmNjQ0OWZkNjJiMmY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwMCBAQAorMjAx OS0wMS0xNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFJlZ3Jl c3Npb24oUFNPTikgVmlldyBiZWNvbWVzIGJsYW5rIGFmdGVyIGNsaWNrIGEgY3Jvc3Mtc2l0ZSBk b3dubG9hZCBsaW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTMzNjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBpc3N1ZSB0cmFja2Vk IGJ5IHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczIGlzIHRoYXQgYSBwcm92aXNpb25hbCBsb2FkIG1h eSBnZXQKKyAgICAgICAgY2FuY2VsZWQgKG9yIGNvbnZlcnRlZCBpbnRvIGEgZG93bmxvYWQpICph ZnRlciogd2UndmUgZGVjaWRlZCB0byBwcm9jZXNzLXN3YXAuCisgICAgICAgIEluIHN1Y2ggY2Fz ZXMsIHRoZSB2aWV3IHNob3VsZCBrZWVwIGRpc3BsYXlpbmcgdGhlIGN1cnJlbnQgc2l0ZSBhbmQg aXQgc2hvdWxkCisgICAgICAgIHN0aWxsIGJlIGludGVyYWN0aXZlLiBIb3dldmVyLCB3aXRoIHRo ZSBwcmV2aW91cyBQU09OIG1vZGVsLCB0aGUgdmlldyAocGFnZVByb3h5KQorICAgICAgICB3b3Vs ZCBoYXZlIGFscmVhZHkgc3dhcHBlZCB0byB0aGUgbmV3IHByb2Nlc3MgYW5kIHdvdWxkIGVuZCB1 cCBkaXNwbGF5aW5nIHRoZQorICAgICAgICBpbml0aWFsbHkgZW1wdHkgZG9jdW1lbnQuCisKKyAg ICAgICAgVG8gYWRkcmVzcyB0aGUgaXNzdWUsIHRoaXMgcGF0Y2ggaW50cm9kdWNlcyB0aGUgY29u Y2VwdCBvZiBhIHByb3Zpc2lvbmFsIGxvYWQKKyAgICAgICAgaW4gdGhlIFVJUHJvY2VzcywgaGFu ZGxlZCBieSBhIFByb3Zpc2lvbmFsUGFnZVByb3h5IHdoaWNoIGhhcyBpdHMgb3duIHByaXZpc2lv bmFsCisgICAgICAgIHByb2Nlc3MuIFRoZSBXZWJQYWdlUHJveHkgb3ducyB0aGUgUHJvdmlzaW9u YWxQYWdlUHJveHkgYnV0IHdlIGRvIG5vdCBjb21taXQgdGhlCisgICAgICAgIHByb3Zpc2lvbmFs IHBhZ2UgdW50aWwgYWZ0ZXIgdGhlIGxvYWQgd2FzIGNvbW1pdHRlZCBpbiB0aGUgbmV3IHByb2Nl c3MuIFRoaXMgbWVhbnMKKyAgICAgICAgdGhhdCB0aGUgdmlldyAvIFdlYlBhZ2VQcm94eSBrZWVw cyB1c2luZyB0aGUgb2xkIHByb2Nlc3MgYW5kIGRpc3BsYXlzIHRoZSBjdXJyZW50CisgICAgICAg IGNvbnRlbnQgdW50aWwgYSBsb2FkIGhhcyBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHBh Z2UuIElmIG5vIGxvYWQgY29tbWl0cworICAgICAgICBpbiB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vz cyAoZS5nLiBiZWNhdXNlIHRoZSBsb2FkIGlzIGNhbmNlbGxlZCBvciBjb252ZXJ0ZWQgaW50bwor ICAgICAgICBhIGRvd25sb2FkKSwgdGhlbiB3ZSBtZXJlbHkgZGVzdHJveSB0aGUgUHJvdmlzaW9u YWxQYWdlUHJveHkgYW5kIHRlcm1pbmF0ZSBpdHMKKyAgICAgICAgcHJvY2Vzcywgd2l0aG91dCBp bXBhY3RpbmcgdGhlIFdlYlBhZ2VQcm94eS4KKworICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVyczo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVycy5oOgorICAgICAgICBSZW5hbWUgaXNTd2FwRnJvbVN1c3BlbmRlZCB0byBpc1Byb2Nl c3NTd2FwIGZvciBjbGFyaXR5IGFzIHdlIGFsd2F5cyB3YW50IHRvCisgICAgICAgIGRlbGF5IGF0 dGFjaGluZyB0aGUgZHJhd2luZyBhcmVhIGluIGNhc2Ugb2YgYSBwcm9jZXNzLXN3YXAsIG5vIG1h dHRlciB3aGF0CisgICAgICAgIG5vdyB0aGF0IHRoZSBwcmV2aW91cyBwcm9jZXNzIGlzIGtlcHQg YWxpdmUgdW50aWwgdGhlIHByb3Zpc2lvbmFsIGxvYWQgaXMKKyAgICAgICAgY29tbWl0dGVkIGlu IHRoZSBuZXcgcHJvY2Vzcy4KKworICAgICAgICAqIFNoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaDoK KyAgICAgICAgRHJvcCBTdXNwZW5kIHBvbGljeSBhY3Rpb24uIEF0IGRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb24gdGltZSwgaW4gY2FzZSBvZgorICAgICAgICBwcm9jZXNzLXN3YXAsIHdl IG5vdyB0ZWxsIHRoZSBwcmV2aW91cyBwcm9jZXNzIHRvIHNpbXBseSBpZ25vcmUgdGhlIGxvYWQs IHdoaWxlCisgICAgICAgIHdlIGNyZWF0ZSBhIFByb3Zpc2lvbmFsUGFnZVByb3h5IHRvIGRvIHRo ZSBuZXcgbG9hZCBpbiBhIG5ldyBwcm9jZXNzLgorICAgICAgICBTdXNwZW5zaW9uIG9mIHRoZSBw cmV2aW91cyBwYWdlIGluIHRoZSBvbGQgcHJvY2VzcywgaGFwcGVucyBsYXRlciwgd2hlbiBhIGxv YWQKKyAgICAgICAgaXMgYWN0dWFsbHkgY29tbWl0dGVkIGluIHRoZSBuZXcgcHJvY2Vzcy4KKwor ICAgICAgICAqIFNvdXJjZXMudHh0OgorICAgICAgICBBZGQgbmV3IFByb3Zpc2lvbmFsUGFnZVBy b3h5IGZpbGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToK KyAgICAgICAgKC1bV0tXZWJWaWV3IF9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0YXRl XSk6CisgICAgICAgIFdoZW4gY2FsbGluZyBfa2lsbFdlYkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRT dGF0ZSBvbiBhIFdLV2ViVmlldywga2lsbCBib3RoIHRoZSBjdXJyZW50CisgICAgICAgIHByb2Nl c3MgYW5kIHRoZSBwcm92aXNpb25hbCBvbmUsIHRvIG1haW50YWluIHByZXZpb3VzIGJlaGF2aW9y IGluIG91ciBBUEkgdGVzdHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUNsaWVudC5oOgor ICAgICAgICBUaW55IGJ1aWxkIGZpeC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Qcm92aXNpb25h bFBhZ2VQcm94eS5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQ cm94eTo6UHJvdmlzaW9uYWxQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25h bFBhZ2VQcm94eTo6flByb3Zpc2lvbmFsUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OnRha2VEcmF3aW5nQXJlYSk6CisgICAgICAgIChXZWJLaXQ6OlBy b3Zpc2lvbmFsUGFnZVByb3h5OjpjYW5jZWwpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25h bFBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6bG9hZERhdGFXaXRoTmF2aWdhdGlvbik6CisgICAgICAgIChXZWJLaXQ6 OlByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKToKKyAgICAg ICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0pOgor ICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1l KToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlz aW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94 eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJL aXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2FnZSk6CisgICAgICAgIChX ZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlU3luY01lc3NhZ2UpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oOiBBZGRlZC4KKyAgICAgICAg KFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OnBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpQ cm92aXNpb25hbFBhZ2VQcm94eTo6bWFpbkZyYW1lIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6 UHJvdmlzaW9uYWxQYWdlUHJveHk6OnByb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBjb25zdCk6CisgICAg ICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpuYXZpZ2F0aW9uSUQgY29uc3QpOgor ICAgICAgICBBZGQgbmV3IFByb3Zpc2lvbmFsUGFnZVByb3h5IGNsYXNzIHRvIHdyYXAgdGhlIHBy b3Zpc2lvbmFsIGxvYWQgaW4gdGhlIG5ldyBwcm9jZXNzCisgICAgICAgIGFmdGVyIGEgc3dhcC4g VGhlIHByb3Zpc2lvbmFsIHBhZ2UgaXMgb3duZWQgYnkgdGhlIFdlYlBhZ2VQcm94eSBhbmQgd2Ug b25seSBjb21taXQKKyAgICAgICAgdGhlIHByb3Zpc2lvbmFsIHBhZ2Ugd2hlbiB0aGUgbG9hZCBp cyBjb21taXR0ZWQuIFVudGlsIHRoZW4sIHRoZSBXZWJQYWdlUHJveHkga2VlcHMKKyAgICAgICAg dXNpbmcgdGhlIG9sZCBwcm9jZXNzIGFuZCBkaXNwbGF5aW5nIHRoZSBjdXJyZW50IGNvbnRlbnQu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5Ojp+U3VzcGVuZGVkUGFnZVByb3h5KToKKyAgICAg ICAgKFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5Ojp1bnN1c3BlbmQpOgorICAgICAgICAoV2Vi S2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6OmRpZFByb2Nlc3NSZXF1ZXN0VG9TdXNwZW5kKToKKyAg ICAgICAgVW5yZWdpc3RlciB0aGUgU3VzcGVuZGVkUGFnZVByb3h5IGFzIGFuIElQQyBtZXNzYWdl IHJlY2VpdmVyIGEgbGl0dGxlIGJpdCBlYXJsaWVyCisgICAgICAgIHdoZW4gd2UncmUgZ29pbmcg dG8gdW5zdXNwZW5kIGl0LiBUaGlzIGF2b2lkcyBjb25mbGljdGluZyB3aXRoIHRoZSBQcm92aXNp b25hbFBhZ2VQcm94eQorICAgICAgICB3aGljaCB0cmllcyB0byByZWdpc3RlciBpdHNlbGYgYXMg YW4gSVBDIG1lc3NhZ2UgcmVjZWl2ZXIgZm9yIHRoZSBzYW1lIHBhZ2VJRCB3aGVuCisgICAgICAg IGEgcHJvY2Vzcy1zd2FwIG9jY3VycyBhbmQgd2UncmUgc3dpdGNoaW5nIHRvIGEgc3VzcGVuZGVk IHBhZ2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkZyYW1lUHJveHk6OmlzTWFpbkZyYW1lIGNvbnN0KToKKyAgICAgICAgV2Vi RnJhbWVQcm94eTo6aXNNYWluRnJhbWUoKSByZWxpZXMgb24gY2hlY2tpbmcgdGhhdCB0aGUgZnJh bWUgaXMgdGhlIFdlYlBhZ2VQcm94eSdzIG1fbWFpbkZyYW1lLgorICAgICAgICBOb3cgdGhhdCB0 aGUgV2ViUGFnZVByb3h5IGNhbiBoYXZlIGEgUHJvdmlzaW9uYWxQYWdlUHJveHksIGFsc28gY2hl Y2sgaWYgaXQgaXMgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5J3MKKyAgICAgICAgbV9tYWluRnJh bWUgdG8gbWFpbnRhaW4gcHJldmlvdXMgYmVoYXZpb3IuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpzd2FwVG9X ZWJQcm9jZXNzKToKKyAgICAgICAgc3dhcFRvV2ViUHJvY2VzcygpIG5vIGxvbmdlciB0YWtlcyBj YXJlIG9mIHVuc3VzcGVuZGluZyB0aGUgU3VzcGVuZGVkUGFnZSBiZWNhdXNlIHdlIG5vdyBjYWxs IHN3YXBUb1dlYlByb2Nlc3MoKQorICAgICAgICBsYXRlciwgd2hlbiBhIGxvYWQgaXMgYWN0dWFs bHkgY29tbWl0dGVkIGluIHRoZSBwcm92aXNpb25hbCBwYWdlIC8gcHJvY2Vzcy4gc3dhcFRvV2Vi UHJvY2VzcygpIG5vdyBhbHNvIG5lZWRzCisgICAgICAgIHRvIGluaXRpYWxpemUgc29tZSBkYXRh IG1lbWJlcnMgc3VjaCBhcyB0aGUgZHJhd2luZyBhcmVhIGFuZCB0aGUgbWFpbiBmcmFtZSBhcyBp dCBpcyB0cmFuc2ZlcnJpbmcgdGhlbSBvdmVyIGZyb20KKyAgICAgICAgdGhlIFByb3Zpc2lvbmFs UGFnZVByb3h5IHdoaWNoIHN0YXJ0ZWQgdGhlIHByb3Zpc2lvbmFsIGxvYWQuCisKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MpOgorICAg ICAgICBXZSBubyBsb25nZXIgbmVlZCBJc1N3YXBGcm9tU3VzcGVuZGVkIHBhcmFtZXRlciBhcyB0 aGlzIGlzIGNhbGxlZCBsYXRlciBub3csIGFmdGVyIGEgbG9hZCBoYXMgYWN0dWFsbHkgYmVlbgor ICAgICAgICBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHByb2Nlc3MuCisKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSk6CisgICAgICAgIC0gV2Ug bm8gbG9uZ2VyIG5lZWQgSXNTd2FwRnJvbVN1c3BlbmRlZCBwYXJhbWV0ZXIgYXMgdGhpcyBpcyBj YWxsZWQgbGF0ZXIgbm93LCBhZnRlciBhIGxvYWQgaGFzIGFjdHVhbGx5IGJlZW4KKyAgICAgICAg ICBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHByb2Nlc3MuCisgICAgICAgIC0gRmFjdG9y IHNvbWUgY29kZSBvdXQgdG8gV2ViUGFnZVByb3h5OjpzZXREcmF3aW5nQXJlYSgpIHNvIHRoYXQg aXQgY2FuIGJlIHNoYXJlZCB3aXRoIHN3YXBUb1dlYlByb2Nlc3MoKS4KKworICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24pOgorICAgICAgICBP bmx5IGNhbGwgc2V0UGVuZGluZ0FQSVJlcXVlc3RVUkwoKSBpbiBsb2FkUmVxdWVzdFdpdGhOYXZp Z2F0aW9uKCkgb25seSBpZiBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQgaXMgbm90CisgICAg ICAgIFllcy4gVGhpcyBhdm9pZHMgaGl0dGluZyBzb21lIGFzc2VydGlvbnMgYXMgdGhpcyB3YXMg YWxyZWFkeSBjYWxsZWQgZHVyaW5nIHRoZSBmaXJzdCBBUEkgY2FsbCBpZiBuZWVkZWQuCisKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZWNlaXZlZE5hdmlnYXRpb25Qb2xpY3lEZWNp c2lvbik6CisgICAgICAgIEluIGNhc2Ugb2YgcHJvY2VzcyBzd2FwLCB0ZWxsIHRoZSBwcmV2aW91 cyBwcm9jZXNzIHRvIGlnbm9yZSB0aGUgbG9hZCBpbnN0ZWFkIG9mIHN1c3BlbmRpbmcgaXQgcmln aHQgYXdheS4KKyAgICAgICAgU3VzcGVuc2lvbiBub3cgaGFwcGVucyBsYXRlciwgb25seSBpZiB3 ZSBlbmQgdXAgY29tbWl0dGluZyB0aGUgcHJvdmlzaW9uYWwgbG9hZCBpbiB0aGUgbmV3IHByb2Nl c3MuCisgICAgICAgIEFsc28gZGlzY2FyZCB0aGUgU3VzcGVuZGVkUGFnZSBpZiBpdCBmYWlsZWQg dG8gc3VzcGVuZCAod2Ugb25seSByZXVzZSBpdHMgcHJvY2VzcyBpbiB0aGlzIGNhc2UpLiBUaGlz IHVzZWQKKyAgICAgICAgdG8gaGFwcGVuIGEgYml0IGxhdGVyIGJ1dCBpdCBpcyBjbGVhcmVyIGlm IHdlIGRvIHRoaXMgYXMgZWFybHkgYXMgcG9zc2libGUgSSB0aGluay4KKworICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmNvbW1pdFByb3Zpc2lvbmFsUGFnZSk6CisgICAgICAgIFdoZW4g dGhlIGxvYWQgaXMgY29tbWl0dGVkIGluIHRoZSBuZXcgcHJvY2Vzcywgd2UgY2FsbCBXZWJQYWdl UHJveHk6OmNvbW1pdFByb3Zpc2lvbmFsUGFnZSgpLiBJdCB0YWtlcyBjYXJlIG9mOgorICAgICAg ICAtIEFjdHVhbGx5IHN3YXBwaW5nIHRoZSBXZWJQYWdlUHJveHkgdG8gdGhlIG5ldyBwcm9jZXNz IGJ5IGNhbGxpbmcgcHJvY2Vzc0RpZFRlcm1pbmF0ZSgpIC8gc3dhcFRvV2ViUHJvY2VzcygpLgor ICAgICAgICAtIFN1c3BlbmRpbmcgdGhlIGN1cnJlbnQgcGFnZS4KKyAgICAgICAgLSBMZXR0aW5n IHRoZSBjbGllbnQga25vdyB0aGUgbG9hZCBpcyBjb21pdHRlZAorICAgICAgICAtIERlc3Ryb3kg dGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5LgorICAgICAgICBUaGlzIHdvcmsgdXNlZCB0byBoYXBw ZW4gZWFybGllciBpbiBjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MoKS4KKworICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2Vzcyk6 CisgICAgICAgIE1vdmVkIHNvbWUgb2YgdGhlIGxvZ2ljIHRvIGNvbW1pdFByb3Zpc2lvbmFsUGFn ZSgpLiBXZSBub3cgbWVyZWx5IHN0YXJ0IHRoZSBsb2FkIGluIGEgbmV3IFByb3Zpc2lvbmFsUGFn ZVByb3h5LAorICAgICAgICB3aXRob3V0IGFjdHVhbGx5IGhhdmluZyB0aGUgV2ViUGFnZVByb3h5 IHN3aXRjaCB0byB0aGUgbmV3IHByb2Nlc3MgeWV0LgorCisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpkaWRDcmVhdGVXaW5kb3cpOgorICAgICAgICBEcm9wIHNvbWUgY29kZSB0aGF0IGlzIG5v IGxvbmdlciBuZWVkZWQsIG5vdyB0aGF0IHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eSB0YWtlcyBj YXJlIG9mIHRoaXMuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWREZXN0cm95 TmF2aWdhdGlvbik6CisgICAgICAgIE9uIHByb2Nlc3Mtc3dhcCwgd2hlbiB0ZWxsaW5nIHRoZSBw cmV2aW91cyBwcm9jZXNzIHRvIGlnbm9yZSB0aGUgbG9hZCBhbmQgc3RhcnRpbmcgdGhlIG5ldyBs b2FkIGluIGEgbmV3CisgICAgICAgIFByb3Zpc2lvbmFsUGFnZVByb3h5LCB0aGUgcHJldmlvdXMg V2ViUGFnZSBhdHRlbXB0cyB0byBkZXN0cm95IHRoZSBuYXZpZ2F0aW9uLiBJbiB0aGlzIGNhc2Us IHdlIGlnbm9yZQorICAgICAgICB0aGUgY2FsbCBzaW5jZSB0aGUgbmF2aWdhdGlvbiBpcyBtZXJl bHkgdGFrZW4gb3ZlciBieSB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkuCisKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKToKKyAg ICAgICAgTW92ZWQgc29tZSBQU09OIGxvZ2ljIHRvIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eSBp bnN0ZWFkLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lv bmFsTG9hZEZvckZyYW1lKToKKyAgICAgICAgV2hlbiBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUoKSBpcyBjYWxsZWQgZm9yIGEgUHJvdmlzaW9uYWxQYWdlUHJveHksIGRlc3Ryb3kgaXQu CisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0 aW9uQWN0aW9uQXN5bmMpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBv bGljeUZvclJlc3BvbnNlKToKKyAgICAgICAgQ2FwdHVyZSB0aGUgcHJvY2VzcyBpbiB0aGUgbGFt YmRhLCB0byBtYWtlIHN1cmUgd2Ugc2VuZCB0aGUgcG9saWN5IGRlY2lzaW9uIHRvIHRoZSBzYW1l IHByb2Nlc3MgdGhhdAorICAgICAgICBhc2tlZCBmb3IgaXQsIHNvIGFzIHRvIG5vdCBnZXQgY29u ZnVzZWQgYnkgcHJvY2VzcyBzd2Fwcy4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnJlc2V0U3RhdGUpOgorICAgICAgICBEcm9wIHNvbWUgY29kZSB0aGF0IGlzIG5vIGxvbmdlciBu ZWVkZWQuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjcmVhdGlvblBhcmFtZXRl cnMpOgorICAgICAgICBNb3ZlIHRoZSBoYXNSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMgZmxhZyBp bml0aWFsaXphdGlvbiBmcm9tIHRoZSBjYWxsIHNpdGUgdG8gaGVyZSBub3cgdGhhdCB3ZSBoYXZl CisgICAgICAgIG1vcmUgdGhhbiBvbmUgY2FsbCBzaXRlLiBUaGlzIHdhcyBqdXN0IHNvbWUgYmFk IGZhY3RvcmluZy4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OlBhZ2VQcm9jZXNz T3ZlcnJpZGU6OlBhZ2VQcm9jZXNzT3ZlcnJpZGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OlBhZ2VQcm9jZXNzT3ZlcnJpZGU6On5QYWdlUHJvY2Vzc092ZXJyaWRlKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6dGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MpOgorICAgICAgICBBZGQgdXRpbGl0eSBj bGFzcyB0byB0ZW1wb3JhcmlseSBvdmVycmlkZSB0aGUgV2ViUGFnZVByb3h5J3MgbV9wcm9jZXNz IHdpdGggdGhlIHByb3Zpc2lvbmFsIG9uZSB3aGVuCisgICAgICAgIHRoZSBQcm92aXNpb25hbFBh Z2VQcm94eSBpbnRlcmFjdHMgd2l0aCB0aGUgV2ViUGFnZVByb3h5LgorCisgICAgICAgICogVUlQ cm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQ cm94eTo6aGFzUHJvdmlzaW9uYWxQYWdlV2l0aElEIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6 V2ViUHJvY2Vzc1Byb3h5Ojp1cGRhdGVCYWNrRm9yd2FyZEl0ZW0pOgorICAgICAgICBCZWZvcmUg dXBkYXRpbmcgYSBCYWNrRm9yd2FyZExpc3RJdGVtLCB3ZSBub3JtYWxseSBtYWtlIHN1cmUgdGhl IHByb2Nlc3MgaGFzIGEgV2ViUGFnZVByb3h5IHdpdGggdGhlCisgICAgICAgIGl0ZW0ncyBwYWdl SUQuIFdlIGhhdmUgdG8gdHdlYWsgdGhlIGxvZ2ljIGJlY2F1c2UgdGhlcmUgbWF5IG5vdyBiZSBu byBXZWJQYWdlUHJveHkgd2l0aCB0aGlzIHBhZ2VJRAorICAgICAgICBhc3NvY2lhdGVkIHdpdGgg dGhpcyBwcm9jZXNzIHlldCwgYmVjYXVzZSBpdCBpcyBzdGlsbCBhIFByb3Zpc2lvbmFsUGFnZVBy b3h5LgorCisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6Y2FuVGVybWluYXRlQ2hp bGRQcm9jZXNzKToKKyAgICAgICAgRG8gbm90IHRlcm1pbmF0ZSB0aGUgV2ViUHJvY2VzcyBpZiB0 aGVyZSBhcmUgUHJvdmlzaW9uYWxQYWdlUHJveHkgb2JqZWN0cyB1c2luZyBpdC4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzc1Byb3h5OjphZGRQcm92aXNpb25hbFBhZ2VQcm94eSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlByb2Nlc3NQcm94eTo6cmVtb3ZlUHJvdmlzaW9uYWxQYWdlUHJveHkpOgorCisgICAgICAgICog V2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvV2ViRnJhbWUuY3BwOgorICAgICAgICAoV2ViS2l0Ojp0b1BvbGljeUFjdGlvbik6 CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24pOgor ICAgICAgICBTdG9wIGRlYWxpbmcgd2l0aCBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQgYXMgaXQg bm8gbG9uZ2VyIGV4aXN0cy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cmVpbml0aWFsaXplV2ViUGFnZSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbik6CisKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0SXNTdXNwZW5kZWQpOgorICAgICAgICBTdXNwZW5k IHRoZSBQYWdlIHdoZW4gc2V0SXNTdXNwZW5kZWQodHJ1ZSkgaXMgY2FsbGVkLCBub3cgdGhhdCB0 aGVyZSBpcyBubyBsb25nZXIgYSBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQuCisgICAgICAgIHNl dElzU3VzcGVuZGVkKHRydWUpIElQQyBpcyBzZW50IHdoZW4gd2UgYWN0dWFsbHkgY29tbWl0IHRo ZSBwcm92aXNpb25hbCBwYWdlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9U aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhKToK KwogMjAxOS0wMS0xMCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3Jn PgogCiAgICAgICAgIFJFR1JFU1NJT04ocjIzOTgxNSkgaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZp Y2Uvc2VydmljZXdvcmtlci1wcml2YXRlLWJyb3dzaW5nLmh0dHBzLmh0bWwgdGVzdCB0aW1lcyBv dXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDRjMjZhNjk4MWI0NjRk YTU5MTZmMDVlYjczNTk2NjkxNTdlZTlmZmUuLmViZjk1MGJhNmMyZWQ5MWY2MjMyYmQyYjVlZmI5 Zjc5NTU3YWI1OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMjAz MiwxMSArMjAzMiwxMSBAQCB2b2lkIEZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQo KQogCiAgICAgICAgIE9wdGlvbmFsPEhhc0luc2VjdXJlQ29udGVudD4gaGFzSW5zZWN1cmVDb250 ZW50ID0gY2FjaGVkUGFnZS0+Y2FjaGVkTWFpbkZyYW1lKCktPmhhc0luc2VjdXJlQ29udGVudCgp OwogCisgICAgICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOwor CiAgICAgICAgIC8vIEZJWE1FOiBUaGlzIEFQSSBzaG91bGQgYmUgdHVybmVkIGFyb3VuZCBzbyB0 aGF0IHdlIGdyb3VuZCBDYWNoZWRQYWdlIGludG8gdGhlIFBhZ2UuCiAgICAgICAgIGNhY2hlZFBh Z2UtPnJlc3RvcmUoKm1fZnJhbWUucGFnZSgpKTsKIAotICAgICAgICBkaXNwYXRjaERpZENvbW1p dExvYWQoaGFzSW5zZWN1cmVDb250ZW50KTsKLQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAg ICAgICAgIG1fZnJhbWUucGFnZSgpLT5jaHJvbWUoKS5zZXREaXNwYXRjaFZpZXdwb3J0RGF0YURp ZENoYW5nZVN1cHByZXNzZWQoZmFsc2UpOwogICAgICAgICBtX2ZyYW1lLnBhZ2UoKS0+Y2hyb21l KCkuZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UobV9mcmFtZS5wYWdlKCktPnZp ZXdwb3J0QXJndW1lbnRzKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzLmNwcAppbmRleCBjYTJkZjQwZWUxZGQyY2EzNmYzYTQ4YTA0NzU3 Zjk3YmRiYjYzNjQ3Li42ZDA3YzAzYWQ4YzkyN2U1NDUzYzVmZGE5NTk2NzA5YTc3MjYxZTJiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz LmNwcApAQCAtNzMsNyArNzMsNyBAQCB2b2lkIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVu Y29kZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2Rlci5lbmNvZGVFbnVt KGxheWVySG9zdGluZ01vZGUpOwogICAgIGVuY29kZXIgPDwgbWltZVR5cGVzV2l0aEN1c3RvbUNv bnRlbnRQcm92aWRlcnM7CiAgICAgZW5jb2RlciA8PCBjb250cm9sbGVkQnlBdXRvbWF0aW9uOwot ICAgIGVuY29kZXIgPDwgaXNTd2FwRnJvbVN1c3BlbmRlZDsKKyAgICBlbmNvZGVyIDw8IGlzUHJv Y2Vzc1N3YXA7CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgZW5jb2RlciA8PCBjb2xvclNwYWNl OwpAQCAtMjI3LDcgKzIyNyw3IEBAIE9wdGlvbmFsPFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM+ IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkRlY29kCiAgICAgICAgIHJl dHVybiBXVEY6Om51bGxvcHQ7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmNv bnRyb2xsZWRCeUF1dG9tYXRpb24pKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotICAg IGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKSkKKyAg ICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkpCiAgICAgICAg IHJldHVybiBXVEY6Om51bGxvcHQ7CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmggYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgKaW5kZXggYWU0MzI1Y2Jk NWYxZTU2NzYxNjU4NmY1ZTlmYTczZWU1YjM1YjkzNy4uYjM4MmNlZWRkNDQ5YThkOWEwZjg2OTQ3 MzVmMjZjMDU5NWRkZWNkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VD cmVhdGlvblBhcmFtZXRlcnMuaApAQCAtMTI5LDcgKzEyOSw3IEBAIHN0cnVjdCBXZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzIHsKICAgICBWZWN0b3I8U3RyaW5nPiBtaW1lVHlwZXNXaXRoQ3VzdG9t Q29udGVudFByb3ZpZGVyczsKIAogICAgIGJvb2wgY29udHJvbGxlZEJ5QXV0b21hdGlvbjsKLSAg ICBib29sIGlzU3dhcEZyb21TdXNwZW5kZWQgeyBmYWxzZSB9OworICAgIGJvb2wgaXNQcm9jZXNz U3dhcCB7IGZhbHNlIH07CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgQ29sb3JTcGFjZURhdGEg Y29sb3JTcGFjZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBvbGljeUFj dGlvbi5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKaW5kZXggMTQy YTUxOGRmMDk3ZTVlZjJmYTE4MDQ4NGUwOWQwMzMzYzEwNWI4MS4uMzk3MTc5NWM0NmE1MWIzODgx OGM1NWI3NmQ2NTNhMzRiNTI4OWU5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQv V2ViUG9saWN5QWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0 aW9uLmgKQEAgLTI5LDExICsyOSwxMSBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorLy8gRklY TUU6IFJlbW92ZSB0aGlzIHR5cGUgYW5kIHVzZSBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gaW5zdGVh ZC4KIGVudW0gY2xhc3MgV2ViUG9saWN5QWN0aW9uIDogdWludDhfdCB7CiAgICAgVXNlLAogICAg IERvd25sb2FkLAotICAgIElnbm9yZSwKLSAgICBTdXNwZW5kCisgICAgSWdub3JlCiB9OwogCiB9 CkBAIC00NSw4ICs0NSw3IEBAIHRlbXBsYXRlPD4gc3RydWN0IEVudW1UcmFpdHM8V2ViS2l0OjpX ZWJQb2xpY3lBY3Rpb24+IHsKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb24sCiAgICAg ICAgIFdlYktpdDo6V2ViUG9saWN5QWN0aW9uOjpVc2UsCiAgICAgICAgIFdlYktpdDo6V2ViUG9s aWN5QWN0aW9uOjpEb3dubG9hZCwKLSAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246Okln bm9yZSwKLSAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQKKyAgICAgICAg V2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246Oklnbm9yZQogICAgID47CiB9OwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMudHh0IGIvU291cmNlL1dlYktpdC9Tb3VyY2VzLnR4dApp bmRleCBhMGI2ZjcyODQ2MDQxYzI2M2E1NDc2NzEwZWFjOTg3ZmVkMWQxNjA0Li44YWVjYjg2NDcy NTAyZDAyN2EzNGFmMzcxOWRkODI4YjAwN2RiMTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1NvdXJjZXMudHh0CisrKyBiL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQKQEAgLTIzMCw2ICsy MzAsNyBAQCBVSVByb2Nlc3MvSW5zcGVjdG9yVGFyZ2V0UHJveHkuY3BwCiBVSVByb2Nlc3MvUGFn ZUxvYWRTdGF0ZS5jcHAKIFVJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcAogVUlQcm9jZXNz L1Byb2Nlc3NUaHJvdHRsZXIuY3BwCitVSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3Bw CiBVSVByb2Nlc3MvUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkuY3BwCiBVSVByb2Nlc3MvUmVzcG9u c2l2ZW5lc3NUaW1lci5jcHAKIFVJUHJvY2Vzcy9TZXJ2aWNlV29ya2VyUHJvY2Vzc1Byb3h5LmNw cApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll dy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5k ZXggY2YxOTE5YzkzYTczODUzMDc1OWUzN2YzM2RiYjEwYjRjZDA0NTg3OC4uYzc5ZmNiMjEwYjUx NTU1MDg4ZTFkZjg2ZmNhOTY1NTFjNjMyYThkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC00NCw2ICs0NCw3IEBACiAjaW1wb3J0ICJO YXZpZ2F0aW9uU3RhdGUuaCIKICNpbXBvcnQgIk9iakNPYmplY3RHcmFwaC5oIgogI2ltcG9ydCAi UGFnZUNsaWVudC5oIgorI2ltcG9ydCAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbXBvcnQg IlJlbW90ZUxheWVyVHJlZVNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YS5oIgogI2ltcG9ydCAiUmVt b3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24uaCIKICNpbXBvcnQgIlJlbW90ZU9iamVjdFJlZ2lzdHJ5 LmgiCkBAIC00NjY0LDYgKzQ2NjUsMTEgQEAgLSAodm9pZClfa2lsbFdlYkNvbnRlbnRQcm9jZXNz QW5kUmVzZXRTdGF0ZQogewogICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nlc3NQcm94eT4gcHJvdGVj dGVkUHJvY2Vzc1Byb3h5KF9wYWdlLT5wcm9jZXNzKCkpOwogICAgIHByb3RlY3RlZFByb2Nlc3NQ cm94eS0+cmVxdWVzdFRlcm1pbmF0aW9uKFdlYktpdDo6UHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29u OjpSZXF1ZXN0ZWRCeUNsaWVudCk7CisKKyAgICBpZiAoYXV0byogcHJvdmlzaW9uYWxQYWdlUHJv eHkgPSBfcGFnZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKSkgeworICAgICAgICBSZWY8V2ViS2l0 OjpXZWJQcm9jZXNzUHJveHk+IHByb3RlY3RlZFByb2Nlc3NQcm94eShwcm92aXNpb25hbFBhZ2VQ cm94eS0+cHJvY2VzcygpKTsKKyAgICAgICAgcHJvdGVjdGVkUHJvY2Vzc1Byb3h5LT5yZXF1ZXN0 VGVybWluYXRpb24oV2ViS2l0OjpQcm9jZXNzVGVybWluYXRpb25SZWFzb246OlJlcXVlc3RlZEJ5 Q2xpZW50KTsKKyAgICB9CiB9CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9QYWdlQ2xpZW50LmgKaW5kZXggMGI4NThjNDZlZTQ3NGQ2OTZkZGMzZDQzNWJkNTRjMTMyMzAw M2MyZC4uNmYzZGY4NDUyYjMxZTM0ZWI3ZmFmNGFjZDBmZDdlMDQ3ZWU5ZjA3NiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaApAQCAtNDgsNiArNDgsNyBAQAogCiBPQkpDX0NMQVNT IENBTGF5ZXI7CiBPQkpDX0NMQVNTIE5TRmlsZVdyYXBwZXI7CitPQkpDX0NMQVNTIE5TTWVudTsK IE9CSkNfQ0xBU1MgTlNTZXQ7CiBPQkpDX0NMQVNTIFdLRHJhd2luZ1ZpZXc7CiBPQkpDX0NMQVNT IF9XS1JlbW90ZU9iamVjdFJlZ2lzdHJ5OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv UHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjc5ZjUyMzY2NTY0NmVhYjQxODYy MjY2OTc2OGU4ZWQzODZkMmIzOTMKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAKQEAgLTAsMCArMSwzMDUgQEAKKy8qCisg KiBDb3B5cmlnaHQgKEMpIDIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoK KyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmli dXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAq ICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJv ZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVu dGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0 aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQg SVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVE IFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJ RUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElD VUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUg SU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElO RElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5U SUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBP RgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9S IFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFO RCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNU UklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lT RSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4K KyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJv eHkuaCIKKworI2luY2x1ZGUgIkFQSU5hdmlnYXRpb24uaCIKKyNpbmNsdWRlICJEcmF3aW5nQXJl YVByb3h5LmgiCisjaW5jbHVkZSAiTG9nZ2luZy5oIgorI2luY2x1ZGUgIlBhZ2VDbGllbnQuaCIK KyNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3QuaCIKKyNpbmNsdWRlICJXZWJCYWNrRm9yd2Fy ZExpc3RJdGVtLmgiCisjaW5jbHVkZSAiV2ViRXJyb3JzLmgiCisjaW5jbHVkZSAiV2ViTmF2aWdh dGlvblN0YXRlLmgiCisjaW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2VzLmgiCisjaW5jbHVkZSAiV2Vi UGFnZVByb3h5LmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5TWVzc2FnZXMuaCIKKyNpbmNsdWRl ICJXZWJQcm9jZXNzTWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNzUHJveHkuaCIKKyNp bmNsdWRlIDxXZWJDb3JlL1Nob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZC5oPgorCituYW1lc3Bh Y2UgV2ViS2l0IHsKKworI2RlZmluZSBSRUxFQVNFX0xPR19JRl9BTExPV0VEKGNoYW5uZWwsIGZt dCwgLi4uKSBSRUxFQVNFX0xPR19JRihtX3BhZ2UuaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCks IGNoYW5uZWwsICIlcCAtIFByb3Zpc2lvbmFsUGFnZVByb3h5OjoiIGZtdCwgdGhpcywgIyNfX1ZB X0FSR1NfXykKKworUHJvdmlzaW9uYWxQYWdlUHJveHk6OlByb3Zpc2lvbmFsUGFnZVByb3h5KFdl YlBhZ2VQcm94eSYgcGFnZSwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVu aXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiBzdXNwZW5kZWRQYWdlLCB1aW50NjRfdCBuYXZp Z2F0aW9uSUQsIGJvb2wgaXNTZXJ2ZXJSZWRpcmVjdCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0JiByZXF1ZXN0LCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2Fw UmVxdWVzdGVkQnlDbGllbnQpCisgICAgOiBtX3BhZ2UocGFnZSkKKyAgICAsIG1fcHJvY2VzcyhX VEZNb3ZlKHByb2Nlc3MpKQorICAgICwgbV9uYXZpZ2F0aW9uSUQobmF2aWdhdGlvbklEKQorICAg ICwgbV9pc1NlcnZlclJlZGlyZWN0KGlzU2VydmVyUmVkaXJlY3QpCisgICAgLCBtX3JlcXVlc3Qo cmVxdWVzdCkKKyAgICAsIG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudChwcm9jZXNzU3dh cFJlcXVlc3RlZEJ5Q2xpZW50KQorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgLCBtX3N1 c3BlbnNpb25Ub2tlbihtX3Byb2Nlc3MtPnRocm90dGxlcigpLmJhY2tncm91bmRBY3Rpdml0eVRv a2VuKCkpCisjZW5kaWYKK3sKKyAgICBtX3Byb2Nlc3MtPmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNz YWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQo KSwgKnRoaXMpOworICAgIG1fcHJvY2Vzcy0+YWRkUHJvdmlzaW9uYWxQYWdlUHJveHkoKnRoaXMp OworCisgICAgLy8gSWYgd2UgYXJlIHJlYXR0YWNoaW5nIHRvIGEgU3VzcGVuZGVkUGFnZSwgdGhl biB0aGUgV2ViUHJvY2VzcycgV2ViUGFnZSBhbHJlYWR5IGV4aXN0cyBhbmQKKyAgICAvLyBXZWJQ YWdlUHJveHk6OmRpZENyZWF0ZU1haW5GcmFtZSgpIHdpbGwgbm90IGJlIGNhbGxlZCB0byBpbml0 aWFsaXplIG1fbWFpbkZyYW1lLiBJbiBzdWNoCisgICAgLy8gY2FzZSwgd2UgbmVlZCB0byBpbml0 aWFsaXplIG1fbWFpbkZyYW1lIHRvIHJlZmxlY3QgdGhlIGZhY3QgdGhlIHRoZSBXZWJQcm9jZXNz JyBXZWJQYWdlCisgICAgLy8gYWxyZWFkeSBleGlzdHMgYW5kIGFscmVhZHkgaGFzIGEgbWFpbiBm cmFtZS4KKyAgICBpZiAoc3VzcGVuZGVkUGFnZSkgeworICAgICAgICBBU1NFUlQoJnN1c3BlbmRl ZFBhZ2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpOworICAgICAgICBzdXNwZW5kZWRQ YWdlLT51bnN1c3BlbmQoKTsKKyAgICAgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5Ojpj cmVhdGUobV9wYWdlLCBzdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpKTsKKyAgICAgICAgbV9w cm9jZXNzLT5mcmFtZUNyZWF0ZWQoc3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSwgKm1fbWFp bkZyYW1lKTsKKyAgICB9CisKKyAgICBpbml0aWFsaXplV2ViUGFnZSgpOworfQorCitQcm92aXNp b25hbFBhZ2VQcm94eTo6flByb3Zpc2lvbmFsUGFnZVByb3h5KCkKK3sKKyAgICBtX3Byb2Nlc3Mt PnJlbW92ZVByb3Zpc2lvbmFsUGFnZVByb3h5KCp0aGlzKTsKKworICAgIGlmIChtX3dhc0NvbW1p dHRlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVj ZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3Bh Z2UucGFnZUlEKCkpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xv c2UoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKworICAgIGlmIChtX2RyYXdpbmdBcmVhKSB7CisgICAg ICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRl UHJvY2VzcyhtX3Byb2Nlc3MpOworICAgICAgICBtX2RyYXdpbmdBcmVhID0gbnVsbHB0cjsKKyAg ICB9CisKKyAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3Byb2Nlc3MgPSBtX3Byb2Nlc3Mu Y29weVJlZigpXSB7CisgICAgICAgIHByb2Nlc3MtPm1heWJlU2h1dERvd24oKTsKKyAgICB9KTsK K30KKworc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IFByb3Zpc2lvbmFsUGFnZVBy b3h5Ojp0YWtlRHJhd2luZ0FyZWEoKQoreworICAgIHJldHVybiBXVEZNb3ZlKG1fZHJhd2luZ0Fy ZWEpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpjYW5jZWwoKQoreworICAgIC8v IElmIHRoZSBwcm92aXNpb25hbCBsb2FkIHN0YXJ0ZWQsIHRoZW4gaW5kaWNhdGUgdGhhdCBpdCBm YWlsZWQgZHVlIHRvIGNhbmNlbGxhdGlvbiBieSBjYWxsaW5nIGRpZEZhaWxQcm92aXNpb25hbExv YWRGb3JGcmFtZSgpLgorICAgIGlmIChtX3Byb3Zpc2lvbmFsTG9hZFVSTC5pc0VtcHR5KCkpCisg ICAgICAgIHJldHVybjsKKworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBw aW5nLCAiY2FuY2VsOiBTaW11bGF0aW5nIGEgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1l IGZvciBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgQVNTRVJUKG1f bWFpbkZyYW1lKTsKKyAgICBhdXRvIGVycm9yID0gV2ViS2l0OjpjYW5jZWxsZWRFcnJvcihtX3Jl cXVlc3QpOworICAgIGVycm9yLnNldFR5cGUoV2ViQ29yZTo6UmVzb3VyY2VFcnJvcjo6VHlwZTo6 Q2FuY2VsbGF0aW9uKTsKKyAgICBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUobV9tYWlu RnJhbWUtPmZyYW1lSUQoKSwgeyB9LCBtX25hdmlnYXRpb25JRCwgbV9wcm92aXNpb25hbExvYWRV UkwsIGVycm9yLCBVc2VyRGF0YSB7IH0pOyAvLyBXaWxsIGRlbGV0ZSB8dGhpc3wuCit9CisKK3Zv aWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OnByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmcoKQorewor ICAgIGZpbmlzaEluaXRpYWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2goKTsKK30KKwor dm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVy UHJvY2Vzc0xhdW5jaCgpCit7CisgICAgQVNTRVJUKG1fcHJvY2Vzcy0+c3RhdGUoKSA9PSBXZWJQ cm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKTsKKworICAgIC8vIEZJWE1FOiBUaGUgV2ViUGFn ZVByb3h5IGRlbGF5cyBhZGRpbmcgdGhlIHZpc2l0ZWQgbGluayBzdG9yZSB1bnRpbCBhZnRlciB0 aGUgcHJvY2VzcyBoYXMgbGF1bmNoZWQKKyAgICAvLyBzbyB0aGUgUHJvdmlzaW9uYWxQYWdlUHJv eHkgZG9lcyB0aGUgc2FtZS4gSG93ZXZlciwgZG8gd2UgcmVhbGx5IG5lZWQgdG8/CisgICAgbV9w cm9jZXNzLT5hZGRWaXNpdGVkTGlua1N0b3JlKG1fcGFnZS52aXNpdGVkTGlua1N0b3JlKCkpOwor fQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSgpCit7Cisg ICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQ cm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgbV9kcmF3aW5nQXJlYSA9IG1fcGFnZS5wYWdlQ2xpZW50 KCkuY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpOworCisgICAgYXV0byBwYXJhbWV0ZXJzID0gbV9w YWdlLmNyZWF0aW9uUGFyYW1ldGVycygpOworICAgIHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCA9 IHRydWU7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpDcmVhdGVX ZWJQYWdlKG1fcGFnZS5wYWdlSUQoKSwgcGFyYW1ldGVycyksIDApOworCisgICAgaWYgKG1fcHJv Y2Vzcy0+c3RhdGUoKSA9PSBXZWJQcm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKQorICAgICAg ICBmaW5pc2hJbml0aWFsaXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNoKCk7Cit9CisKK3Zv aWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZp Z2F0aW9uJiBuYXZpZ2F0aW9uLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEsIGNvbnN0 IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYg YmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNE YXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUg PSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBtX3Bh Z2UubG9hZERhdGFXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCBkYXRhLCBNSU1FVHlwZSwgZW5j b2RpbmcsIGJhc2VVUkwsIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWlu Z0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKK30KKwordm9pZCBQcm92aXNp b25hbFBhZ2VQcm94eTo6bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24m IG5hdmlnYXRpb24sIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFdlYkNvcmU6 OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3kgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGlj eSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYm IHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3Bh Z2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBtX3BhZ2UubG9h ZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCBXVEZNb3ZlKHJlcXVlc3QpLCBzaG91 bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRB c0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Cit9CisKK3Zv aWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0oQVBJOjpOYXZpZ2F0 aW9uJiBuYXZpZ2F0aW9uLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtJiBpdGVtLCBPcHRpb25hbDxX ZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBhdXRvIGl0ZW1T dGF0ZXMgPSBtX3BhZ2UuYmFja0ZvcndhcmRMaXN0KCkuZmlsdGVyZWRJdGVtU3RhdGVzKFt0aGlz LCB0YXJnZXRJdGVtID0gJml0ZW1dKGF1dG8mIGl0ZW0pIHsKKyAgICAgICAgaWYgKGF1dG8qIHBh Z2UgPSBpdGVtLnN1c3BlbmRlZFBhZ2UoKSkgeworICAgICAgICAgICAgaWYgKCZwYWdlLT5wcm9j ZXNzKCkgPT0gbV9wcm9jZXNzLnB0cigpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICAgICAgfQorICAgICAgICByZXR1cm4gJml0ZW0gIT0gdGFyZ2V0SXRlbTsKKyAgICB9KTsK KyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlVwZGF0ZUJhY2tGb3J3YXJk TGlzdEZvclJlYXR0YWNoKFdURk1vdmUoaXRlbVN0YXRlcykpLCBtX3BhZ2UucGFnZUlEKCkpOwor ICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRl bShuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBpdGVtLml0ZW1JRCgpLCAqbmF2aWdhdGlvbi5i YWNrRm9yd2FyZEZyYW1lTG9hZFR5cGUoKSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVp bmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSksIG1fcGFnZS5wYWdlSUQoKSk7 CisgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKK30KKwordm9p ZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKHVpbnQ2NF90IGZyYW1l SUQpCit7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJkaWRD cmVhdGVNYWluRnJhbWU6IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0 LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQpOworICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOwor CisgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5OjpjcmVhdGUobV9wYWdlLCBmcmFtZUlE KTsKKworICAgIC8vIEFkZCB0aGUgZnJhbWUgdG8gdGhlIHByb2Nlc3Mgd2lkZSBtYXAuCisgICAg bV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoZnJhbWVJRCwgKm1fbWFpbkZyYW1lKTsKKworICAgIC8v IFRoaXMgbmF2aWdhdGlvbiB3YXMgZGVzdHJveWVkIHNvIG5vIG5lZWQgdG8gbm90aWZ5IG9mIHJl ZGlyZWN0LgorICAgIGlmICghbV9wYWdlLm5hdmlnYXRpb25TdGF0ZSgpLmhhc05hdmlnYXRpb24o bV9uYXZpZ2F0aW9uSUQpKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBSZXN0b3JlIHRoZSBt YWluIGZyYW1lJ3MgY29tbWl0dGVkIFVSTCBhcyBzb21lIGNsaWVudHMgbWF5IHJlbHkgb24gaXQg dW50aWwgdGhlIG5leHQgbG9hZCBpcyBjb21taXR0ZWQuCisgICAgaWYgKGF1dG8qIG1haW5GcmFt ZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAgICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0 YXRlKCkuc2V0VVJMKG1haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS51cmwoKSk7CisKKyAgICAv LyBOb3JtYWxseSwgbm90aWZpY2F0aW9uIG9mIGEgc2VydmVyIHJlZGlyZWN0IGNvbWVzIGZyb20g dGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KKyAgICAvLyBJZiB3ZSBhcmUgcHJvY2VzcyBzd2FwcGlu ZyBpbiByZXNwb25zZSB0byBhIHNlcnZlciByZWRpcmVjdCB0aGVuIHRoYXQgbm90aWZpY2F0aW9u IHdpbGwgbm90IGNvbWUgZnJvbSB0aGUgbmV3IFdlYkNvbnRlbnQgcHJvY2Vzcy4KKyAgICAvLyBJ biB0aGlzIGNhc2Ugd2UgaGF2ZSB0aGUgVUlQcm9jZXNzIHN5bnRoZXNpemUgdGhlIHJlZGlyZWN0 IG5vdGlmaWNhdGlvbiBhdCB0aGUgYXBwcm9wcmlhdGUgdGltZS4KKyAgICBpZiAobV9pc1NlcnZl clJlZGlyZWN0KSB7CisgICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLmRpZFN0 YXJ0UHJvdmlzaW9uYWxMb2FkKG1fcmVxdWVzdC51cmwoKSk7CisKKyAgICAgICAgYXV0byBwYWdl UHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJv Y2Vzcyk7CisgICAgICAgIG1fcGFnZS5kaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNp b25hbExvYWRGb3JGcmFtZShtX21haW5GcmFtZS0+ZnJhbWVJRCgpLCBtX25hdmlnYXRpb25JRCwg V1RGTW92ZShtX3JlcXVlc3QpLCB7IH0pOworICAgIH0KK30KKwordm9pZCBQcm92aXNpb25hbFBh Z2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlE LCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmIHVybCwgVVJMJiYgdW5yZWFjaGFibGVVUkws IGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICAvLyBJZiB0aGUgcHJldmlvdXMgcHJv dmlzaW9uYWwgbG9hZCB1c2VkIHRoZSBzYW1lIHByb2Nlc3MsIHdlIG1heSByZWNlaXZlIElQQyBm b3IgdGhpcyBwcmV2aW91cyBwcm92aXNpb25hbCdzIG1haW4gZnJhbWUgdGhhdCB3ZSBuZWVkIHRv IGlnbm9yZS4KKyAgICBpZiAoIW1fbWFpbkZyYW1lIHx8IG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkg IT0gZnJhbWVJRCkKKyAgICAgICAgcmV0dXJuOworCisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RChQcm9jZXNzU3dhcHBpbmcsICJkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOiBwYWdl SUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgPSAl IiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSwgZnJhbWVJRCwgbmF2aWdhdGlvbklEKTsKKyAgICBB U1NFUlQobV9wcm92aXNpb25hbExvYWRVUkwuaXNOdWxsKCkpOworICAgIG1fcHJvdmlzaW9uYWxM b2FkVVJMID0gdXJsOworCisgICAgLy8gTWVyZWx5IGZvbGxvd2luZyBhIHNlcnZlciBzaWRlIHJl ZGlyZWN0IHNvIHRoZXJlIGlzIG5vIG5lZWQgdG8gc2VuZCBhIGRpZFN0YXJ0UHJvdmlzaW9uYWxM b2FkIGFnYWluLgorICAgIGlmIChtX2lzU2VydmVyUmVkaXJlY3QpCisgICAgICAgIHJldHVybjsK KworICAgIC8vIENsaWVudHMgZXhwZWN0IHRoZSBQYWdlJ3MgbWFpbiBmcmFtZSdzIGV4cGVjdGVk VVJMIHRvIGJlIHRoZSBwcm92aXNpb25hbCBvbmUgd2hlbiBhIHByb3Zpc2lvbmFsIGxvYWQgaXMg c3RhcnRlZC4KKyAgICBpZiAoYXV0byogcGFnZU1haW5GcmFtZSA9IG1fcGFnZS5tYWluRnJhbWUo KSkKKyAgICAgICAgcGFnZU1haW5GcmFtZS0+ZGlkU3RhcnRQcm92aXNpb25hbExvYWQodXJsKTsK KworICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJy aWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgIG1fcGFnZS5kaWRTdGFydFByb3Zpc2lvbmFsTG9h ZEZvckZyYW1lKGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgV1RGTW92ZSh1cmwpLCBXVEZNb3ZlKHVu cmVhY2hhYmxlVVJMKSwgdXNlckRhdGEpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5 OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3Qg V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRf dCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNv cmU6OlJlc291cmNlRXJyb3ImIGVycm9yLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCit7Cisg ICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQ cm9jZXNzKG1fcHJvY2Vzcyk7CisKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NT d2FwcGluZywgImRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZTogcGFnZUlEID0gJSIgUFJJ dTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEID0gJSIgUFJJdTY0LCBt X3BhZ2UucGFnZUlEKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCk7CisgICAgbV9wcm92aXNpb25h bExvYWRVUkwgPSB7IH07CisKKyAgICAvLyBNYWtlIHN1cmUgdGhlIFBhZ2UncyBtYWluIGZyYW1l J3MgZXhwZWN0ZWRVUkwgZ2V0cyBjbGVhcmVkIHNpbmNlIHdlIHVwZGF0ZWQgaXQgaW4gZGlkU3Rh cnRQcm92aXNpb25hbExvYWQuCisgICAgaWYgKGF1dG8qIHBhZ2VNYWluRnJhbWUgPSBtX3BhZ2Uu bWFpbkZyYW1lKCkpCisgICAgICAgIHBhZ2VNYWluRnJhbWUtPmRpZEZhaWxQcm92aXNpb25hbExv YWQoKTsKKworICAgIG1fcGFnZS5kaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoZnJhbWVJ RCwgZnJhbWVTZWN1cml0eU9yaWdpbiwgbmF2aWdhdGlvbklELCBwcm92aXNpb25hbFVSTCwgZXJy b3IsIHVzZXJEYXRhKTsgLy8gV2lsbCBkZWxldGUgfHRoaXN8LgorfQorCit2b2lkIFByb3Zpc2lv bmFsUGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWlu dDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFz Q3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJD b3JlOjpDZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5mbywgYm9vbCBjb250YWluc1BsdWdp bkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhh c0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAgIC8vIElm IHRoZSBwcmV2aW91cyBwcm92aXNpb25hbCBsb2FkIHVzZWQgdGhlIHNhbWUgcHJvY2Vzcywgd2Ug bWF5IHJlY2VpdmUgSVBDIGZvciB0aGlzIHByZXZpb3VzIHByb3Zpc2lvbmFsJ3MgbWFpbiBmcmFt ZSB0aGF0IHdlIG5lZWQgdG8gaWdub3JlLgorICAgIGlmICghbV9tYWluRnJhbWUgfHwgbV9tYWlu RnJhbWUtPmZyYW1lSUQoKSAhPSBmcmFtZUlEKQorICAgICAgICByZXR1cm47CisKKyAgICBSRUxF QVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZENvbW1pdExvYWRGb3JGcmFt ZTogcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgbmF2aWdhdGlv bklEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCk7 CisgICAgbV9wcm92aXNpb25hbExvYWRVUkwgPSB7IH07CisgICAgbV9wcm9jZXNzLT5yZW1vdmVN ZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFt ZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAgbV93YXNDb21taXR0ZWQgPSB0cnVlOworICAg IG1fcGFnZS5jb21taXRQcm92aXNpb25hbFBhZ2UoZnJhbWVJRCwgbmF2aWdhdGlvbklELCBtaW1l VHlwZSwgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIGZyYW1lTG9hZFR5cGUsIGNlcnRp ZmljYXRlSW5mbywgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgZm9yY2VkSGFzSW5zZWN1cmVDb250 ZW50LCB1c2VyRGF0YSk7IC8vIFdpbGwgZGVsZXRlIHx0aGlzfC4KK30KKwordm9pZCBQcm92aXNp b25hbFBhZ2VQcm94eTo6ZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0 aW9uLCBJUEM6OkRlY29kZXImIGRlY29kZXIpCit7CisgICAgQVNTRVJUKGRlY29kZXIubWVzc2Fn ZVJlY2VpdmVyTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZl ck5hbWUoKSk7CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OkRpZFN0YXJ0UHJvZ3Jlc3M6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVy Lm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ2hhbmdlUHJvZ3Jl c3M6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6QmFja0ZvcndhcmRBZGRJdGVtOjpuYW1lKCkKKyAgICAgICAgfHwgZGVj b2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkxvZ0RpYWdub3N0 aWNNZXNzYWdlOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OkxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aEVuaGFuY2VkUHJp dmFjeTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpTZXROZXR3b3JrUmVxdWVzdHNJblByb2dyZXNzOjpuYW1lKCkKKyNp ZiBQTEFURk9STShDT0NPQSkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OlJlZ2lzdGVyV2ViUHJvY2Vzc0FjY2Vzc2liaWxpdHlUb2tl bjo6bmFtZSgpCisjZW5kaWYKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3lu Yzo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpTdGFydFVSTFNjaGVtZVRhc2s6Om5hbWUoKQorICAgICAgICB8fCBkZWNv ZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGVjaWRlUG9saWN5 Rm9yUmVzcG9uc2U6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0g TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0OjpuYW1lKCkK KyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6OkRpZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWU6Om5hbWUoKQorICAgICAgICB8fCBk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkTmF2aWdh dGVXaXRoTmF2aWdhdGlvbkRhdGE6Om5hbWUoKSkKKyAgICB7CisgICAgICAgIGF1dG8gcGFnZVBy b2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nl c3MpOworICAgICAgICBtX3BhZ2UuZGlkUmVjZWl2ZU1lc3NhZ2UoY29ubmVjdGlvbiwgZGVjb2Rl cik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFt ZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENyZWF0ZU1haW5GcmFtZTo6bmFtZSgp KSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpE aWRDcmVhdGVNYWluRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6 ZGlkQ3JlYXRlTWFpbkZyYW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU3RhcnRQ cm92aXNpb25hbExvYWRGb3JGcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVz c2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lPihkZWNvZGVyLCB0aGlzLCAmUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlz aW9uYWxMb2FkRm9yRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGRl Y29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRGYWlsUHJv dmlzaW9uYWxMb2FkRm9yRnJhbWU6Om5hbWUoKSkgeworICAgICAgICBJUEM6OmhhbmRsZU1lc3Nh Z2U8TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1l PihkZWNvZGVyLCB0aGlzLCAmUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25h bExvYWRGb3JGcmFtZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rl ci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENvbW1pdExvYWRG b3JGcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpEaWRDb21taXRMb2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92 aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKworICAgIExPRyhQcm9jZXNzU3dhcHBpbmcsICJVbmhhbmRsZWQgbWVzc2FnZSAl czo6JXMgZnJvbSBwcm92aXNpb25hbCBwcm9jZXNzIiwgZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJO YW1lKCkudG9TdHJpbmcoKS5kYXRhKCksIGRlY29kZXIubWVzc2FnZU5hbWUoKS50b1N0cmluZygp LmRhdGEoKSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVTeW5j TWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIElQQzo6RGVjb2RlciYgZGVjb2Rl ciwgc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mIGVuY29kZXIpCit7CisgICAgaWYgKGRl Y29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpCYWNrRm9yd2Fy ZEl0ZW1BdEluZGV4OjpuYW1lKCkgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OkJhY2tGb3J3YXJkR29Ub0l0ZW06Om5hbWUoKSkgeworICAgICAgICBh dXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nl c3MobV9wcm9jZXNzKTsKKyAgICAgICAgbV9wYWdlLmRpZFJlY2VpdmVTeW5jTWVzc2FnZShjb25u ZWN0aW9uLCBkZWNvZGVyLCBlbmNvZGVyKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAg IExPRyhQcm9jZXNzU3dhcHBpbmcsICJVbmhhbmRsZWQgc3luYyBtZXNzYWdlICVzOjolcyBmcm9t IHByb3Zpc2lvbmFsIHByb2Nlc3MiLCBkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKS50b1N0 cmluZygpLmRhdGEoKSwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgpKTsK K30KKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv UHJvdmlzaW9uYWxQYWdlUHJveHkuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44Mjc0MDA2NTBhYzE4YmM2MWRlNWE2 MzYyODc1YTBjNzA0MjU1NDViCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuaApAQCAtMCwwICsxLDkyIEBACisvKgorICogQ29w eXJpZ2h0IChDKSAyMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9u cyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBu b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt ZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2Ug dGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlv biBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4K KyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBD T05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJS QU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdB UlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIK KyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4g T1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVD VCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBE QU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAq IFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9G SVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04g QU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1Qg TElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisg KiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZF TiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8K KworI3ByYWdtYSBvbmNlCisKKyNpbmNsdWRlICJNZXNzYWdlUmVjZWl2ZXIuaCIKKworbmFtZXNw YWNlIFdlYkNvcmUgeworY2xhc3MgUmVzb3VyY2VSZXF1ZXN0OworfQorCituYW1lc3BhY2UgV2Vi S2l0IHsKKworY2xhc3MgRHJhd2luZ0FyZWFQcm94eTsKK2NsYXNzIFN1c3BlbmRlZFBhZ2VQcm94 eTsKK2NsYXNzIFdlYkZyYW1lUHJveHk7CitjbGFzcyBXZWJQYWdlUHJveHk7CitjbGFzcyBXZWJQ cm9jZXNzUHJveHk7CisKK2NsYXNzIFByb3Zpc2lvbmFsUGFnZVByb3h5IDogcHVibGljIElQQzo6 TWVzc2FnZVJlY2VpdmVyIHsKKyAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKK3B1YmxpYzoK KyAgICBQcm92aXNpb25hbFBhZ2VQcm94eShXZWJQYWdlUHJveHkmLCBSZWY8V2ViUHJvY2Vzc1By b3h5PiYmLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiwgdWludDY0X3QgbmF2 aWdhdGlvbklELCBib29sIGlzU2VydmVyUmVkaXJlY3QsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNl UmVxdWVzdCYsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpOworICAgIH5Qcm92aXNpb25h bFBhZ2VQcm94eSgpOworCisgICAgV2ViUGFnZVByb3h5JiBwYWdlKCkgeyByZXR1cm4gbV9wYWdl OyB9CisgICAgV2ViRnJhbWVQcm94eSogbWFpbkZyYW1lKCkgY29uc3QgeyByZXR1cm4gbV9tYWlu RnJhbWUuZ2V0KCk7IH0KKyAgICBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MoKSB7IHJldHVybiBt X3Byb2Nlc3MuZ2V0KCk7IH0KKyAgICBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQoKSBjb25zdCB7IHJldHVybiBtX3Byb2Nlc3NTd2FwUmVx dWVzdGVkQnlDbGllbnQ7IH0KKyAgICB1aW50NjRfdCBuYXZpZ2F0aW9uSUQoKSBjb25zdCB7IHJl dHVybiBtX25hdmlnYXRpb25JRDsgfQorCisgICAgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVh UHJveHk+IHRha2VEcmF3aW5nQXJlYSgpOworCisgICAgdm9pZCBsb2FkRGF0YVdpdGhOYXZpZ2F0 aW9uKEFQSTo6TmF2aWdhdGlvbiYsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYsIGNvbnN0IFN0 cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFz ZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRh PiYmID0gV1RGOjpudWxsb3B0KTsKKyAgICB2b2lkIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24o QVBJOjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlNo b3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0aW9u YWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7CisgICAgdm9pZCBnb1Rv QmFja0ZvcndhcmRJdGVtKEFQSTo6TmF2aWdhdGlvbiYsIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0m LCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmKTsKKyAgICB2b2lkIGNhbmNlbCgpOwor CisgICAgdm9pZCBwcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5nKCk7CisKK3ByaXZhdGU6CisgICAg Ly8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKKyAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6 Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIGZpbmFsOworICAgIHZvaWQgZGlkUmVjZWl2ZVN5 bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYsIHN0ZDo6dW5pcXVlX3B0 cjxJUEM6OkVuY29kZXI+JikgZmluYWw7CisKKyAgICB2b2lkIGRpZENyZWF0ZU1haW5GcmFtZSh1 aW50NjRfdCBmcmFtZUlEKTsKKyAgICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJh bWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiwgVVJMJiYg dW5yZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRDb21taXRMb2Fk Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBT dHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50 MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mLCBib29s IGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29u dGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZv aWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0 IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0 X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJMLCBjb25zdCBXZWJD b3JlOjpSZXNvdXJjZUVycm9yJiwgY29uc3QgVXNlckRhdGEmKTsKKworICAgIHZvaWQgaW5pdGlh bGl6ZVdlYlBhZ2UoKTsKKyAgICB2b2lkIGZpbmlzaEluaXRpYWxpemluZ1dlYlBhZ2VBZnRlclBy b2Nlc3NMYXVuY2goKTsKKworICAgIFdlYlBhZ2VQcm94eSYgbV9wYWdlOworICAgIFJlZjxXZWJQ cm9jZXNzUHJveHk+IG1fcHJvY2VzczsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQ cm94eT4gbV9kcmF3aW5nQXJlYTsKKyAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9tYWluRnJh bWU7CisgICAgdWludDY0X3QgbV9uYXZpZ2F0aW9uSUQ7CisgICAgYm9vbCBtX2lzU2VydmVyUmVk aXJlY3Q7CisgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IG1fcmVxdWVzdDsKKyAgICBQcm9j ZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDsK KyAgICBib29sIG1fd2FzQ29tbWl0dGVkIHsgZmFsc2UgfTsKKyAgICBVUkwgbV9wcm92aXNpb25h bExvYWRVUkw7CisKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIFByb2Nlc3NUaHJvdHRs ZXI6OkJhY2tncm91bmRBY3Rpdml0eVRva2VuIG1fc3VzcGVuc2lvblRva2VuOworI2VuZGlmCit9 OworCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9T dXNwZW5kZWRQYWdlUHJveHkuY3BwCmluZGV4IGYxOThhODE1MzNmNzZiMmU4ZTJiZjcxZDRhM2I5 ZDI3NDBjOTUwNzguLmZmNzZkOWY3Zjk3YWM2ZmE0ZmJiMzAyZjY0NjY2MWQxNjc4YWUyNTcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcApAQCAt MTAwLDcgKzEwMCw5IEBAIFN1c3BlbmRlZFBhZ2VQcm94eTo6flN1c3BlbmRlZFBhZ2VQcm94eSgp CiAgICAgLy8gSWYgdGhlIHN1c3BlbmRlZCBwYWdlIHdhcyBub3QgY29uc3VtZWQgYmVmb3JlIGdl dHRpbmcgZGVzdHJveWVkLCB0aGVuIGNsb3NlIHRoZSBjb3JyZXNwb25kaW5nIHBhZ2UKICAgICAv LyBvbiB0aGUgV2ViUHJvY2VzcyBzaWRlLgogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6Q2xvc2UoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKLSAgICBtX3Byb2Nlc3MtPnJlbW92 ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJO YW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisKKyAgICBpZiAobV9zdXNwZW5zaW9uU3RhdGUgPT0g U3VzcGVuc2lvblN0YXRlOjpTdXNwZW5kaW5nKQorICAgICAgICBtX3Byb2Nlc3MtPnJlbW92ZU1l c3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1l KCksIG1fcGFnZS5wYWdlSUQoKSk7CiAKICAgICAvLyBXZSBjYWxsIG1heWJlU2h1dERvd24oKSBh c3luY2hyb25vdXNseSBzaW5jZSB0aGUgU3VzcGVuZGVkUGFnZSBpcyBjdXJyZW50bHkgYmVpbmcg cmVtb3ZlZCBmcm9tIHRoZSBXZWJQcm9jZXNzUG9vbAogICAgIC8vIGFuZCB3ZSB3YW50IHRvIGF2 b2lkIHJlLWVudGVyaW5nIFdlYlByb2Nlc3NQb29sIG1ldGhvZHMuCkBAIC0xMzQsNyArMTM2LDYg QEAgdm9pZCBTdXNwZW5kZWRQYWdlUHJveHk6OnVuc3VzcGVuZCgpCiAgICAgQVNTRVJUKG1fc3Vz cGVuc2lvblN0YXRlID09IFN1c3BlbnNpb25TdGF0ZTo6U3VzcGVuZGVkKTsKIAogICAgIG1fc3Vz cGVuc2lvblN0YXRlID0gU3VzcGVuc2lvblN0YXRlOjpSZXN1bWVkOwotICAgIG1fcHJvY2Vzcy0+ cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNl aXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2U6OlNldElzU3VzcGVuZGVkKGZhbHNlKSwgbV9wYWdlLnBhZ2VJRCgpKTsKIH0K IApAQCAtMTUxLDYgKzE1Miw4IEBAIHZvaWQgU3VzcGVuZGVkUGFnZVByb3h5OjpkaWRQcm9jZXNz UmVxdWVzdFRvU3VzcGVuZChTdXNwZW5zaW9uU3RhdGUgbmV3U3VzcGVuc2lvCiAgICAgbV9zdXNw ZW5zaW9uVG9rZW4gPSBudWxscHRyOwogI2VuZGlmCiAKKyAgICBtX3Byb2Nlc3MtPnJlbW92ZU1l c3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1l KCksIG1fcGFnZS5wYWdlSUQoKSk7CisKICAgICBpZiAobV9yZWFkeVRvVW5zdXNwZW5kSGFuZGxl cikKICAgICAgICAgbV9yZWFkeVRvVW5zdXNwZW5kSGFuZGxlcih0aGlzKTsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKaW5kZXggYzc3YTI2Yjc0MjdjMzFjODI4 ZTJlYWEyMjFmODA3MGI3N2FkZDI2Mi4uNTNjNzE5NmMyYWEwYTMzZDIyMDc1ODE5MGNkNGJkOTVh NWNkMDI1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94 eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKQEAg LTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJXZWJGcmFtZVByb3h5LmgiCiAKICNpbmNsdWRlICJB UElOYXZpZ2F0aW9uLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbmNs dWRlICJXZWJDZXJ0aWZpY2F0ZUluZm8uaCIKICNpbmNsdWRlICJXZWJGcmFtZVBvbGljeUxpc3Rl bmVyUHJveHkuaCIKICNpbmNsdWRlICJXZWJQYWdlTWVzc2FnZXMuaCIKQEAgLTc0LDcgKzc1LDcg QEAgYm9vbCBXZWJGcmFtZVByb3h5Ojppc01haW5GcmFtZSgpIGNvbnN0CiAgICAgaWYgKCFtX3Bh Z2UpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHJldHVybiB0aGlzID09IG1fcGFnZS0+ bWFpbkZyYW1lKCk7CisgICAgcmV0dXJuIHRoaXMgPT0gbV9wYWdlLT5tYWluRnJhbWUoKSB8fCAo bV9wYWdlLT5wcm92aXNpb25hbFBhZ2VQcm94eSgpICYmIHRoaXMgPT0gbV9wYWdlLT5wcm92aXNp b25hbFBhZ2VQcm94eSgpLT5tYWluRnJhbWUoKSk7CiB9CiAKIHZvaWQgV2ViRnJhbWVQcm94eTo6 bG9hZFVSTChjb25zdCBVUkwmIHVybCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCmluZGV4IDM5Mjc0M2JkNTY3OWNiZDIyNjdhMmMxMGVjY2UxOTVhNjFjMzNkMjkuLmQ4 OTRjZjhmNDQ1MWM4YzViNzdhYTFiOTExZGE5MmMzOTkwNzU4YzAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNzcsNiArNzcsNyBAQAogI2luY2x1ZGUgIlBs dWdpbkluZm9ybWF0aW9uLmgiCiAjaW5jbHVkZSAiUGx1Z2luUHJvY2Vzc01hbmFnZXIuaCIKICNp bmNsdWRlICJQcmludEluZm8uaCIKKyNpbmNsdWRlICJQcm92aXNpb25hbFBhZ2VQcm94eS5oIgog I2luY2x1ZGUgIlNhZmVCcm93c2luZ1dhcm5pbmcuaCIKICNpbmNsdWRlICJTaGFyZVNoZWV0Q2Fs bGJhY2tJRC5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlckRhdGFSZWZlcmVuY2UuaCIKQEAgLTc2 OCwzOCArNzY5LDI2IEBAIGJvb2wgV2ViUGFnZVByb3h5OjpzdXNwZW5kQ3VycmVudFBhZ2VJZlBv c3NpYmxlKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgT3B0CiAgICAgcmV0dXJuIHRydWU7 CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojpzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNz UHJveHk+JiYgcHJvY2Vzcywgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiBk ZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UsIElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1 c3BlbmRlZCkKK3ZvaWQgV2ViUGFnZVByb3h5Ojpzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9j ZXNzUHJveHk+JiYgcHJvY2Vzcywgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+JiYg ZHJhd2luZ0FyZWEsIFJlZlB0cjxXZWJGcmFtZVByb3h5PiYmIG1haW5GcmFtZSkKIHsKICAgICBB U1NFUlQoIW1faXNDbG9zZWQpOwogICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywg InN3YXBUb1dlYlByb2Nlc3M6IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcHJv Y2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQpOwogCiAgICAgbV9wcm9jZXNzID0g V1RGTW92ZShwcm9jZXNzKTsKKyAgICBBU1NFUlQoIW1fZHJhd2luZ0FyZWEpOworICAgIHNldERy YXdpbmdBcmVhKFdURk1vdmUoZHJhd2luZ0FyZWEpKTsKKyAgICBBU1NFUlQoIW1fbWFpbkZyYW1l KTsKKyAgICBtX21haW5GcmFtZSA9IFdURk1vdmUobWFpbkZyYW1lKTsKICAgICBtX2lzVmFsaWQg PSB0cnVlOwogCi0gICAgLy8gSWYgd2UgYXJlIHJlYXR0YWNoaW5nIHRvIGEgU3VzcGVuZGVkUGFn ZSwgdGhlbiB0aGUgV2ViUHJvY2VzcycgV2ViUGFnZSBhbHJlYWR5IGV4aXN0cyBhbmQKLSAgICAv LyBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZU1haW5GcmFtZSgpIHdpbGwgbm90IGJlIGNhbGxlZCB0 byBpbml0aWFsaXplIG1fbWFpbkZyYW1lLiBJbiBzdWNoCi0gICAgLy8gY2FzZSwgd2UgbmVlZCB0 byBpbml0aWFsaXplIG1fbWFpbkZyYW1lIHRvIHJlZmxlY3QgdGhlIGZhY3QgdGhlIHRoZSBXZWJQ cm9jZXNzJyBXZWJQYWdlCi0gICAgLy8gYWxyZWFkeSBleGlzdHMgYW5kIGFscmVhZHkgaGFzIGEg bWFpbiBmcmFtZS4KLSAgICBpZiAoZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlKSB7Ci0gICAgICAg IGlmICghZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5mYWlsZWRUb1N1c3BlbmQoKSkgewotICAg ICAgICAgICAgQVNTRVJUKCFtX21haW5GcmFtZSk7Ci0gICAgICAgICAgICBBU1NFUlQoJmRlc3Rp bmF0aW9uU3VzcGVuZGVkUGFnZS0+cHJvY2VzcygpID09IG1fcHJvY2Vzcy5wdHIoKSk7Ci0gICAg ICAgICAgICBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPnVuc3VzcGVuZCgpOwotICAgICAgICAg ICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5OjpjcmVhdGUoKnRoaXMsIGRlc3RpbmF0aW9u U3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSk7Ci0gICAgICAgICAgICBtX3Byb2Nlc3MtPmZy YW1lQ3JlYXRlZChkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPm1haW5GcmFtZUlEKCksICptX21h aW5GcmFtZSk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAvLyBXZSBmYWlsZWQgdG8g c3VzcGVuZCB0aGUgcGFnZSBzbyBkZXN0cm95IGl0IG5vdyBhbmQgbWVyZWx5IHJldXNlIGl0cyBX ZWJDb250ZW50IHByb2Nlc3MuCi0gICAgICAgICAgICBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2Ug PSBudWxscHRyOwotICAgICAgICB9Ci0gICAgfQotCiAgICAgbV9wcm9jZXNzLT5hZGRFeGlzdGlu Z1dlYlBhZ2UoKnRoaXMsIG1fcGFnZUlELCBXZWJQcm9jZXNzUHJveHk6OkJlZ2luc1VzaW5nRGF0 YVN0b3JlOjpObyk7CiAgICAgbV9wcm9jZXNzLT5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2VJRCwgKnRoaXMpOwog Ci0gICAgZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKGlzU3dhcEZyb21TdXNwZW5kZWQpOwor ICAgIC8vIE5vIG5lZWQgdG8gaW5pdGlhbGl6ZSB0aGUgV2ViUGFnZSBzaW5jZSBpdCB3YXMgY3Jl YXRlZCB3aGVuIHdlIGNyZWF0ZWQgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5LgorICAgIGZpbmlz aEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhTaG91bGRJbml0aWFsaXplV2ViUGFnZTo6Tm8pOwogfQog Ci12b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKElzU3dhcEZy b21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1c3BlbmRlZCkKK3ZvaWQgV2ViUGFnZVByb3h5OjpmaW5p c2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoU2hvdWxkSW5pdGlhbGl6ZVdlYlBhZ2Ugc2hvdWxkSW5p dGlhbGl6ZVBhZ2UpCiB7CiAgICAgQVNTRVJUKG1fcHJvY2Vzcy0+c3RhdGUoKSAhPSBDaGlsZFBy b2Nlc3NQcm94eTo6U3RhdGU6OlRlcm1pbmF0ZWQpOwogCkBAIC04MzUsNyArODI0LDggQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhJc1N3YXBGcm9tU3Vz cGVuZGVkIGlzU3dhcEZyb21TdXMKICAgICBtX2VkaXRhYmxlSW1hZ2VDb250cm9sbGVyID0gc3Rk OjptYWtlX3VuaXF1ZTxFZGl0YWJsZUltYWdlQ29udHJvbGxlcj4oKnRoaXMpOwogI2VuZGlmCiAK LSAgICBpbml0aWFsaXplV2ViUGFnZShpc1N3YXBGcm9tU3VzcGVuZGVkKTsKKyAgICBpZiAoc2hv dWxkSW5pdGlhbGl6ZVBhZ2UgPT0gU2hvdWxkSW5pdGlhbGl6ZVdlYlBhZ2U6OlllcykKKyAgICAg ICAgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsKIAogICAgIG1faW5zcGVjdG9yLT51cGRhdGVGb3JOZXdQ YWdlUHJvY2Vzcyh0aGlzKTsKIApAQCAtOTAwLDEyICs4OTAsMTEgQEAgUmVmUHRyPEFQSTo6TmF2 aWdhdGlvbj4gV2ViUGFnZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2Vzc1dpdGhJdGVtKFdlYkJh Y2tGb3J3YXIKICAgICByZXR1cm4gV1RGTW92ZShuYXZpZ2F0aW9uKTsKIH0KIAotdm9pZCBXZWJQ YWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJv bVN1c3BlbmRlZCkKK3ZvaWQgV2ViUGFnZVByb3h5OjpzZXREcmF3aW5nQXJlYShzdGQ6OnVuaXF1 ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4mJiBkcmF3aW5nQXJlYSkKIHsKLSAgICBBU1NFUlQoaXNW YWxpZCgpKTsKLQotICAgIG1fZHJhd2luZ0FyZWEgPSBwYWdlQ2xpZW50KCkuY3JlYXRlRHJhd2lu Z0FyZWFQcm94eSgpOwotICAgIEFTU0VSVChtX2RyYXdpbmdBcmVhKTsKKyAgICBtX2RyYXdpbmdB cmVhID0gV1RGTW92ZShkcmF3aW5nQXJlYSk7CisgICAgaWYgKCFtX2RyYXdpbmdBcmVhKQorICAg ICAgICByZXR1cm47CiAKICNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKSAmJiBQTEFURk9STShD T0NPQSkKICAgICBpZiAobV9kcmF3aW5nQXJlYS0+dHlwZSgpID09IERyYXdpbmdBcmVhVHlwZVJl bW90ZUxheWVyVHJlZSkgewpAQCAtOTE2LDE1ICs5MDUsMTYgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OmluaXRpYWxpemVXZWJQYWdlKElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1c3BlbmRl ZCkKICNlbmRpZgogICAgIH0KICNlbmRpZgorfQogCi0gICAgYXV0byBwYXJhbWV0ZXJzID0gY3Jl YXRpb25QYXJhbWV0ZXJzKCk7Ci0gICAgcGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkID0g aXNTd2FwRnJvbVN1c3BlbmRlZCA9PSBJc1N3YXBGcm9tU3VzcGVuZGVkOjpZZXM7Cit2b2lkIFdl YlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoKQoreworICAgIEFTU0VSVChpc1ZhbGlkKCkp OwogCi0jaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQotICAgIHBhcmFtZXRlcnMuaGFzUmVnaXN0 ZXJlZFNlcnZpY2VXb3JrZXJzID0gcHJvY2VzcygpLnByb2Nlc3NQb29sKCkubWF5SGF2ZVJlZ2lz dGVyZWRTZXJ2aWNlV29ya2VycyhtX3dlYnNpdGVEYXRhU3RvcmUpOwotI2VuZGlmCisgICAgc2V0 RHJhd2luZ0FyZWEocGFnZUNsaWVudCgpLmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKSk7CisgICAg QVNTRVJUKG1fZHJhd2luZ0FyZWEpOwogCi0gICAgcHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6Oldl YlByb2Nlc3M6OkNyZWF0ZVdlYlBhZ2UobV9wYWdlSUQsIHBhcmFtZXRlcnMpLCAwKTsKKyAgICBw cm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6Q3JlYXRlV2ViUGFnZShtX3BhZ2VJ RCwgY3JlYXRpb25QYXJhbWV0ZXJzKCkpLCAwKTsKIAogICAgIG1fbmVlZHNUb0ZpbmlzaEluaXRp YWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2ggPSB0cnVlOwogICAgIGZpbmlzaEluaXRp YWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2goKTsKQEAgLTEwNzYsNyArMTA2Niw4IEBA IHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdh dGlvbiYgbmF2aWdhdGlvbiwgUmVzb3VyCiAgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFnZUxv YWRTdGF0ZS50cmFuc2FjdGlvbigpOwogCiAgICAgYXV0byB1cmwgPSByZXF1ZXN0LnVybCgpOwot ICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFuc2FjdGlvbiwg dXJsKTsKKyAgICBpZiAoc2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkICE9IFNob3VsZFRyZWF0 QXNDb250aW51aW5nTG9hZDo6WWVzKQorICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0UGVuZGlu Z0FQSVJlcXVlc3RVUkwodHJhbnNhY3Rpb24sIHVybCk7CiAKICAgICBpZiAoIWlzVmFsaWQoKSkK ICAgICAgICAgcmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsKQEAgLTEyOTQsNiArMTI4NSw3IEBAIHZv aWQgV2ViUGFnZVByb3h5OjpzdG9wTG9hZGluZygpCiAgICAgfQogCiAgICAgbV9wcm9jZXNzLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTdG9wTG9hZGluZygpLCBtX3BhZ2VJRCk7CisgICAgbV9w cm92aXNpb25hbFBhZ2UgPSBudWxscHRyOwogICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NU aW1lcigpLnN0YXJ0KCk7CiB9CiAKQEAgLTI2OTcsNyArMjY4OSw3IEBAIHZvaWQgV2ViUGFnZVBy b3h5OjpyZWNlaXZlZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbihXZWJQb2xpY3lBY3Rpb24gcG9s aWN5QWN0aW9uCiAgICAgICAgIH0KIAogICAgICAgICBpZiAocHJvY2Vzc0Zvck5hdmlnYXRpb24u cHRyKCkgIT0gJnByb2Nlc3MoKSkgewotICAgICAgICAgICAgcG9saWN5QWN0aW9uID0gaXNQYWdl T3BlbmVkQnlET01TaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSA/IFdlYlBvbGljeUFjdGlv bjo6SWdub3JlIDogV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kOworICAgICAgICAgICAgcG9saWN5 QWN0aW9uID0gV2ViUG9saWN5QWN0aW9uOjpJZ25vcmU7CiAgICAgICAgICAgICBSRUxFQVNFX0xP R19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb24sIHN3YXBwaW5nIHByb2Nlc3MgJWkgd2l0aCBwcm9jZXNzICVpIGZvciBuYXZpZ2F0aW9u LCByZWFzb246ICV7cHVibGljfXMiLCBwcm9jZXNzSWRlbnRpZmllcigpLCBwcm9jZXNzRm9yTmF2 aWdhdGlvbi0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgcmVhc29uLnV0ZjgoKS5kYXRhKCkpOwogICAg ICAgICAgICAgTE9HKFByb2Nlc3NTd2FwcGluZywgIihQcm9jZXNzU3dhcHBpbmcpIFN3aXRjaGlu ZyBmcm9tIHByb2Nlc3MgJWkgdG8gbmV3IHByb2Nlc3MgKCVpKSBmb3IgbmF2aWdhdGlvbiAlIiBQ Ukl1NjQgIiAnJXMnIiwgcHJvY2Vzc0lkZW50aWZpZXIoKSwgcHJvY2Vzc0Zvck5hdmlnYXRpb24t PnByb2Nlc3NJZGVudGlmaWVyKCksIG5hdmlnYXRpb24tPm5hdmlnYXRpb25JRCgpLCBuYXZpZ2F0 aW9uLT5sb2dnaW5nU3RyaW5nKCkpOwogICAgICAgICB9IGVsc2UKQEAgLTI3MDYsOCArMjY5OCwx NCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVjZWl2ZWROYXZpZ2F0aW9uUG9saWN5RGVjaXNpb24o V2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbgogICAgICAgICBib29sIHNob3VsZFByb2Nlc3NT d2FwID0gcHJvY2Vzc0Zvck5hdmlnYXRpb24ucHRyKCkgIT0gJnByb2Nlc3MoKTsKICAgICAgICAg cmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24sIG5hdmlnYXRpb24ucHRyKCksIHNo b3VsZFByb2Nlc3NTd2FwID8gV1RGOjpudWxsb3B0IDogV1RGTW92ZShkYXRhKSwgV1RGTW92ZShz ZW5kZXIpKTsKIAotICAgICAgICBpZiAoc2hvdWxkUHJvY2Vzc1N3YXApCi0gICAgICAgICAgICBj b250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MobmF2aWdhdGlvbiwgZGVzdGluYXRpb25TdXNw ZW5kZWRQYWdlID8gcHJvY2VzcygpLnByb2Nlc3NQb29sKCkudGFrZVN1c3BlbmRlZFBhZ2UoKmRl c3RpbmF0aW9uU3VzcGVuZGVkUGFnZSkgOiBudWxscHRyLCBXVEZNb3ZlKHByb2Nlc3NGb3JOYXZp Z2F0aW9uKSwgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgV1RGTW92ZShkYXRhKSk7Cisg ICAgICAgIGlmICghc2hvdWxkUHJvY2Vzc1N3YXApCisgICAgICAgICAgICByZXR1cm47CisKKyAg ICAgICAgYXV0byBzdXNwZW5kZWRQYWdlID0gZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlID8gcHJv Y2VzcygpLnByb2Nlc3NQb29sKCkudGFrZVN1c3BlbmRlZFBhZ2UoKmRlc3RpbmF0aW9uU3VzcGVu ZGVkUGFnZSkgOiBudWxscHRyOworICAgICAgICBpZiAoc3VzcGVuZGVkUGFnZSAmJiBzdXNwZW5k ZWRQYWdlLT5mYWlsZWRUb1N1c3BlbmQoKSkKKyAgICAgICAgICAgIHN1c3BlbmRlZFBhZ2UgPSBu dWxscHRyOworCisgICAgICAgIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhuYXZpZ2F0 aW9uLCBXVEZNb3ZlKHN1c3BlbmRlZFBhZ2UpLCBXVEZNb3ZlKHByb2Nlc3NGb3JOYXZpZ2F0aW9u KSwgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgV1RGTW92ZShkYXRhKSk7CiAgICAgfSk7 CiB9CiAKQEAgLTI3NDMsMjQgKzI3NDEsNDUgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVk UG9saWN5RGVjaXNpb24oV2ViUG9saWN5QWN0aW9uIGFjdGlvbiwgQVBJOjpOYXZpZ2F0aW8KICAg ICBzZW5kZXItPnNlbmQoYWN0aW9uLCBuYXZpZ2F0aW9uID8gbmF2aWdhdGlvbi0+bmF2aWdhdGlv bklEKCkgOiAwLCBkb3dubG9hZElELCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOwogfQogCi12 b2lkIFdlYlBhZ2VQcm94eTo6Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKEFQSTo6TmF2 aWdhdGlvbiYgbmF2aWdhdGlvbiwgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4m JiBzdXNwZW5kZWRQYWdlUHJveHksIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzcywgUHJv Y2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBP cHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3ZvaWQgV2Vi UGFnZVByb3h5Ojpjb21taXRQcm92aXNpb25hbFBhZ2UodWludDY0X3QgZnJhbWVJRCwgdWludDY0 X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3Vz dG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3Jl OjpDZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5mbywgYm9vbCBjb250YWluc1BsdWdpbkRv Y3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0lu c2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQogewotICAgIFJFTEVBU0Vf TE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2Vzczog d2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRp ZmllcigpLCBtX3BhZ2VJRCk7Ci0gICAgTE9HKExvYWRpbmcsICJDb250aW51aW5nIG5hdmlnYXRp b24gJSIgUFJJdTY0ICIgJyVzJyBpbiBhIG5ldyB3ZWIgcHJvY2VzcyIsIG5hdmlnYXRpb24ubmF2 aWdhdGlvbklEKCksIG5hdmlnYXRpb24ubG9nZ2luZ1N0cmluZygpKTsKKyAgICBBU1NFUlQobV9w cm92aXNpb25hbFBhZ2UpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImNv bW1pdFByb3Zpc2lvbmFsUGFnZTogcHJldmlvdXNQSUQgPSAlaSwgbmV3UElEID0gJWksIHBhZ2VJ RCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3Byb3Zpc2lv bmFsUGFnZS0+cHJvY2VzcygpLnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKIAotICAg IFJlZjxXZWJQcm9jZXNzUHJveHk+IHByZXZpb3VzUHJvY2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVm KCk7CiAgICAgT3B0aW9uYWw8dWludDY0X3Q+IG1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3Mg PSBtX21haW5GcmFtZSA/IG1ha2VPcHRpb25hbChtX21haW5GcmFtZS0+ZnJhbWVJRCgpKSA6IFdU Rjo6bnVsbG9wdDsKLSAgICBhdXRvIG1haW5GcmFtZVVSTCA9IG1fbWFpbkZyYW1lID8gbV9tYWlu RnJhbWUtPnVybCgpIDogVVJMKCk7CiAKLSAgICBBU1NFUlQobV9wcm9jZXNzLnB0cigpICE9IHBy b2Nlc3MucHRyKCkpOworICAgIEFTU0VSVChtX3Byb2Nlc3MucHRyKCkgIT0gJm1fcHJvdmlzaW9u YWxQYWdlLT5wcm9jZXNzKCkpOwogCiAgICAgcHJvY2Vzc0RpZFRlcm1pbmF0ZShQcm9jZXNzVGVy bWluYXRpb25SZWFzb246Ok5hdmlnYXRpb25Td2FwKTsKIAogICAgIG1fcHJvY2Vzcy0+cmVtb3Zl TWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5h bWUoKSwgbV9wYWdlSUQpOwotICAgIGJvb2wgZGlkU3VzcGVuZFByZXZpb3VzUGFnZSA9IHN1c3Bl bmRDdXJyZW50UGFnZUlmUG9zc2libGUobmF2aWdhdGlvbiwgbWFpbkZyYW1lSURJblByZXZpb3Vz UHJvY2VzcywgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCk7CisgICAgYXV0byogbmF2aWdh dGlvbiA9IG5hdmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRpb24obV9wcm92aXNpb25hbFBhZ2UtPm5h dmlnYXRpb25JRCgpKTsKKyAgICBib29sIGRpZFN1c3BlbmRQcmV2aW91c1BhZ2UgPSBuYXZpZ2F0 aW9uID8gc3VzcGVuZEN1cnJlbnRQYWdlSWZQb3NzaWJsZSgqbmF2aWdhdGlvbiwgbWFpbkZyYW1l SURJblByZXZpb3VzUHJvY2VzcywgbV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3NTd2FwUmVxdWVz dGVkQnlDbGllbnQoKSkgOiBmYWxzZTsKICAgICBtX3Byb2Nlc3MtPnJlbW92ZVdlYlBhZ2UoKnRo aXMsIG1fcGFnZUlELCBXZWJQcm9jZXNzUHJveHk6OkVuZHNVc2luZ0RhdGFTdG9yZTo6Tm8pOwog Ci0gICAgc3dhcFRvV2ViUHJvY2VzcyhXVEZNb3ZlKHByb2Nlc3MpLCBXVEZNb3ZlKHN1c3BlbmRl ZFBhZ2VQcm94eSksIGRpZFN1c3BlbmRQcmV2aW91c1BhZ2UgPyBJc1N3YXBGcm9tU3VzcGVuZGVk OjpZZXMgOiBJc1N3YXBGcm9tU3VzcGVuZGVkOjpObyk7CisgICAgLy8gVGhlcmUgaXMgbm8gd2F5 IHdlJ2xsIGJlIGFibGUgdG8gcmV0dXJuIHRvIHRoZSBwYWdlIGluIHRoZSBwcmV2aW91cyBwYWdl IHNvIGNsb3NlIGl0LgorICAgIGlmICghZGlkU3VzcGVuZFByZXZpb3VzUGFnZSkKKyAgICAgICAg bV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpDbG9zZSgpLCBwYWdlSUQoKSk7CisK KyAgICBzd2FwVG9XZWJQcm9jZXNzKG1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCksIG1fcHJv dmlzaW9uYWxQYWdlLT50YWtlRHJhd2luZ0FyZWEoKSwgbV9wcm92aXNpb25hbFBhZ2UtPm1haW5G cmFtZSgpKTsKKworICAgIGRpZENvbW1pdExvYWRGb3JGcmFtZShmcmFtZUlELCBuYXZpZ2F0aW9u SUQsIG1pbWVUeXBlLCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgZnJhbWVMb2FkVHlw ZSwgY2VydGlmaWNhdGVJbmZvLCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBmb3JjZWRIYXNJbnNl Y3VyZUNvbnRlbnQsIHVzZXJEYXRhKTsKKworICAgIG1fcHJvdmlzaW9uYWxQYWdlID0gbnVsbHB0 cjsKK30KKwordm9pZCBXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2Vz cyhBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQ YWdlUHJveHk+JiYgc3VzcGVuZGVkUGFnZVByb3h5LCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIG5l d1Byb2Nlc3MsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0 ZWRCeUNsaWVudCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNp ZXMpCit7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiY29udGludWVOYXZp Z2F0aW9uSW5OZXdQcm9jZXNzOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3By b2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKKyAgICBMT0coTG9hZGluZywg IkNvbnRpbnVpbmcgbmF2aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMnIGluIGEgbmV3IHdlYiBwcm9j ZXNzIiwgbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi5sb2dnaW5nU3RyaW5n KCkpOworCisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlKSB7CisgICAgICAgIGlmIChtX3Byb3Zp c2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkgIT0gbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSkK KyAgICAgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5jYW5jZWwoKTsKKyAgICAgICAgbV9wcm92 aXNpb25hbFBhZ2UgPSBudWxscHRyOworICAgIH0KKworICAgIG1fcHJvdmlzaW9uYWxQYWdlID0g c3RkOjptYWtlX3VuaXF1ZTxQcm92aXNpb25hbFBhZ2VQcm94eT4oKnRoaXMsIG5ld1Byb2Nlc3Mu Y29weVJlZigpLCBXVEZNb3ZlKHN1c3BlbmRlZFBhZ2VQcm94eSksIG5hdmlnYXRpb24ubmF2aWdh dGlvbklEKCksIG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3RJc1JlZGlyZWN0KCksIG5hdmlnYXRp b24uY3VycmVudFJlcXVlc3QoKSwgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCk7CiAKICAg ICBpZiAoYXV0byogaXRlbSA9IG5hdmlnYXRpb24udGFyZ2V0SXRlbSgpKSB7CiAgICAgICAgIExP RyhMb2FkaW5nLCAiV2ViUGFnZVByb3h5ICVwIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2Vz cyB0byBiYWNrIGl0ZW0gVVJMICVzIiwgdGhpcywgaXRlbS0+dXJsKCkudXRmOCgpLmRhdGEoKSk7 CkBAIC0yNzY4LDY3ICsyNzg3LDIyIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpjb250aW51ZU5hdmln YXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBzCiAgICAgICAg IGF1dG8gdHJhbnNhY3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKICAgICAg ICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCBp dGVtLT51cmwoKSk7CiAKLSAgICAgICAgYXV0byBpdGVtU3RhdGVzID0gbV9iYWNrRm9yd2FyZExp c3QtPmZpbHRlcmVkSXRlbVN0YXRlcyhbdGhpcywgdGFyZ2V0SXRlbSA9IGl0ZW1dKFdlYkJhY2tG b3J3YXJkTGlzdEl0ZW0mIGl0ZW0pIHsKLSAgICAgICAgICAgIGlmIChhdXRvKiBwYWdlID0gaXRl bS5zdXNwZW5kZWRQYWdlKCkpIHsKLSAgICAgICAgICAgICAgICBpZiAoJnBhZ2UtPnByb2Nlc3Mo KSA9PSBtX3Byb2Nlc3MucHRyKCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK LSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybiAmaXRlbSAhPSB0YXJnZXRJdGVtOwot ICAgICAgICB9KTsKLSAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpV cGRhdGVCYWNrRm9yd2FyZExpc3RGb3JSZWF0dGFjaChXVEZNb3ZlKGl0ZW1TdGF0ZXMpKSwgbV9w YWdlSUQpOwotICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkdvVG9C YWNrRm9yd2FyZEl0ZW0obmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgaXRlbS0+aXRlbUlEKCks ICpuYXZpZ2F0aW9uLmJhY2tGb3J3YXJkRnJhbWVMb2FkVHlwZSgpLCBTaG91bGRUcmVhdEFzQ29u dGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKSwgbV9wYWdlSUQpOwot ICAgICAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS5zdGFydCgpOwotCisgICAg ICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5nb1RvQmFja0ZvcndhcmRJdGVtKG5hdmlnYXRpb24sICpp dGVtLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOwogICAgICAgICByZXR1cm47CiAgICAgfQog CiAgICAgaWYgKG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50SXRlbSgpICYmIChuYXZpZ2F0aW9u LmxvY2tCYWNrRm9yd2FyZExpc3QoKSA9PSBMb2NrQmFja0ZvcndhcmRMaXN0OjpZZXMgfHwgbmF2 aWdhdGlvbi5sb2NrSGlzdG9yeSgpID09IExvY2tIaXN0b3J5OjpZZXMpKSB7CiAgICAgICAgIC8v IElmIFdlYkNvcmUgaXMgc3VwcG9zZWQgdG8gbG9jayB0aGUgaGlzdG9yeSBmb3IgdGhpcyBsb2Fk LCB0aGVuIHRoZSBuZXcgcHJvY2VzcyBuZWVkcyB0byBrbm93IGFib3V0IHRoZSBjdXJyZW50IGhp c3RvcnkgaXRlbSBzbyBpdCBjYW4gdXBkYXRlCiAgICAgICAgIC8vIGl0IGluc3RlYWQgb2YgY3Jl YXRpbmcgYSBuZXcgb25lLgotICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OlNldEN1cnJlbnRIaXN0b3J5SXRlbUZvclJlYXR0YWNoKG1fYmFja0ZvcndhcmRMaXN0LT5j dXJyZW50SXRlbSgpLT5pdGVtU3RhdGUoKSksIG1fcGFnZUlEKTsKKyAgICAgICAgbmV3UHJvY2Vz cy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0Q3VycmVudEhpc3RvcnlJdGVtRm9yUmVhdHRh Y2gobV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCktPml0ZW1TdGF0ZSgpKSwgbV9wYWdl SUQpOwogICAgIH0KIAogICAgIC8vIEZJWE1FOiBXb3JrIG91dCB0aW1pbmcgb2YgcmVzcG9uZGlu ZyB3aXRoIHRoZSBsYXN0IHBvbGljeSBkZWxlZ2F0ZSwgZXRjCiAgICAgQVNTRVJUKCFuYXZpZ2F0 aW9uLmN1cnJlbnRSZXF1ZXN0KCkuaXNFbXB0eSgpKTsKICAgICBpZiAoYXV0byYgc3Vic3RpdHV0 ZURhdGEgPSBuYXZpZ2F0aW9uLnN1YnN0aXR1dGVEYXRhKCkpCi0gICAgICAgIGxvYWREYXRhV2l0 aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgeyBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5kYXRhKCks IHN1YnN0aXR1dGVEYXRhLT5jb250ZW50LnNpemUoKSB9LCBzdWJzdGl0dXRlRGF0YS0+TUlNRVR5 cGUsIHN1YnN0aXR1dGVEYXRhLT5lbmNvZGluZywgc3Vic3RpdHV0ZURhdGEtPmJhc2VVUkwsIHN1 YnN0aXR1dGVEYXRhLT51c2VyRGF0YS5nZXQoKSwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2Fk OjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CisgICAgICAgIG1fcHJvdmlzaW9uYWxQ YWdlLT5sb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIHsgc3Vic3RpdHV0ZURhdGEt PmNvbnRlbnQuZGF0YSgpLCBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5zaXplKCkgfSwgc3Vic3Rp dHV0ZURhdGEtPk1JTUVUeXBlLCBzdWJzdGl0dXRlRGF0YS0+ZW5jb2RpbmcsIHN1YnN0aXR1dGVE YXRhLT5iYXNlVVJMLCBzdWJzdGl0dXRlRGF0YS0+dXNlckRhdGEuZ2V0KCksIFdURk1vdmUod2Vi c2l0ZVBvbGljaWVzKSk7CiAgICAgZWxzZQotICAgICAgICBsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0 aW9uKG5hdmlnYXRpb24sIFJlc291cmNlUmVxdWVzdCB7IG5hdmlnYXRpb24uY3VycmVudFJlcXVl c3QoKSB9LCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGRBbGxv d0V4dGVybmFsU2NoZW1lcywgbnVsbHB0ciwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZ ZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Ci0KLSAgICBBU1NFUlQoIW1fbWFpbkZyYW1l KTsKLSAgICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlciA9IFt0aGlzLCB3ZWFrVGhpcyA9IG1h a2VXZWFrUHRyKCp0aGlzKSwgbmF2aWdhdGlvbklEID0gbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQo KSwgcmVxdWVzdCA9ICBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCksIG1haW5GcmFtZVVSTCwg aXNTZXJ2ZXJSZWRpcmVjdCA9IG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3RJc1JlZGlyZWN0KCld KCkgbXV0YWJsZSB7Ci0gICAgICAgIGlmICghd2Vha1RoaXMpCi0gICAgICAgICAgICByZXR1cm47 Ci0KLSAgICAgICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKLSAgICAgICAgLy8gVGhpcyBuYXZpZ2F0 aW9uIHdhcyBkZXN0cm95ZWQgc28gbm8gbmVlZCB0byBub3RpZnkgb2YgcmVkaXJlY3QuCi0gICAg ICAgIGlmICghbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpKQotICAg ICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIC8vIFJlc3RvcmUgdGhlIG1haW4gZnJhbWUncyBj b21taXR0ZWQgVVJMIGFzIHNvbWUgY2xpZW50cyBtYXkgcmVseSBvbiBpdCB1bnRpbCB0aGUgbmV4 dCBsb2FkIGlzIGNvbW1pdHRlZC4KLSAgICAgICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0YXRl KCkuc2V0VVJMKG1haW5GcmFtZVVSTCk7Ci0KLSAgICAgICAgLy8gTm9ybWFsbHksIG5vdGlmaWNh dGlvbiBvZiBhIHNlcnZlciByZWRpcmVjdCBjb21lcyBmcm9tIHRoZSBXZWJDb250ZW50IHByb2Nl c3MuCi0gICAgICAgIC8vIElmIHdlIGFyZSBwcm9jZXNzIHN3YXBwaW5nIGluIHJlc3BvbnNlIHRv IGEgc2VydmVyIHJlZGlyZWN0IHRoZW4gdGhhdCBub3RpZmljYXRpb24gd2lsbCBub3QgY29tZSBm cm9tIHRoZSBuZXcgV2ViQ29udGVudCBwcm9jZXNzLgotICAgICAgICAvLyBJbiB0aGlzIGNhc2Ug d2UgaGF2ZSB0aGUgVUlQcm9jZXNzIHN5bnRoZXNpemUgdGhlIHJlZGlyZWN0IG5vdGlmaWNhdGlv biBhdCB0aGUgYXBwcm9wcmlhdGUgdGltZS4KLSAgICAgICAgaWYgKGlzU2VydmVyUmVkaXJlY3Qp IHsKLSAgICAgICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLmRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkKHJlcXVlc3QudXJsKCkpOwotICAgICAgICAgICAgZGlkUmVjZWl2ZVNlcnZl clJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUobV9tYWluRnJhbWUtPmZyYW1lSUQo KSwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKHJlcXVlc3QpLCB7IH0pOwotICAgICAgICB9Ci0gICAg fTsKLQotICAgIGlmICghbV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgpLmNvbmZpZ3VyYXRpb24oKS5w cm9jZXNzU3dhcHNPbldpbmRvd09wZW5XaXRoT3BlbmVyKCkgfHwgIWlzUGFnZU9wZW5lZEJ5RE9N U2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgfHwgIW1haW5GcmFtZUlESW5QcmV2aW91c1By b2Nlc3MpIHsKLSAgICAgICAgLy8gVGhlcmUgaXMgbm8gd2F5IHdlJ2xsIGJlIGFibGUgdG8gcmV0 dXJuIHRvIHRoZSBwYWdlIGluIHRoZSBwcmV2aW91cyBwYWdlIHNvIGNsb3NlIGl0LgotICAgICAg ICBpZiAoIWRpZFN1c3BlbmRQcmV2aW91c1BhZ2UpCi0gICAgICAgICAgICBwcmV2aW91c1Byb2Nl c3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNsb3NlKCksIG1fcGFnZUlEKTsKLSAgICAgICAg cmV0dXJuOwotICAgIH0KLQotICAgIG1fbWFpbkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyID0g W3RoaXMsIHByZXZpb3VzUHJvY2VzcyA9IFdURk1vdmUocHJldmlvdXNQcm9jZXNzKSwgbWFpbkZy YW1lSURJblByZXZpb3VzUHJvY2VzcyA9ICptYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzXShj b25zdCBHbG9iYWxXaW5kb3dJZGVudGlmaWVyJiB3aW5kb3dJZGVudGlmaWVyKSB7Ci0gICAgICAg IEFTU0VSVChtX21haW5GcmFtZSk7Ci0gICAgICAgIEdsb2JhbEZyYW1lSWRlbnRpZmllciBuYXZp Z2F0ZWRGcmFtZUlkZW50aWZpZXJJbk5ld1Byb2Nlc3MgeyBwYWdlSUQoKSwgbV9tYWluRnJhbWUt PmZyYW1lSUQoKSB9OwotICAgICAgICBwcmV2aW91c1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6Oldl YlBhZ2U6OkZyYW1lQmVjYW1lUmVtb3RlKG1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MsIG5h dmlnYXRlZEZyYW1lSWRlbnRpZmllckluTmV3UHJvY2Vzcywgd2luZG93SWRlbnRpZmllciksIHBh Z2VJRCgpKTsKLSAgICB9OworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZS0+bG9hZFJlcXVlc3RX aXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCBSZXNvdXJjZVJlcXVlc3QgeyBuYXZpZ2F0aW9uLmN1 cnJlbnRSZXF1ZXN0KCkgfSwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6 U2hvdWxkQWxsb3dFeHRlcm5hbFNjaGVtZXMsIG51bGxwdHIsIFdURk1vdmUod2Vic2l0ZVBvbGlj aWVzKSk7CiB9CiAKIGJvb2wgV2ViUGFnZVByb3h5Ojppc1BhZ2VPcGVuZWRCeURPTVNob3dpbmdJ bml0aWFsRW1wdHlEb2N1bWVudCgpIGNvbnN0CkBAIC0zNjkzLDExICszNjY3LDYgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmRpZENyZWF0ZU1haW5GcmFtZSh1aW50NjRfdCBmcmFtZUlEKQogCiAgICAg Ly8gQWRkIHRoZSBmcmFtZSB0byB0aGUgcHJvY2VzcyB3aWRlIG1hcC4KICAgICBtX3Byb2Nlc3Mt PmZyYW1lQ3JlYXRlZChmcmFtZUlELCAqbV9tYWluRnJhbWUpOwotCi0gICAgaWYgKG1fbWFpbkZy YW1lQ3JlYXRpb25IYW5kbGVyKSB7Ci0gICAgICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVy KCk7Ci0gICAgICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyID0gbnVsbHB0cjsKLSAgICB9 CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVTdWJmcmFtZSh1aW50NjRfdCBmcmFt ZUlEKQpAQCAtMzcyMiwxMCArMzY5MSw2IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVT dWJmcmFtZSh1aW50NjRfdCBmcmFtZUlEKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRl V2luZG93KHVpbnQ2NF90IGZyYW1lSUQsIEdsb2JhbFdpbmRvd0lkZW50aWZpZXImJiB3aW5kb3dJ ZGVudGlmaWVyKQogewotICAgIGlmIChtX21haW5GcmFtZSAmJiBtX21haW5GcmFtZS0+ZnJhbWVJ RCgpID09IGZyYW1lSUQpIHsKLSAgICAgICAgaWYgKGF1dG8gbWFpbkZyYW1lV2luZG93Q3JlYXRp b25IYW5kbGVyID0gV1RGTW92ZShtX21haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlcikpCi0g ICAgICAgICAgICBtYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIod2luZG93SWRlbnRpZmll cik7Ci0gICAgfQogfQogCiBkb3VibGUgV2ViUGFnZVByb3h5Ojplc3RpbWF0ZWRQcm9ncmVzcygp IGNvbnN0CkBAIC0zNzc4LDYgKzM3NDMsMTAgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZERlc3Ry b3lOYXZpZ2F0aW9uKHVpbnQ2NF90IG5hdmlnYXRpb25JRCkKIHsKICAgICBQYWdlQ2xpZW50UHJv dGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCisgICAgLy8gT24gcHJvY2Vzcy1zd2Fw LCB0aGUgcHJldmlvdXMgcHJvY2VzcyB0cmllcyB0byBkZXN0cm95IHRoZSBuYXZpZ2F0aW9uIGJ1 dCB0aGUgcHJvdmlzaW9uYWwgcHJvY2VzcyBpcyBhY3R1YWxseSB0YWtpbmcgb3ZlciB0aGUgbmF2 aWdhdGlvbi4KKyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UgJiYgbV9wcm92aXNpb25hbFBhZ2Ut Pm5hdmlnYXRpb25JRCgpID09IG5hdmlnYXRpb25JRCkKKyAgICAgICAgcmV0dXJuOworCiAgICAg Ly8gRklYTUU6IE1lc3NhZ2UgY2hlY2sgdGhlIG5hdmlnYXRpb25JRC4KICAgICBtX25hdmlnYXRp b25TdGF0ZS0+ZGlkRGVzdHJveU5hdmlnYXRpb24obmF2aWdhdGlvbklEKTsKIH0KQEAgLTM3OTUs MTQgKzM3NjQsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRG b3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYQogICAgIGlmIChmcmFtZS0+aXNN YWluRnJhbWUoKSAmJiBuYXZpZ2F0aW9uSUQpCiAgICAgICAgIG5hdmlnYXRpb24gPSBuYXZpZ2F0 aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCk7CiAKLSAgICAvLyBJZiB0aGlzIHNl ZW1pbmdseSBuZXcgbG9hZCBpcyBhY3R1YWxseSBjb250aW51aW5nIGEgc2VydmVyIHJlZGlyZWN0 IGZvciBhIHByZXZpb3VzIG5hdmlnYXRpb24gaW4gYSBuZXcgcHJvY2VzcywKLSAgICAvLyB0aGVu IHdlIGlnbm9yZSB0aGlzIG5vdGlmaWNhdGlvbi4KLSAgICBpZiAobmF2aWdhdGlvbiAmJiBuYXZp Z2F0aW9uLT5jdXJyZW50UmVxdWVzdElzUmVkaXJlY3QoKSkgewotICAgICAgICBhdXRvIG5hdmln YXRpb25Qcm9jZXNzSWRlbnRpZmllciA9IG5hdmlnYXRpb24tPmN1cnJlbnRSZXF1ZXN0UHJvY2Vz c0lkZW50aWZpZXIoKTsKLSAgICAgICAgaWYgKG5hdmlnYXRpb25Qcm9jZXNzSWRlbnRpZmllciAm JiAqbmF2aWdhdGlvblByb2Nlc3NJZGVudGlmaWVyICE9IG1fcHJvY2Vzcy0+Y29yZVByb2Nlc3NJ ZGVudGlmaWVyKCkpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgTE9HKExvYWRp bmcsICJXZWJQYWdlUHJveHkgJSIgUFJJdTY0ICIgaW4gcHJvY2VzcyBwaWQgJWkgZGlkU3RhcnRQ cm92aXNpb25hbExvYWRGb3JGcmFtZSB0byBmcmFtZUlEICUiIFBSSXU2NCAiLCBuYXZpZ2F0aW9u SUQgJSIgUFJJdTY0ICIsIHVybCAlcyIsIG1fcGFnZUlELCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVu dGlmaWVyKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgdXJsLnN0cmluZygpLnV0ZjgoKS5kYXRh KCkpOwogICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImRpZFN0YXJ0UHJvdmlz aW9uYWxMb2FkRm9yRnJhbWU6IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJh bWVJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJ RCwgZnJhbWVJRCk7CiAKQEAgLTM5MTAsNiArMzg3MSwxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNl Y3VyaQogCiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsK IAorICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZSAmJiBtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdh dGlvbklEKCkgPT0gbmF2aWdhdGlvbklEICYmICZtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2Vzcygp ICE9IG1fcHJvY2Vzcy5wdHIoKSkgeworICAgICAgICAvLyBUaGUgbG9hZCBkaWQgbm90IGZhaWws IGl0IG1lcmVseSBoYXBwZW5pbmcgaW4gYSBuZXcgcHJvdmlzaW9uYWwgcHJvY2Vzcy4KKyAgICAg ICAgcmV0dXJuOworICAgIH0KKwogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9wcm9jZXNz LT53ZWJGcmFtZShmcmFtZUlEKTsKICAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKIApAQCAtMzk0 OCw2ICszOTE0LDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2Fk Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2VjdXJpCiAgICAgfQogCiAgICAgbV9m YWlsaW5nUHJvdmlzaW9uYWxMb2FkVVJMID0geyB9OworCisgICAgLy8gSWYgdGhlIHByb3Zpc2lv bmFsIHBhZ2UncyBsb2FkIGZhaWxzIHRoZW4gd2UgZGVzdHJveSB0aGUgcHJvdmlzaW9uYWwgcGFn ZS4KKyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UgJiYgbV9wcm92aXNpb25hbFBhZ2UtPm1haW5G cmFtZSgpID09IGZyYW1lKQorICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7CiB9 CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpjbGVhckxvYWREZXBlbmRlbnRDYWxsYmFja3MoKQpAQCAt NDMzOSw4ICs0MzA5LDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmln YXRpb25BY3Rpb25Bc3luYyh1aW50NjRfdCBmcmFtZUlELCBXZWJDb3IKICAgICBhdXRvKiBmcmFt ZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7CiAgICAgTUVTU0FHRV9DSEVDSyhmcmFt ZSk7CiAKLSAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKCpmcmFtZSwgV1RGTW92 ZShmcmFtZVNlY3VyaXR5T3JpZ2luKSwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKG5hdmlnYXRpb25B Y3Rpb25EYXRhKSwgV1RGTW92ZShmcmFtZUluZm9EYXRhKSwgb3JpZ2luYXRpbmdQYWdlSUQsIG9y aWdpbmFsUmVxdWVzdCwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShyZXF1ZXN0Qm9keSksIFdU Rk1vdmUocmVkaXJlY3RSZXNwb25zZSksIHVzZXJEYXRhLCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6 Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxp c3RlbmVySURdIChhdXRvLi4uIGFyZ3MpIHsKLSAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlOjpEaWRSZWNlaXZlUG9saWN5RGVjaXNpb24oZnJhbWVJRCwgbGlzdGVuZXJJ RCwgYXJncy4uLiksIG1fcGFnZUlEKTsKKyAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uKCpmcmFtZSwgV1RGTW92ZShmcmFtZVNlY3VyaXR5T3JpZ2luKSwgbmF2aWdhdGlvbklELCBX VEZNb3ZlKG5hdmlnYXRpb25BY3Rpb25EYXRhKSwgV1RGTW92ZShmcmFtZUluZm9EYXRhKSwgb3Jp Z2luYXRpbmdQYWdlSUQsIG9yaWdpbmFsUmVxdWVzdCwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92 ZShyZXF1ZXN0Qm9keSksIFdURk1vdmUocmVkaXJlY3RSZXNwb25zZSksIHVzZXJEYXRhLCBQb2xp Y3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigq dGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIHByb2Nlc3MgPSBtX3Byb2Nlc3MuY29weVJlZigp XSAoYXV0by4uLiBhcmdzKSB7CisgICAgICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OkRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4u KSwgbV9wYWdlSUQpOwogICAgIH0pKTsKIH0KIApAQCAtNDU3NCwxMiArNDU0NCwxMiBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UodWludDY0X3QgZnJhbWVJRCwg Y29uc3QgU2VjdXJpdHlPcmlnaQogICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHJlc3BvbnNlLnVybCgp KTsKIAogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9u SUQgPyBtX25hdmlnYXRpb25TdGF0ZS0+bmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpIDogbnVsbHB0 cjsKLSAgICBhdXRvIGxpc3RlbmVyID0gbWFrZVJlZihmcmFtZS0+c2V0VXBQb2xpY3lMaXN0ZW5l clByb3h5KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxp c3RlbmVySUQsIG5hdmlnYXRpb24gPSBXVEZNb3ZlKG5hdmlnYXRpb24pXSAoV2ViUG9saWN5QWN0 aW9uIHBvbGljeUFjdGlvbiwgQVBJOjpXZWJzaXRlUG9saWNpZXMqLCBQcm9jZXNzU3dhcFJlcXVl c3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFJlZlB0cjxTYWZlQnJv d3NpbmdXYXJuaW5nPiYmIHNhZmVCcm93c2luZ1dhcm5pbmcpIG11dGFibGUgeworICAgIGF1dG8g bGlzdGVuZXIgPSBtYWtlUmVmKGZyYW1lLT5zZXRVcFBvbGljeUxpc3RlbmVyUHJveHkoW3RoaXMs IHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRCwgbmF2 aWdhdGlvbiA9IFdURk1vdmUobmF2aWdhdGlvbiksIHByb2Nlc3MgPSBtX3Byb2Nlc3MuY29weVJl ZigpXSAoV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbiwgQVBJOjpXZWJzaXRlUG9saWNpZXMq LCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGll bnQsIFJlZlB0cjxTYWZlQnJvd3NpbmdXYXJuaW5nPiYmIHNhZmVCcm93c2luZ1dhcm5pbmcpIG11 dGFibGUgewogICAgICAgICAvLyBGSVhNRTogQXNzZXJ0IHRoZSBBUEk6OldlYnNpdGVQb2xpY2ll cyogaXMgbnVsbHB0ciBoZXJlIG9uY2UgY2xpZW50cyBvZiBXS0ZyYW1lUG9saWN5TGlzdGVuZXJV c2VXaXRoUG9saWNpZXMgZ28gYXdheS4KICAgICAgICAgUkVMRUFTRV9BU1NFUlQocHJvY2Vzc1N3 YXBSZXF1ZXN0ZWRCeUNsaWVudCA9PSBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50OjpObyk7 CiAgICAgICAgIEFTU0VSVF9VTlVTRUQoc2FmZUJyb3dzaW5nV2FybmluZywgIXNhZmVCcm93c2lu Z1dhcm5pbmcpOwotICAgICAgICByZWNlaXZlZFBvbGljeURlY2lzaW9uKHBvbGljeUFjdGlvbiwg bmF2aWdhdGlvbi5nZXQoKSwgV1RGOjpudWxsb3B0LCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6Y3Jl YXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKSwgZnJhbWVJ RCwgbGlzdGVuZXJJRF0gKGF1dG8uLi4gYXJncykgewotICAgICAgICAgICAgbV9wcm9jZXNzLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRSZWNlaXZlUG9saWN5RGVjaXNpb24oZnJhbWVJRCwg bGlzdGVuZXJJRCwgYXJncy4uLiksIG1fcGFnZUlEKTsKKyAgICAgICAgcmVjZWl2ZWRQb2xpY3lE ZWNpc2lvbihwb2xpY3lBY3Rpb24sIG5hdmlnYXRpb24uZ2V0KCksIFdURjo6bnVsbG9wdCwgUG9s aWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUo cHJvdGVjdGVkVGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIHByb2Nlc3MgPSBXVEZNb3ZlKHBy b2Nlc3MpXSAoYXV0by4uLiBhcmdzKSB7CisgICAgICAgICAgICBwcm9jZXNzLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlOjpEaWRSZWNlaXZlUG9saWN5RGVjaXNpb24oZnJhbWVJRCwgbGlzdGVuZXJJ RCwgYXJncy4uLiksIG1fcGFnZUlEKTsKICAgICAgICAgfSkpOwogICAgIH0sIFNob3VsZEV4cGVj dFNhZmVCcm93c2luZ1Jlc3VsdDo6Tm8pKTsKIApAQCAtNjQ4Niw4ICs2NDU2LDYgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OnByb2Nlc3NXaWxsQmVjb21lRm9yZWdyb3VuZCgpCiB2b2lkIFdlYlBhZ2VQ cm94eTo6cmVzZXRTdGF0ZShSZXNldFN0YXRlUmVhc29uIHJlc2V0U3RhdGVSZWFzb24pCiB7CiAg ICAgbV9tYWluRnJhbWUgPSBudWxscHRyOwotICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVy ID0gbnVsbHB0cjsKLSAgICBtX21haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlciA9IG51bGxw dHI7CiAKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBtX3Njcm9sbGluZ1BlcmZvcm1hbmNlRGF0 YSA9IG51bGxwdHI7CkBAIC02Nzc4LDYgKzY3NDYsMTAgQEAgV2ViUGFnZUNyZWF0aW9uUGFyYW1l dGVycyBXZWJQYWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycygpCiAgICAgcGFyYW1ldGVycy5h cHBsaWNhdGlvbk1hbmlmZXN0ID0gbV9jb25maWd1cmF0aW9uLT5hcHBsaWNhdGlvbk1hbmlmZXN0 KCkgPyBPcHRpb25hbDxXZWJDb3JlOjpBcHBsaWNhdGlvbk1hbmlmZXN0PihtX2NvbmZpZ3VyYXRp b24tPmFwcGxpY2F0aW9uTWFuaWZlc3QoKS0+YXBwbGljYXRpb25NYW5pZmVzdCgpKSA6IFdURjo6 bnVsbG9wdDsKICNlbmRpZgogCisjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQorICAgIHBhcmFt ZXRlcnMuaGFzUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXJzID0gcHJvY2VzcygpLnByb2Nlc3NQb29s KCkubWF5SGF2ZVJlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyhtX3dlYnNpdGVEYXRhU3RvcmUpOwor I2VuZGlmCisKICAgICBwYXJhbWV0ZXJzLm5lZWRzRm9udEF0dHJpYnV0ZXMgPSBtX25lZWRzRm9u dEF0dHJpYnV0ZXM7CiAKICAgICBtX3Byb2Nlc3MtPmFkZFdlYlVzZXJDb250ZW50Q29udHJvbGxl clByb3h5KG1fdXNlckNvbnRlbnRDb250cm9sbGVyLCBwYXJhbWV0ZXJzKTsKQEAgLTg1MzksNiAr ODUxMSwyMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2ltdWxhdGVEZXZpY2VPcmllbnRhdGlvbkNo YW5nZShkb3VibGUgYWxwaGEsIGRvdWJsZSBiZXRhLCBkbwogICAgIG1fcHJvY2Vzcy0+c2VuZChN ZXNzYWdlczo6V2ViUGFnZTo6U2ltdWxhdGVEZXZpY2VPcmllbnRhdGlvbkNoYW5nZShhbHBoYSwg YmV0YSwgZ2FtbWEpLCBtX3BhZ2VJRCk7CiB9CiAKK1dlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NP dmVycmlkZTo6UGFnZVByb2Nlc3NPdmVycmlkZShXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYlByb2Nl c3NQcm94eSYgbmV3UHJvY2VzcykKKyAgICA6IG1fcGFnZSgmcGFnZSkKKyAgICAsIG1fcHJldmlv dXNQcm9jZXNzKHBhZ2UucHJvY2VzcygpKQoreworICAgIHBhZ2UubV9wcm9jZXNzID0gbmV3UHJv Y2VzczsKK30KKworV2ViUGFnZVByb3h5OjpQYWdlUHJvY2Vzc092ZXJyaWRlOjpQYWdlUHJvY2Vz c092ZXJyaWRlKFBhZ2VQcm9jZXNzT3ZlcnJpZGUmJikgPSBkZWZhdWx0OworCitXZWJQYWdlUHJv eHk6OlBhZ2VQcm9jZXNzT3ZlcnJpZGU6On5QYWdlUHJvY2Vzc092ZXJyaWRlKCkKK3sKKyAgICBp ZiAobV9wYWdlKQorICAgICAgICBtX3BhZ2UtPm1fcHJvY2VzcyA9IFdURk1vdmUobV9wcmV2aW91 c1Byb2Nlc3MpOworfQorCiAjaWYgRU5BQkxFKERBVEFfREVURUNUSU9OKQogCiB2b2lkIFdlYlBh Z2VQcm94eTo6ZGV0ZWN0RGF0YUluQWxsRnJhbWVzKFdlYkNvcmU6OkRhdGFEZXRlY3RvclR5cGVz IHR5cGVzLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IERhdGFEZXRlY3Rpb25SZXN1bHQm KT4mJiBjb21wbGV0aW9uSGFuZGxlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmgKaW5kZXggY2Q4MDFiODA4YzQ2ZTQ1MGQ4Y2RhZDQ5NzA4ZjQ3ZjhmMDEzNzAyOS4uMzlmZDI1 OWFiODM4ZGUzNmZiOTY4ZThlZGNkYmQ2OGRmYzZhNDZlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgKQEAgLTIyNSw2ICsyMjUsNyBAQCBjbGFzcyBOYXRpdmVXZWJLZXli b2FyZEV2ZW50OwogY2xhc3MgTmF0aXZlV2ViTW91c2VFdmVudDsKIGNsYXNzIE5hdGl2ZVdlYldo ZWVsRXZlbnQ7CiBjbGFzcyBQYWdlQ2xpZW50OworY2xhc3MgUHJvdmlzaW9uYWxQYWdlUHJveHk7 CiBjbGFzcyBSZW1vdGVMYXllclRyZWVIb3N0OwogY2xhc3MgUmVtb3RlTGF5ZXJUcmVlU2Nyb2xs aW5nUGVyZm9ybWFuY2VEYXRhOwogY2xhc3MgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb247CkBA IC0zNzksNiArMzgwLDcgQEAgcHVibGljOgogCiAgICAgYm9vbCBhZGRzVmlzaXRlZExpbmtzKCkg Y29uc3QgeyByZXR1cm4gbV9hZGRzVmlzaXRlZExpbmtzOyB9CiAgICAgdm9pZCBzZXRBZGRzVmlz aXRlZExpbmtzKGJvb2wgYWRkc1Zpc2l0ZWRMaW5rcykgeyBtX2FkZHNWaXNpdGVkTGlua3MgPSBh ZGRzVmlzaXRlZExpbmtzOyB9CisgICAgVmlzaXRlZExpbmtTdG9yZSYgdmlzaXRlZExpbmtTdG9y ZSgpIHsgcmV0dXJuIG1fdmlzaXRlZExpbmtTdG9yZTsgfQogCiAgICAgdm9pZCBleGl0RnVsbHNj cmVlbkltbWVkaWF0ZWx5KCk7CiAgICAgdm9pZCBmdWxsc2NyZWVuTWF5UmV0dXJuVG9JbmxpbmUo KTsKQEAgLTQ1OCw4ICs0NjAsOCBAQCBwdWJsaWM6CiAgICAgQVBJOjpJY29uTG9hZGluZ0NsaWVu dCYgaWNvbkxvYWRpbmdDbGllbnQoKSB7IHJldHVybiAqbV9pY29uTG9hZGluZ0NsaWVudDsgfQog ICAgIHZvaWQgc2V0SWNvbkxvYWRpbmdDbGllbnQoc3RkOjp1bmlxdWVfcHRyPEFQSTo6SWNvbkxv YWRpbmdDbGllbnQ+JiYpOwogCi0gICAgZW51bSBjbGFzcyBJc1N3YXBGcm9tU3VzcGVuZGVkIHsg Tm8sIFllcyB9OwotICAgIHZvaWQgaW5pdGlhbGl6ZVdlYlBhZ2UoSXNTd2FwRnJvbVN1c3BlbmRl ZCA9IElzU3dhcEZyb21TdXNwZW5kZWQ6Ok5vKTsKKyAgICB2b2lkIGluaXRpYWxpemVXZWJQYWdl KCk7CisgICAgdm9pZCBzZXREcmF3aW5nQXJlYShzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQ cm94eT4mJik7CiAKICAgICBXZWFrUHRyPFNlY0tleVByb3h5U3RvcmU+IHNlY0tleVByb3h5U3Rv cmUoY29uc3QgV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2UmKTsKICAgICAgICAgCkBA IC0xMDI1LDYgKzEwMjcsMTkgQEAgcHVibGljOgogICAgIFdlYlByb2Nlc3NQcm94eSYgcHJvY2Vz cygpIHsgcmV0dXJuIG1fcHJvY2VzczsgfQogICAgIFByb2Nlc3NJRCBwcm9jZXNzSWRlbnRpZmll cigpIGNvbnN0OwogCisgICAgY2xhc3MgUGFnZVByb2Nlc3NPdmVycmlkZSB7CisgICAgcHVibGlj OgorICAgICAgICBQYWdlUHJvY2Vzc092ZXJyaWRlKFdlYlBhZ2VQcm94eSYsIFdlYlByb2Nlc3NQ cm94eSYgbmV3UHJvY2Vzcyk7CisgICAgICAgIFBhZ2VQcm9jZXNzT3ZlcnJpZGUoUGFnZVByb2Nl c3NPdmVycmlkZSYmKTsKKyAgICAgICAgflBhZ2VQcm9jZXNzT3ZlcnJpZGUoKTsKKworICAgIHBy aXZhdGU6CisgICAgICAgIFJlZlB0cjxXZWJQYWdlUHJveHk+IG1fcGFnZTsKKyAgICAgICAgUmVm PFdlYlByb2Nlc3NQcm94eT4gbV9wcmV2aW91c1Byb2Nlc3M7CisgICAgfTsKKworICAgIFBhZ2VQ cm9jZXNzT3ZlcnJpZGUgdGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MoV2ViUHJvY2Vzc1Byb3h5 JiBuZXdQcm9jZXNzKSB7IHJldHVybiBQYWdlUHJvY2Vzc092ZXJyaWRlKCp0aGlzLCBuZXdQcm9j ZXNzKTsgfQorCiAgICAgV2ViUHJlZmVyZW5jZXMmIHByZWZlcmVuY2VzKCkgeyByZXR1cm4gbV9w cmVmZXJlbmNlczsgfQogICAgIHZvaWQgc2V0UHJlZmVyZW5jZXMoV2ViUHJlZmVyZW5jZXMmKTsK IApAQCAtMTQxNCw2ICsxNDI5LDIxIEBAIHB1YmxpYzoKICAgICBFZGl0YWJsZUltYWdlQ29udHJv bGxlciYgZWRpdGFibGVJbWFnZUNvbnRyb2xsZXIoKSB7IHJldHVybiAqbV9lZGl0YWJsZUltYWdl Q29udHJvbGxlcjsgfQogI2VuZGlmCiAKKyAgICBQcm92aXNpb25hbFBhZ2VQcm94eSogcHJvdmlz aW9uYWxQYWdlUHJveHkoKSBjb25zdCB7IHJldHVybiBtX3Byb3Zpc2lvbmFsUGFnZS5nZXQoKTsg fQorICAgIHZvaWQgY29tbWl0UHJvdmlzaW9uYWxQYWdlKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2 NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1 c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29y ZTo6Q2VydGlmaWNhdGVJbmZvJiwgYm9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25h bDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwg Y29uc3QgVXNlckRhdGEmKTsKKworICAgIHZvaWQgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JG cmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmLCBVUkwm JiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2b2lkIGRpZEZhaWxQcm92 aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1 cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25J RCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VF cnJvciYsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRSZWNlaXZlU2VydmVyUmVkaXJl Y3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBu YXZpZ2F0aW9uSUQsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBjb25zdCBVc2VyRGF0YSYp OworCisgICAgdm9pZCBsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYsIGNv bnN0IElQQzo6RGF0YVJlZmVyZW5jZSYsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0 cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJE YXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIE9wdGlvbmFsPFdlYnNp dGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOworICAgIHZvaWQgbG9hZFJlcXVlc3RX aXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Qm JiwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgQVBJOjpPYmplY3QqIHVz ZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIE9wdGlvbmFsPFdl YnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOworCisgICAgLy8gSVBDOjpNZXNz YWdlUmVjZWl2ZXIKKyAgICAvLyBJbXBsZW1lbnRlZCBpbiBnZW5lcmF0ZWQgV2ViUGFnZVByb3h5 TWVzc2FnZVJlY2VpdmVyLmNwcAorICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25u ZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgb3ZlcnJpZGU7CisgICAgdm9pZCBkaWRSZWNlaXZlU3lu Y01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJiwgc3RkOjp1bmlxdWVfcHRy PElQQzo6RW5jb2Rlcj4mKSBvdmVycmlkZTsKKwogcHJpdmF0ZToKICAgICBXZWJQYWdlUHJveHko UGFnZUNsaWVudCYsIFdlYlByb2Nlc3NQcm94eSYsIHVpbnQ2NF90IHBhZ2VJRCwgUmVmPEFQSTo6 UGFnZUNvbmZpZ3VyYXRpb24+JiYpOwogICAgIHZvaWQgcGxhdGZvcm1Jbml0aWFsaXplKCk7CkBA IC0xNDM4LDEyICsxNDY4LDYgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgc2V0VXNlckFnZW50KFN0 cmluZyYmKTsKIAotICAgIC8vIElQQzo6TWVzc2FnZVJlY2VpdmVyCi0gICAgLy8gSW1wbGVtZW50 ZWQgaW4gZ2VuZXJhdGVkIFdlYlBhZ2VQcm94eU1lc3NhZ2VSZWNlaXZlci5jcHAKLSAgICB2b2lk IGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIG92ZXJy aWRlOwotICAgIHZvaWQgZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQ Qzo6RGVjb2RlciYsIHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+Jikgb3ZlcnJpZGU7Ci0K LQogICAgIC8vIElQQzo6TWVzc2FnZVNlbmRlcgogICAgIGJvb2wgc2VuZE1lc3NhZ2Uoc3RkOjp1 bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4sIE9wdGlvblNldDxJUEM6OlNlbmRPcHRpb24+KSBvdmVy cmlkZTsKICAgICBJUEM6OkNvbm5lY3Rpb24qIG1lc3NhZ2VTZW5kZXJDb25uZWN0aW9uKCkgb3Zl cnJpZGU7CkBAIC0xNDY1LDEyICsxNDg5LDkgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZENyZWF0 ZVN1YmZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpOwogICAgIHZvaWQgZGlkQ3JlYXRlV2luZG93KHVp bnQ2NF90IGZyYW1lSUQsIFdlYkNvcmU6Okdsb2JhbFdpbmRvd0lkZW50aWZpZXImJik7CiAKLSAg ICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwg dWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiwgVVJMJiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0 IFVzZXJEYXRhJik7Ci0gICAgdm9pZCBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNp b25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQs IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQg d2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0 IFN0cmluZyYgdXJsLCBkb3VibGUgZGVsYXksIFdlYkNvcmU6OkxvY2tCYWNrRm9yd2FyZExpc3Qp OwogICAgIHZvaWQgZGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3RGb3JGcmFtZSh1aW50NjRfdCBmcmFt ZUlEKTsKICAgICB2b2lkIGRpZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWUodWludDY0X3Qg ZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJik7Ci0gICAgdm9pZCBkaWRGYWls UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6 U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0 aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNvcmU6OlJlc291 cmNlRXJyb3ImLCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkQ29tbWl0TG9hZEZvckZy YW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5n JiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3Qg ZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiwgYm9vbCBjb250 YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+ IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2b2lkIGRp ZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5h dmlnYXRpb25JRCwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2b2lkIGRpZEZpbmlzaExvYWRGb3JG cmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFVzZXJE YXRhJik7CkBAIC0xNTc0LDE4ICsxNTk1LDE2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRDYW5T aG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMoYm9vbCBjYW5TaG9ydENpcmN1aXRIb3Jp em9udGFsV2hlZWxFdmVudHMpIHsgbV9jYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVu dHMgPSBjYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHM7IH0KIAogICAgIHZvaWQg cmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsKLSAgICB2b2lkIHN3YXBUb1dlYlByb2Nlc3MoUmVmPFdl YlByb2Nlc3NQcm94eT4mJiwgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiwg SXNTd2FwRnJvbVN1c3BlbmRlZCk7CisgICAgdm9pZCBzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQ cm9jZXNzUHJveHk+JiYsIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmLCBSZWZQ dHI8V2ViRnJhbWVQcm94eT4mJiBtYWluRnJhbWUpOwogICAgIHZvaWQgZGlkRmFpbFRvU3VzcGVu ZEFmdGVyUHJvY2Vzc1N3YXAoKTsKICAgICB2b2lkIGRpZFN1c3BlbmRBZnRlclByb2Nlc3NTd2Fw KCk7CiAKLSAgICB2b2lkIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhJc1N3YXBGcm9tU3Vz cGVuZGVkID0gSXNTd2FwRnJvbVN1c3BlbmRlZDo6Tm8pOworICAgIGVudW0gY2xhc3MgU2hvdWxk SW5pdGlhbGl6ZVdlYlBhZ2UgeyBObywgWWVzIH07CisgICAgdm9pZCBmaW5pc2hBdHRhY2hpbmdU b1dlYlByb2Nlc3MoU2hvdWxkSW5pdGlhbGl6ZVdlYlBhZ2UgPSBTaG91bGRJbml0aWFsaXplV2Vi UGFnZTo6WWVzKTsKIAogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IHJlYXR0YWNoVG9XZWJQ cm9jZXNzRm9yUmVsb2FkKCk7CiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVhdHRhY2hU b1dlYlByb2Nlc3NXaXRoSXRlbShXZWJCYWNrRm9yd2FyZExpc3RJdGVtJik7CiAKLSAgICB2b2lk IGxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgY29uc3QgSVBDOjpEYXRh UmVmZXJlbmNlJiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGlu ZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFdlYkNvcmU6 OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0 YT4mJiA9IFdURjo6bnVsbG9wdCk7Ci0gICAgdm9pZCBsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9u KEFQSTo6TmF2aWdhdGlvbiYsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBXZWJDb3JlOjpT aG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFdlYkNv cmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVz RGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7Ci0KICAgICB2b2lkIHJlcXVlc3ROb3RpZmljYXRpb25Q ZXJtaXNzaW9uKHVpbnQ2NF90IG5vdGlmaWNhdGlvbklELCBjb25zdCBTdHJpbmcmIG9yaWdpblN0 cmluZyk7CiAgICAgdm9pZCBzaG93Tm90aWZpY2F0aW9uKGNvbnN0IFN0cmluZyYgdGl0bGUsIGNv bnN0IFN0cmluZyYgYm9keSwgY29uc3QgU3RyaW5nJiBpY29uVVJMLCBjb25zdCBTdHJpbmcmIHRh ZywgY29uc3QgU3RyaW5nJiBsYW5nLCBXZWJDb3JlOjpOb3RpZmljYXRpb25EaXJlY3Rpb24sIGNv bnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nLCB1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CiAgICAg dm9pZCBjYW5jZWxOb3RpZmljYXRpb24odWludDY0X3Qgbm90aWZpY2F0aW9uSUQpOwpAQCAtMTk1 MSw4ICsxOTcwLDYgQEAgcHJpdmF0ZToKICAgICBSZWY8V2Vic2l0ZURhdGFTdG9yZT4gbV93ZWJz aXRlRGF0YVN0b3JlOwogCiAgICAgUmVmUHRyPFdlYkZyYW1lUHJveHk+IG1fbWFpbkZyYW1lOwot ICAgIEZ1bmN0aW9uPHZvaWQoKT4gbV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXI7Ci0gICAgRnVu Y3Rpb248dm9pZChjb25zdCBXZWJDb3JlOjpHbG9iYWxXaW5kb3dJZGVudGlmaWVyJik+IG1fbWFp bkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyOwogCiAgICAgUmVmUHRyPFdlYkZyYW1lUHJveHk+ IG1fZm9jdXNlZEZyYW1lOwogICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5PiBtX2ZyYW1lU2V0TGFy Z2VzdEZyYW1lOwpAQCAtMjMyMiw2ICsyMzM5LDggQEAgcHJpdmF0ZToKICAgICBib29sIG1fbmVl ZHNGb250QXR0cmlidXRlcyB7IGZhbHNlIH07CiAgICAgYm9vbCBtX21heUhhdmVVbml2ZXJzYWxG aWxlUmVhZFNhbmRib3hFeHRlbnNpb24geyBmYWxzZSB9OwogCisgICAgc3RkOjp1bmlxdWVfcHRy PFByb3Zpc2lvbmFsUGFnZVByb3h5PiBtX3Byb3Zpc2lvbmFsUGFnZTsKKwogI2lmIEhBVkUoUEVO Q0lMS0lUKQogICAgIHN0ZDo6dW5pcXVlX3B0cjxFZGl0YWJsZUltYWdlQ29udHJvbGxlcj4gbV9l ZGl0YWJsZUltYWdlQ29udHJvbGxlcjsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlByb2Nlc3NQcm94eS5jcHAKaW5kZXggZGIxZmQ1OGI5M2RmZjU4NjVkMTNmYzU0MWI2ZTVk ODc0NmViOGUwYS4uZGFiZWRiYzBhNzQ0MTI2YmRlNjhkNTk0NmQ3NTMxZmVmNzVjNzU1OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCkBAIC0zNCw2ICsz NCw3IEBACiAjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIlBsdWdpbkluZm9TdG9yZS5o IgogI2luY2x1ZGUgIlBsdWdpblByb2Nlc3NNYW5hZ2VyLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9u YWxQYWdlUHJveHkuaCIKICNpbmNsdWRlICJUZXh0Q2hlY2tlci5oIgogI2luY2x1ZGUgIlRleHRD aGVja2VyU3RhdGUuaCIKICNpbmNsdWRlICJVSU1lc3NhZ2VQb3J0Q2hhbm5lbFByb3ZpZGVyLmgi CkBAIC01ODQsNiArNTg1LDE1IEBAIGJvb2wgV2ViUHJvY2Vzc1Byb3h5OjpmdWxsS2V5Ym9hcmRB Y2Nlc3NFbmFibGVkKCkKIH0KICNlbmRpZgogCitib29sIFdlYlByb2Nlc3NQcm94eTo6aGFzUHJv dmlzaW9uYWxQYWdlV2l0aElEKHVpbnQ2NF90IHBhZ2VJRCkgY29uc3QKK3sKKyAgICBmb3IgKGF1 dG8qIHByb3Zpc2lvbmFsUGFnZSA6IG1fcHJvdmlzaW9uYWxQYWdlcykgeworICAgICAgICBpZiAo cHJvdmlzaW9uYWxQYWdlLT5wYWdlKCkucGFnZUlEKCkgPT0gcGFnZUlEKQorICAgICAgICAgICAg cmV0dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKK30KKwogdm9pZCBXZWJQcm9j ZXNzUHJveHk6OnVwZGF0ZUJhY2tGb3J3YXJkSXRlbShjb25zdCBCYWNrRm9yd2FyZExpc3RJdGVt U3RhdGUmIGl0ZW1TdGF0ZSkKIHsKICAgICBpZiAoYXV0byogaXRlbSA9IFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW06Oml0ZW1Gb3JJRChpdGVtU3RhdGUuaWRlbnRpZmllcikpIHsKQEAgLTU5MSw3ICs2 MDEsNyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6dXBkYXRlQmFja0ZvcndhcmRJdGVtKGNvbnN0 IEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSYgaXRlbQogICAgICAgICAvLyB0aGUgYmFjay9mb3J3 YXJkIGl0ZW1zIHBhZ2UuCiAgICAgICAgIC8vIGUuZy4gVGhlIG9sZCB3ZWIgcHJvY2VzcyBpcyBu YXZpZ2F0aW5nIHRvIGFib3V0OmJsYW5rIGZvciBzdXNwZW5zaW9uLgogICAgICAgICAvLyBXZSBp Z25vcmUgdGhlc2UgdXBkYXRlcy4KLSAgICAgICAgaWYgKG1fcGFnZU1hcC5jb250YWlucyhpdGVt LT5wYWdlSUQoKSkpCisgICAgICAgIGlmIChtX3BhZ2VNYXAuY29udGFpbnMoaXRlbS0+cGFnZUlE KCkpIHx8IGhhc1Byb3Zpc2lvbmFsUGFnZVdpdGhJRChpdGVtLT5wYWdlSUQoKSkpCiAgICAgICAg ICAgICBpdGVtLT5zZXRQYWdlU3RhdGUoaXRlbVN0YXRlLnBhZ2VTdGF0ZSk7CiAgICAgfQogfQpA QCAtNzgwLDYgKzc5MCwxMiBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6ZGlkRmluaXNoTGF1bmNo aW5nKFByb2Nlc3NMYXVuY2hlciogbGF1bmNoZXIsIElQQzo6Q29ubmVjdAogICAgICAgICBwYWdl LT5wcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5nKCk7CiAgICAgfQogCisgICAgZm9yIChhdXRvKiBw cm92aXNpb25hbFBhZ2UgOiBtX3Byb3Zpc2lvbmFsUGFnZXMpIHsKKyAgICAgICAgQVNTRVJUKHRo aXMgPT0gJnByb3Zpc2lvbmFsUGFnZS0+cHJvY2VzcygpKTsKKyAgICAgICAgcHJvdmlzaW9uYWxQ YWdlLT5wcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5nKCk7CisgICAgfQorCisKICAgICBSRUxFQVNF X0FTU0VSVCghbV93ZWJDb25uZWN0aW9uKTsKICAgICBtX3dlYkNvbm5lY3Rpb24gPSBXZWJDb25u ZWN0aW9uVG9XZWJQcm9jZXNzOjpjcmVhdGUodGhpcyk7CiAKQEAgLTg3Myw3ICs4ODksNyBAQCB2 b2lkIFdlYlByb2Nlc3NQcm94eTo6bWF5YmVTaHV0RG93bigpCiAKIGJvb2wgV2ViUHJvY2Vzc1By b3h5OjpjYW5UZXJtaW5hdGVDaGlsZFByb2Nlc3MoKQogewotICAgIGlmICghbV9wYWdlTWFwLmlz RW1wdHkoKSB8fCBtX3Byb2Nlc3NQb29sLT5oYXNTdXNwZW5kZWRQYWdlRm9yKCp0aGlzKSkKKyAg ICBpZiAoIW1fcGFnZU1hcC5pc0VtcHR5KCkgfHwgbV9wcm9jZXNzUG9vbC0+aGFzU3VzcGVuZGVk UGFnZUZvcigqdGhpcykgfHwgIW1fcHJvdmlzaW9uYWxQYWdlcy5pc0VtcHR5KCkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAogICAgIGlmICghbV9wcm9jZXNzUG9vbC0+c2hvdWxkVGVybWluYXRl KHRoaXMpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1By b3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaAppbmRleCA3 NWY2NWE3ZjdlYjFhY2M4MTk5OTFjZTRmOWY2OTg2Yzk1YjYxZmYzLi41MDQyNjMwZGUzNzFkODVh ODI4Mzc0MzQ4YWE5NjkxNzM5YzljZDcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUHJveHkuaApAQCAtNzAsNiArNzAsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNz IE5ldHdvcmtQcm9jZXNzUHJveHk7CiBjbGFzcyBPYmpDT2JqZWN0R3JhcGg7CiBjbGFzcyBQYWdl Q2xpZW50OworY2xhc3MgUHJvdmlzaW9uYWxQYWdlUHJveHk7CiBjbGFzcyBVc2VyTWVkaWFDYXB0 dXJlTWFuYWdlclByb3h5OwogY2xhc3MgVmlzaXRlZExpbmtTdG9yZTsKIGNsYXNzIFdlYkJhY2tG b3J3YXJkTGlzdEl0ZW07CkBAIC0xMjQsNiArMTI1LDkgQEAgcHVibGljOgogICAgIGVudW0gY2xh c3MgRW5kc1VzaW5nRGF0YVN0b3JlIDogYm9vbCB7IE5vLCBZZXMgfTsKICAgICB2b2lkIHJlbW92 ZVdlYlBhZ2UoV2ViUGFnZVByb3h5JiwgdWludDY0X3QgcGFnZUlELCBFbmRzVXNpbmdEYXRhU3Rv cmUpOwogCisgICAgdm9pZCBhZGRQcm92aXNpb25hbFBhZ2VQcm94eShQcm92aXNpb25hbFBhZ2VQ cm94eSYgcHJvdmlzaW9uYWxQYWdlKSB7IEFTU0VSVCghbV9wcm92aXNpb25hbFBhZ2VzLmNvbnRh aW5zKCZwcm92aXNpb25hbFBhZ2UpKTsgbV9wcm92aXNpb25hbFBhZ2VzLmFkZCgmcHJvdmlzaW9u YWxQYWdlKTsgfQorICAgIHZvaWQgcmVtb3ZlUHJvdmlzaW9uYWxQYWdlUHJveHkoUHJvdmlzaW9u YWxQYWdlUHJveHkmIHByb3Zpc2lvbmFsUGFnZSkgeyBBU1NFUlQobV9wcm92aXNpb25hbFBhZ2Vz LmNvbnRhaW5zKCZwcm92aXNpb25hbFBhZ2UpKTsgbV9wcm92aXNpb25hbFBhZ2VzLnJlbW92ZSgm cHJvdmlzaW9uYWxQYWdlKTsgfQorCiAgICAgdHlwZW5hbWUgV2ViUGFnZVByb3h5TWFwOjpWYWx1 ZXNDb25zdEl0ZXJhdG9yUmFuZ2UgcGFnZXMoKSBjb25zdCB7IHJldHVybiBtX3BhZ2VNYXAudmFs dWVzKCk7IH0KICAgICB1bnNpZ25lZCBwYWdlQ291bnQoKSBjb25zdCB7IHJldHVybiBtX3BhZ2VN YXAuc2l6ZSgpOyB9CiAgICAgdW5zaWduZWQgdmlzaWJsZVBhZ2VDb3VudCgpIGNvbnN0IHsgcmV0 dXJuIG1fdmlzaWJsZVBhZ2VDb3VudGVyLnZhbHVlKCk7IH0KQEAgLTMzMCw2ICszMzQsOCBAQCBw cml2YXRlOgogCiAgICAgdm9pZCBsb2dEaWFnbm9zdGljTWVzc2FnZUZvclJlc291cmNlTGltaXRU ZXJtaW5hdGlvbihjb25zdCBTdHJpbmcmIGxpbWl0S2V5KTsKIAorICAgIGJvb2wgaGFzUHJvdmlz aW9uYWxQYWdlV2l0aElEKHVpbnQ2NF90IHBhZ2VJRCkgY29uc3Q7CisKICAgICBlbnVtIGNsYXNz IElzV2VhayB7IE5vLCBZZXMgfTsKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBjbGFzcyBXZWFr T3JTdHJvbmdQdHIgewogICAgIHB1YmxpYzoKQEAgLTM3Myw2ICszNzksNyBAQCBwcml2YXRlOgog CiAgICAgV2ViUGFnZVByb3h5TWFwIG1fcGFnZU1hcDsKICAgICBXZWJGcmFtZVByb3h5TWFwIG1f ZnJhbWVNYXA7CisgICAgSGFzaFNldDxQcm92aXNpb25hbFBhZ2VQcm94eSo+IG1fcHJvdmlzaW9u YWxQYWdlczsKICAgICBVc2VySW5pdGlhdGVkQWN0aW9uTWFwIG1fdXNlckluaXRpYXRlZEFjdGlv bk1hcDsKIAogICAgIEhhc2hTZXQ8VmlzaXRlZExpbmtTdG9yZSo+IG1fdmlzaXRlZExpbmtTdG9y ZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5w Ynhwcm9qIGIvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpp bmRleCA1MDdlZGI3M2U3NGMzYTU3ZjRlZjQ3MmY1YjU0NmNiMmRiMDY3YWE5Li43MDc5YjI2OTg4 NWRmNjdhMGU4MTkwOTE2ZjBiYTA1ODZiYTMxMjBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJLaXQvV2Vi S2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTMwOTUsNiArMzA5NSw4IEBACiAJCTQ2 NkJDMDM4MUZBMjY2QzkwMDJGQTlDMSAvKiBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5j cHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBXZWJTV0NvbnRleHRNYW5h Z2VyQ29ubmVjdGlvbi5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ2NkJDMDM5 MUZBMjY2QzkwMDJGQTlDMSAvKiBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5oICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlv bi5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NjZCQzAzQTFGQTI2NkM5MDAyRkE5 QzEgLyogV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24ubWVzc2FnZXMuaW4gKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSB0ZXh0OyBwYXRoID0gV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24ubWVzc2FnZXMuaW47 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTQ2ODM1NjlBMjFFODFDQzcwMDZFMjdBMyAv KiBQcm92aXNpb25hbFBhZ2VQcm94eS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGgg PSBQcm92aXNpb25hbFBhZ2VQcm94eS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk0 NjgzNTY5QjIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gUHJvdmlzaW9uYWxQYWdlUHJveHkuY3Bw OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NkEyQjYwNjFFNTY3NUEyMDBDM0RFREEg LyogQmFja2dyb3VuZFByb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVyLmNwcCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEJhY2tncm91bmRQcm9jZXNzUmVzcG9uc2l2ZW5lc3NU aW1lci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ2QTJCNjA3MUU1Njc1QTIw MEMzREVEQSAvKiBCYWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVuZXNzVGltZXIuaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQmFja2dyb3VuZFByb2Nlc3NSZXNwb25zaXZlbmVz c1RpbWVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ2REYwNjM5MUYzOTA1RTUw MDE5ODBCQiAvKiBOZXR3b3JrQ09SU1ByZWZsaWdodENoZWNrZXIuY3BwICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gTmV0d29ya0NPUlNQcmVmbGlnaHRDaGVja2VyLmNwcDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTczNTAsNiArNzM1Miw4IEBACiAJCQkJODZF NjdBMjIxOTBGNDExODAwMDA0QUI3IC8qIFByb2Nlc3NUaHJvdHRsZXIuY3BwICovLAogCQkJCTg2 RTY3QTIxMTkwRjQxMTgwMDAwNEFCNyAvKiBQcm9jZXNzVGhyb3R0bGVyLmggKi8sCiAJCQkJODMw NDhBRTUxQUNBNDVEQzAwODJDODMyIC8qIFByb2Nlc3NUaHJvdHRsZXJDbGllbnQuaCAqLywKKwkJ CQk0NjgzNTY5QjIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwICov LAorCQkJCTQ2ODM1NjlBMjFFODFDQzcwMDZFMjdBMyAvKiBQcm92aXNpb25hbFBhZ2VQcm94eS5o ICovLAogCQkJCUE1NUJBODFCMUJBMjVCMUUwMDdDRDMzRCAvKiBSZW1vdGVXZWJJbnNwZWN0b3JQ cm94eS5jcHAgKi8sCiAJCQkJQTU1QkE4MTkxQkEyNUIxRTAwN0NEMzNEIC8qIFJlbW90ZVdlYklu c3BlY3RvclByb3h5LmggKi8sCiAJCQkJQTU1QkE4MUExQkEyNUIxRTAwN0NEMzNEIC8qIFJlbW90 ZVdlYkluc3BlY3RvclByb3h5Lm1lc3NhZ2VzLmluICovLApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwCmluZGV4IDAwNzQ5YjQ3N2EyNGNlOGNjYzgyNTAx ZDk0ZTA4YjYwZWUxYTYyNjMuLmZmZWQwMGM4MjA2YTk0ZjBlNGZmYzdmZjNhOGE5ZGZmODYxM2Zh YzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1l LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAK QEAgLTI2Myw4ICsyNjMsNiBAQCBzdGF0aWMgV2ViQ29yZTo6UG9saWN5QWN0aW9uIHRvUG9saWN5 QWN0aW9uKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24pCiAgICAgICAgIHJldHVybiBXZWJD b3JlOjpQb2xpY3lBY3Rpb246Oklnbm9yZTsKICAgICBjYXNlIFdlYlBvbGljeUFjdGlvbjo6RG93 bmxvYWQ6CiAgICAgICAgIHJldHVybiBXZWJDb3JlOjpQb2xpY3lBY3Rpb246OkRvd25sb2FkOwot ICAgIGNhc2UgV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kOgotICAgICAgICBicmVhazsKICAgICB9 CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgcmV0dXJuIFdlYkNvcmU6OlBvbGljeUFj dGlvbjo6SWdub3JlOwpAQCAtMjcyLDExICsyNzAsOCBAQCBzdGF0aWMgV2ViQ29yZTo6UG9saWN5 QWN0aW9uIHRvUG9saWN5QWN0aW9uKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24pCiAKIHZv aWQgV2ViRnJhbWU6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1aW50NjRfdCBsaXN0ZW5lcklE LCBXZWJQb2xpY3lBY3Rpb24gYWN0aW9uLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIERvd25sb2Fk SUQgZG93bmxvYWRJRCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9s aWNpZXMpCiB7Ci0gICAgaWYgKCFtX2NvcmVGcmFtZSB8fCAhbV9wb2xpY3lMaXN0ZW5lcklEIHx8 IGxpc3RlbmVySUQgIT0gbV9wb2xpY3lMaXN0ZW5lcklEIHx8ICFtX3BvbGljeUZ1bmN0aW9uKSB7 Ci0gICAgICAgIGlmIChhY3Rpb24gPT0gV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kKQotICAgICAg ICAgICAgcGFnZSgpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZEZhaWxUb1N1c3Bl bmRBZnRlclByb2Nlc3NTd2FwKCkpOworICAgIGlmICghbV9jb3JlRnJhbWUgfHwgIW1fcG9saWN5 TGlzdGVuZXJJRCB8fCBsaXN0ZW5lcklEICE9IG1fcG9saWN5TGlzdGVuZXJJRCB8fCAhbV9wb2xp Y3lGdW5jdGlvbikKICAgICAgICAgcmV0dXJuOwotICAgIH0KIAogICAgIEZyYW1lUG9saWN5RnVu Y3Rpb24gZnVuY3Rpb24gPSBXVEZNb3ZlKG1fcG9saWN5RnVuY3Rpb24pOwogICAgIGJvb2wgZm9y TmF2aWdhdGlvbkFjdGlvbiA9IG1fcG9saWN5RnVuY3Rpb25Gb3JOYXZpZ2F0aW9uQWN0aW9uID09 IEZvck5hdmlnYXRpb25BY3Rpb246OlllczsKQEAgLTI5MiwxNiArMjg3LDcgQEAgdm9pZCBXZWJG cmFtZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKHVpbnQ2NF90IGxpc3RlbmVySUQsIFdlYlBv bGljeUFjdGlvbiBhY3QKICAgICAgICAgICAgIGRvY3VtZW50TG9hZGVyLT5zZXROYXZpZ2F0aW9u SUQobmF2aWdhdGlvbklEKTsKICAgICB9CiAKLSAgICBib29sIHNob3VsZFN1c3BlbmQgPSBmYWxz ZTsKLSAgICBpZiAoYWN0aW9uID09IFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZCkgewotICAgICAg ICBzaG91bGRTdXNwZW5kID0gdHJ1ZTsKLSAgICAgICAgYWN0aW9uID0gV2ViUG9saWN5QWN0aW9u OjpJZ25vcmU7Ci0gICAgfQotCiAgICAgZnVuY3Rpb24odG9Qb2xpY3lBY3Rpb24oYWN0aW9uKSk7 Ci0KLSAgICBpZiAoc2hvdWxkU3VzcGVuZCkKLSAgICAgICAgcGFnZSgpLT5zdXNwZW5kRm9yUHJv Y2Vzc1N3YXAoKTsKIH0KIAogdm9pZCBXZWJGcmFtZTo6c3RhcnREb3dubG9hZChjb25zdCBXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkTmFt ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXgg MjVkNmRmYjcxZDAzYTQ5NjY0NGM2MjMyZjZmYjQyMThmYThkMmZiYi4uZTQ5MTgyNDdhNjc2NmQ2 NDJjYmQzNjJmYzM1MzUxNTYwOWM2NzZlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTQwMSw3ICs0MDEsNyBAQCBXZWJQYWdlOjpXZWJQYWdl KHVpbnQ2NF90IHBhZ2VJRCwgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMp CiAgICAgLCBtX292ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5IHsgcGFyYW1ldGVycy5vdmVy cmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSB9CiAgICAgLCBtX2NwdUxpbWl0KHBhcmFtZXRlcnMu Y3B1TGltaXQpCiAjaWYgUExBVEZPUk0oTUFDKQotICAgICwgbV9zaG91bGRBdHRhY2hEcmF3aW5n QXJlYU9uUGFnZVRyYW5zaXRpb24ocGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKQorICAg ICwgbV9zaG91bGRBdHRhY2hEcmF3aW5nQXJlYU9uUGFnZVRyYW5zaXRpb24ocGFyYW1ldGVycy5p c1Byb2Nlc3NTd2FwKQogI2VuZGlmCiB7CiAgICAgQVNTRVJUKG1fcGFnZUlEKTsKQEAgLTQ3MSw3 ICs0NzEsNyBAQCBXZWJQYWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCwgV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAgICAgbV9kcmF3aW5nQXJlYS0+c2V0UGFpbnRp bmdFbmFibGVkKGZhbHNlKTsKICAgICBtX2RyYXdpbmdBcmVhLT5zZXRTaG91bGRTY2FsZVZpZXdU b0ZpdERvY3VtZW50KHBhcmFtZXRlcnMuc2hvdWxkU2NhbGVWaWV3VG9GaXREb2N1bWVudCk7CiAK LSAgICBpZiAocGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKQorICAgIGlmIChwYXJhbWV0 ZXJzLmlzUHJvY2Vzc1N3YXApCiAgICAgICAgIGZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVl emVSZWFzb246OlN3YXBGcm9tU3VzcGVuZGVkKTsKIAogI2lmIEVOQUJMRShBU1lOQ19TQ1JPTExJ TkcpCkBAIC02OTYsNyArNjk2LDcgQEAgdm9pZCBXZWJQYWdlOjpyZWluaXRpYWxpemVXZWJQYWdl KFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQogICAgICAgICBtX2RyYXdp bmdBcmVhLT51cGRhdGVQcmVmZXJlbmNlcyhwYXJhbWV0ZXJzLnN0b3JlKTsKICAgICAgICAgbV9k cmF3aW5nQXJlYS0+c2V0UGFpbnRpbmdFbmFibGVkKHRydWUpOwogI2lmIFBMQVRGT1JNKE1BQykK LSAgICAgICAgbV9zaG91bGRBdHRhY2hEcmF3aW5nQXJlYU9uUGFnZVRyYW5zaXRpb24gPSBwYXJh bWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQ7CisgICAgICAgIG1fc2hvdWxkQXR0YWNoRHJhd2lu Z0FyZWFPblBhZ2VUcmFuc2l0aW9uID0gcGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwOwogI2VuZGlm CiAgICAgICAgIHVuZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6UGFnZVN1 c3BlbmRlZCk7CiAgICAgfQpAQCAtMzA1MywxMiArMzA1Myw2IEBAIHZvaWQgV2ViUGFnZTo6ZGlk UmVjZWl2ZVBvbGljeURlY2lzaW9uKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IGxpc3RlbmVy SUQsIFdlCiAgICAgV2ViRnJhbWUqIGZyYW1lID0gV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkud2Vi RnJhbWUoZnJhbWVJRCk7CiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuOwotICAgIGlm IChwb2xpY3lBY3Rpb24gPT0gV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kKSB7Ci0gICAgICAgIEFT U0VSVChmcmFtZSA9PSBtX21haW5GcmFtZSk7Ci0gICAgICAgIHNldElzU3VzcGVuZGVkKHRydWUp OwotCi0gICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnNlbmRQcmV3YXJtSW5mb3JtYXRp b24obWFpbldlYkZyYW1lKCktPnVybCgpKTsKLSAgICB9CiAgICAgZnJhbWUtPmRpZFJlY2VpdmVQ b2xpY3lEZWNpc2lvbihsaXN0ZW5lcklELCBwb2xpY3lBY3Rpb24sIG5hdmlnYXRpb25JRCwgZG93 bmxvYWRJRCwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKIH0KIApAQCAtNjMxMiw2ICs2MzA2 LDEwIEBAIHZvaWQgV2ViUGFnZTo6c2V0SXNTdXNwZW5kZWQoYm9vbCBzdXNwZW5kZWQpCiAgICAg aWYgKG1faXNTdXNwZW5kZWQpIHsKICAgICAgICAgLy8gVW5mcm96ZW4gb24gZHJhd2luZyBhcmVh IHJlc2V0LgogICAgICAgICBmcmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29uOjpQ YWdlU3VzcGVuZGVkKTsKKworICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5zZW5kUHJl d2FybUluZm9ybWF0aW9uKG1haW5XZWJGcmFtZSgpLT51cmwoKSk7CisKKyAgICAgICAgc3VzcGVu ZEZvclByb2Nlc3NTd2FwKCk7CiAgICAgfSBlbHNlCiAgICAgICAgIG1fc2hvdWxkUmVzZXREcmF3 aW5nQXJlYUFmdGVyU3VzcGVuZCA9IHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0g Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9u RHJhd2luZ0FyZWEubW0KaW5kZXggOTFhZDcxYWRlMWI3ZGI0ZjlkY2U2NGQ0ZjMzMDQ2N2IyMmI4 MzNjYy4uODNiNjU5OTI3MGI1MWM3YmIxOGVmZTczN2E1OTJlMDI1NzFhMjgwNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21h Yy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQpAQCAtOTcsNyArOTcsNyBAQCBUaWxl ZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEo V2ViUGFnZSYgd2ViUGFnZSwgYwogICAgIHVwZGF0ZUxheWVySG9zdGluZ0NvbnRleHQoKTsKICAg ICBzZXRDb2xvclNwYWNlKHBhcmFtZXRlcnMuY29sb3JTcGFjZSk7CiAKLSAgICBpZiAoIXBhcmFt ZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCkKKyAgICBpZiAoIXBhcmFtZXRlcnMuaXNQcm9jZXNz U3dhcCkKICAgICAgICAgYXR0YWNoKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxv ZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjZDVmOGU5ZGE1NWYwZGIzMTA5NWEzMzcxOTU4NDU3 NWFiNWUzZjViLi41NWFlMmQyODQ0ZDEzOGFiMDg1MDlmODgwMGM1YmRlYjQ1N2Y2NjYyIDEwMDY0 NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTYgQEAKKzIwMTktMDEtMTQgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAg ICAgICBSZWdyZXNzaW9uKFBTT04pIFZpZXcgYmVjb21lcyBibGFuayBhZnRlciBjbGljayBhIGNy b3NzLXNpdGUgZG93bmxvYWQgbGluaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTkzMzYxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NzA5OTU3Mz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgQVBJ IHRlc3QgY292ZXJhZ2UuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tOgorICAgICAgICAoLVtQU09OTmF2aWdhdGlv bkRlbGVnYXRlIHdlYlZpZXc6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvblJlc3BvbnNlOmRlY2lz aW9uSGFuZGxlcjpdKToKKwogMjAxOS0wMS0xMCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVl QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIzOTgyNS4K ZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vz c1N3YXBPbk5hdmlnYXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCmluZGV4IGYzNWQ4YmFhMzUzZjA3MDI0ZmQ0 MGU3ZDUyNzQ1M2E3NDIxMGMzYmEuLmQ1YmQ1ZWM3NzZiZDVlMTdiMGJkOWM5NDAwMmNjYjU0NDdj YTVkMDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev UHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQpAQCAtMSw1ICsxLDUgQEAK IC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgorICogQ29weXJpZ2h0IChDKSAyMDE3LTIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC03Miw2ICs3Miw3IEBAIHN0 YXRpYyBib29sIHNlcnZlclJlZGlyZWN0ZWQ7CiBzdGF0aWMgSGFzaFNldDxwaWRfdD4gc2VlblBJ RHM7CiBzdGF0aWMgYm9vbCB3aWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0Owogc3RhdGljIGJvb2wg ZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0Oworc3RhdGljIGJvb2wgc2hvdWxkQ29udmVydFRvRG93 bmxvYWQ7CiBzdGF0aWMgUmV0YWluUHRyPE5TVVJMPiBjbGllbnRSZWRpcmVjdFNvdXJjZVVSTDsK IHN0YXRpYyBSZXRhaW5QdHI8TlNVUkw+IGNsaWVudFJlZGlyZWN0RGVzdGluYXRpb25VUkw7CiAK QEAgLTEyOCw2ICsxMjksMTEgQEAgLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3 IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246KFdLTmF2aWdhdGkKICAgICBkaWRSZXBv bmRUb1BvbGljeURlY2lzaW9uQ2FsbCA9IHRydWU7CiB9CiAKKy0gKHZvaWQpd2ViVmlldzooV0tX ZWJWaWV3ICopd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2U6KFdLTmF2 aWdhdGlvblJlc3BvbnNlICopbmF2aWdhdGlvblJlc3BvbnNlIGRlY2lzaW9uSGFuZGxlcjoodm9p ZCAoXikoV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3kpKWRlY2lzaW9uSGFuZGxlcgoreworICAg IGRlY2lzaW9uSGFuZGxlcihzaG91bGRDb252ZXJ0VG9Eb3dubG9hZCA/IF9XS05hdmlnYXRpb25S ZXNwb25zZVBvbGljeUJlY29tZURvd25sb2FkIDogV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3lB bGxvdyk7Cit9CisKIC0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkaWRSZWNl aXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbE5hdmlnYXRpb246KFdLTmF2aWdhdGlvbiAq KW5hdmlnYXRpb24KIHsKICAgICBzZWVuUElEcy5hZGQoW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVu dGlmaWVyXSk7CkBAIC0xNDA1LDcgKzE0MTEsNyBAQCBURVNUKFByb2Nlc3NTd2FwLCBTZXJ2ZXJS ZWRpcmVjdCkKIAogICAgIEVYUEVDVF9GQUxTRShzZXJ2ZXJSZWRpcmVjdGVkKTsKICAgICBFWFBF Q1RfRVEoMywgbnVtYmVyT2ZEZWNpZGVQb2xpY3lDYWxscyk7Ci0gICAgRVhQRUNUX0VRKDJ1LCBz ZWVuUElEcy5zaXplKCkpOworICAgIEVYUEVDVF9FUSgzdSwgc2VlblBJRHMuc2l6ZSgpKTsKIH0K IAogVEVTVChQcm9jZXNzU3dhcCwgU2VydmVyUmVkaXJlY3QyKQpAQCAtMTQ2Nyw2ICsxNDczLDEw OSBAQCBURVNUKFByb2Nlc3NTd2FwLCBTZXJ2ZXJSZWRpcmVjdDIpCiAgICAgRVhQRUNUX1dLX1NU UkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4xLmh0bWwiLCBbW3dlYlZpZXcgVVJMXSBh YnNvbHV0ZVN0cmluZ10pOwogfQogCitzdGF0aWMgY29uc3QgY2hhciogbGlua1RvV2ViS2l0Qnl0 ZXMgPSBSIlBTT05SRVNPVVJDRSgKKzxib2R5PgorICA8YSBpZD0idGVzdExpbmsiIGhyZWY9InBz b246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiPkxpbms8L2E+Cis8L2JvZHk+CispUFNPTlJF U09VUkNFIjsKKworVEVTVChQcm9jZXNzU3dhcCwgUG9saWN5Q2FuY2VsQWZ0ZXJTZXJ2ZXJSZWRp cmVjdCkKK3sKKyAgICBhdXRvIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tf V0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBwcm9jZXNzUG9v bENvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uID0gWUVTOworICAg IGF1dG8gcHJvY2Vzc1Bvb2wgPSBhZG9wdE5TKFtbV0tQcm9jZXNzUG9vbCBhbGxvY10gX2luaXRX aXRoQ29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKworICAg IGF1dG8gd2ViVmlld0NvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJh dGlvbiBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRQcm9jZXNz UG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07CisgICAgYXV0byBoYW5kbGVyID0gYWRvcHROUyhbW1BT T05TY2hlbWUgYWxsb2NdIGluaXRdKTsKKyAgICBbaGFuZGxlciBhZGRNYXBwaW5nRnJvbVVSTFN0 cmluZzpAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiIHRvRGF0YTpsaW5rVG9XZWJL aXRCeXRlc107CisgICAgW2hhbmRsZXIgYWRkUmVkaXJlY3RGcm9tVVJMU3RyaW5nOkAicHNvbjov L3d3dy53ZWJraXQub3JnL21haW4uaHRtbCIgdG9VUkxTdHJpbmc6QCJwc29uOi8vd3d3LmFwcGxl LmNvbS9pZ25vcmUuaHRtbCJdOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRVUkxTY2hl bWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAicHNvbiJdOworCisgICAgYXV0 byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01h a2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0aW9u LmdldCgpXSk7CisgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBhZG9wdE5TKFtbUFNPTk5h dmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRp b25EZWxlZ2F0ZTpuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCldOworCisgICAgbmF2aWdhdGlvbkRl bGVnYXRlLT5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uID0gXihXS05hdmlnYXRpb25B Y3Rpb24gKmFjdGlvbiwgdm9pZCAoXmRlY2lzaW9uSGFuZGxlcikoV0tOYXZpZ2F0aW9uQWN0aW9u UG9saWN5KSkgeworICAgICAgICBpZiAoW2FjdGlvbi5yZXF1ZXN0LlVSTC5hYnNvbHV0ZVN0cmlu ZyBoYXNTdWZmaXg6QCJpZ25vcmUuaHRtbCJdKSB7CisgICAgICAgICAgICBkZWNpc2lvbkhhbmRs ZXIoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5Q2FuY2VsKTsKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgfQorICAgICAgICBkZWNpc2lvbkhhbmRsZXIoV0tOYXZpZ2F0aW9uQWN0aW9uUG9s aWN5QWxsb3cpOworICAgIH07CisKKyAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxS ZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAicHNvbjovL3d3dy5n b29nbGUuY29tL21haW4uaHRtbCJdXTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0 XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZh bHNlOworICAgIGF1dG8gcGlkQWZ0ZXJGaXJzdExvYWQgPSBbd2ViVmlldyBfd2ViUHJvY2Vzc0lk ZW50aWZpZXJdOworCisgICAgRVhQRUNUX0VRKDEsIG51bWJlck9mRGVjaWRlUG9saWN5Q2FsbHMp OworCisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAidGVzdExpbmsuY2xpY2soKSIg Y29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigm ZmFpbGVkKTsKKyAgICBmYWlsZWQgPSBmYWxzZTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBF WFBFQ1RfRVEoMywgbnVtYmVyT2ZEZWNpZGVQb2xpY3lDYWxscyk7CisKKyAgICAvLyBXZSBzaG91 bGQgc3RpbGwgYmUgb24gZ29vZ2xlLmNvbS4KKyAgICBFWFBFQ1RfRVEocGlkQWZ0ZXJGaXJzdExv YWQsIFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0pOworICAgIEVYUEVDVF9XS19TVFJF UShAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiLCBbW3dlYlZpZXcgVVJMXSBhYnNv bHV0ZVN0cmluZ10pOworCisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAidGVzdExp bmsuaW5uZXJUZXh0IiBjb21wbGV0aW9uSGFuZGxlcjogWyZdIChpZCBpbm5lclRleHQsIE5TRXJy b3IgKmVycm9yKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAIkxpbmsiLCBpbm5lclRleHQp OworICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGls OjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKK30KKworVEVTVChQcm9jZXNzU3dhcCwg Q3Jvc3NTaXRlRG93bmxvYWQpCit7CisgICAgYXV0byBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24g PSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7Cisg ICAgcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NTd2Fwc09uTmF2aWdhdGlv biA9IFlFUzsKKyAgICBhdXRvIHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wg YWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdl dCgpXSk7CisKKyAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2Vi Vmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRp b24gc2V0UHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0KCldOworICAgIGF1dG8gaGFuZGxlciA9 IGFkb3B0TlMoW1tQU09OU2NoZW1lIGFsbG9jXSBpbml0XSk7CisgICAgW2hhbmRsZXIgYWRkTWFw cGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1sIiB0b0Rh dGE6bGlua1RvV2ViS2l0Qnl0ZXNdOworICAgIFtoYW5kbGVyIGFkZE1hcHBpbmdGcm9tVVJMU3Ry aW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCIgdG9EYXRhOiJIZWxsbyJdOwor ICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0 KCkgZm9yVVJMU2NoZW1lOkAicHNvbiJdOworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhb W1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAw KSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgYXV0byBu YXZpZ2F0aW9uRGVsZWdhdGUgPSBhZG9wdE5TKFtbUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSBhbGxv Y10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpuYXZpZ2F0aW9u RGVsZWdhdGUuZ2V0KCldOworCisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVx dWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246Ly93d3cuZ29v Z2xlLmNvbS9tYWluLmh0bWwiXV07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07 CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxz ZTsKKyAgICBhdXRvIHBpZEFmdGVyRmlyc3RMb2FkID0gW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVu dGlmaWVyXTsKKworICAgIHNob3VsZENvbnZlcnRUb0Rvd25sb2FkID0gdHJ1ZTsKKyAgICBbd2Vi VmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJ0ZXN0TGluay5jbGljaygpIiBjb21wbGV0aW9uSGFu ZGxlcjpuaWxdOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZmYWlsZWQpOworICAg IGZhaWxlZCA9IGZhbHNlOworICAgIHNob3VsZENvbnZlcnRUb0Rvd25sb2FkID0gZmFsc2U7CisK KyAgICAvLyBXZSBzaG91bGQgc3RpbGwgYmUgb24gZ29vZ2xlLmNvbS4KKyAgICBFWFBFQ1RfRVEo cGlkQWZ0ZXJGaXJzdExvYWQsIFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0pOworICAg IEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiLCBbW3dl YlZpZXcgVVJMXSBhYnNvbHV0ZVN0cmluZ10pOworCisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZh U2NyaXB0OkAidGVzdExpbmsuaW5uZXJUZXh0IiBjb21wbGV0aW9uSGFuZGxlcjogWyZdIChpZCBp bm5lclRleHQsIE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAIkxp bmsiLCBpbm5lclRleHQpOworICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBUZXN0 V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKK30KKwogZW51 bSBjbGFzcyBTaG91bGRFbmFibGVQU09OIHsgTm8sIFllcyB9Owogc3RhdGljIHZvaWQgcnVuQ2xp ZW50U2lkZVJlZGlyZWN0VGVzdChTaG91bGRFbmFibGVQU09OIHNob3VsZEVuYWJsZVBTT04pCiB7 CkBAIC0yMjMyLDEyICsyMzQxLDI3IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIFBhZ2VTaG93SGlkZSkK IAogICAgIEVYUEVDVF9FUSg3dSwgW3JlY2VpdmVkTWVzc2FnZXMgY291bnRdKTsKICAgICBFWFBF Q1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cg Tk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMF0pOwotICAgIEVYUEVDVF9X S19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJz aXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEo QCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlc2hvdyBOT1QgcGVyc2lzdGVk IiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNv bjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2 ZWRNZXNzYWdlcy5nZXQoKVszXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53 ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2Fn ZXMuZ2V0KClbNF0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9y Zy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgp WzVdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0 bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAg ICBpZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0gaGFzUHJlZml4OkAicHNvbjovL3d3dy53 ZWJraXQub3JnL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246 Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZl ZE1lc3NhZ2VzLmdldCgpWzFdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3 dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVk TWVzc2FnZXMuZ2V0KClbMl0pOworICAgIH0gZWxzZSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJF UShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93IE5PVCBwZXJzaXN0 ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVR KEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIs IHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOworICAgIH0KKyAgICBpZiAoW3JlY2VpdmVkTWVz c2FnZXMuZ2V0KClbM10gaGFzUHJlZml4OkAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1s Il0pIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFp bi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSk7 CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0 bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKKyAg ICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5v cmcvbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQo KVszXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21h aW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNF0p OworICAgIH0KKyAgICBpZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0gaGFzUHJlZml4OkAi cHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19T VFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0 ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVR KEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwg cmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgRVhQRUNU X1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgcGVy c2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7CisgICAgICAgIEVYUEVDVF9XS19T VFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0 ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAgICB9CiB9CiAKIC8vIERpc2FibGlu ZyB0aGUgcGFnZSBjYWNoZSBleHBsaWNpdGx5IGlzIChmb3Igc29tZSByZWFzb24pIG5vdCBhdmFp bGFibGUgb24gaU9TLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDIxZjc3ODgyNWQ3MWI3ZjYxNjU5MmMyNmMyOTczYTAxZGY5 ODA0ZmMuLjdjZDc5NjRiZWIxNzYzZTQxNjg5YTQ5NzkzMTk3YzY4MTJkYTM1ZDYgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNyBAQAorMjAxOS0wMS0xNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29t PgorCisgICAgICAgIFJlZ3Jlc3Npb24oUFNPTikgVmlldyBiZWNvbWVzIGJsYW5rIGFmdGVyIGNs aWNrIGEgY3Jvc3Mtc2l0ZSBkb3dubG9hZCBsaW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMzNjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3 MDk5NTczPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFNraXAgdGVzdCB0ZXN0aW5nIHRoZSBjcm9zcy1wcm9jZXNzIERPTVdpbmRvdyBBUEkgYXMgSSBi cm9rZSBpdCB3aXRoIHRoaXMgcGF0Y2guCisgICAgICAgIFRoZSBmZWF0dXJlIGlzIGZhciBmcm9t IHJlYWR5IGFuZCBvZmYgYnkgZGVmYXVsdCBhbnl3YXkuIEkgd2lsbCBhZGQgc3VwcG9ydCBiYWNr CisgICAgICAgIGluIGEgZm9sbG93LXVwLgorCisgICAgICAgICogcGxhdGZvcm0vd2syL1Rlc3RF eHBlY3RhdGlvbnM6CisKIDIwMTktMDEtMTAgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3 ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyMzk4MjUuCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucyBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDhlOTU5ZWRhZmZk ODkyN2VmOWMyYWFjMzE2ZTllMzEwMGNkMTQwY2IuLjlkOTBiZThiNDhlNTdjOTYwYmNkYTY4NmNl MjQ0MGQ3MTM4YmIwZjYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0 RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRp b25zCkBAIC03MzMsOCArNzMzLDggQEAgaHR0cC90ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNz L3JlbW92ZS1ibG9ja2luZy1pbi1yZWRpcmVjdC5odG1sIFsgU2tpcCBdCiBodHRwL3Rlc3RzL3Jl c291cmNlTG9hZFN0YXRpc3RpY3Mvbm9uLXByZXZhbGVudC1yZXNvdXJjZXMtY2FuLWFjY2Vzcy1j b29raWVzLWluLWEtdGhpcmQtcGFydHktY29udGV4dC5odG1sIFsgU2tpcCBdCiBodHRwL3Rlc3Rz L3Jlc291cmNlTG9hZFN0YXRpc3RpY3MvY2FwLWNhY2hlLW1heC1hZ2UtZm9yLXByZXZhbGVudC1y ZXNvdXJjZS5odG1sIFsgU2tpcCBdCiAKLSMgUHJvY2VzcyBzd2FwcGluZyBpcyBvbmx5IGltcGxl bWVudGVkIG9uIFdlYktpdDIuCi1odHRwL3Rlc3RzL25hdmlnYXRpb24vcHJvY2Vzcy1zd2FwLXdp bmRvdy1vcGVuLmh0bWwgWyBQYXNzIF0KKyMgVGhpcyBmZWF0dXJlIGlzIGN1cnJlbnRseSBkaXNh YmxlZCBieSBkZWZhdWx0IGFuZCB1bmZpbmlzaGVkIDxyZGFyOi8vcHJvYmxlbS8zODkyNTA3Nz4u CitodHRwL3Rlc3RzL25hdmlnYXRpb24vcHJvY2Vzcy1zd2FwLXdpbmRvdy1vcGVuLmh0bWwgWyBT a2lwIF0KIAogIyBDcm9zcy1PcmlnaW4tUmVzb3VyY2UtUG9saWN5IHJlc3BvbnNlIGhlYWRlciBp cyBvbmx5IGltcGxlbWVudGVkIGluIFdlYktpdDIuCiBodHRwL3dwdC9jcm9zcy1vcmlnaW4tcmVz b3VyY2UtcG9saWN5LyBbIFBhc3MgXQo= 359119 2019-01-14 19:21:44 -0800 2019-01-15 08:45:25 -0800 Patch bug-193361-20190114192142.patch text/plain 101078 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5ODgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTBjZDRkYTBiZjY4ODQy NWQ2YTA2NjM2YWVhMmM4MzMwMDRmNWI4OC4uZTZhMzk0YjZiMmYzNGYzMDEwYzIyZjRjNTY2NmYz M2U0ZDg3MGM5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAxLTE0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBW aWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAg ICAgIFdoZW4gcmVzdG9yaW5nIGZyb20gUGFnZUNhY2hlLCBtYWtlIHN1cmUgd2Ugbm90aWZ5IHRo ZSBjbGllbnQgdGhhdCB0aGUgbG9hZCB3YXMgY29tbWl0dGVkCisgICAgICAgICpiZWZvcmUqIHdl IHRlbGwgaXQgdGhhdCB0aGUgbmF2aWdhdGlvbiBpcyBjb21wbGV0ZS4gVGhpcyB3b3VsZCBjb25m dXNlIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eQorICAgICAgICBsb2dpYyBpbiB0aGUgVUlQcm9j ZXNzLgorCiAyMDE5LTAxLTExICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29t PgogCiAgICAgICAgIFtpT1NdIFByZWNpc2lvbiBkcm9wIHN0YXRlIHRocmFzaGVzIHdoZW4gZHJh Z2dpbmcgbmVhciB0aGUgdG9wIGVkZ2Ugb2YgYW4gZWRpdGFibGUgZWxlbWVudApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRl eCA2MWQ1YWIzYTUxZmYxOGFmN2Y2ZGFmYTY5MTBkMTRjNjA1NDQxODNiLi5kMzczY2ZjMDIwODc5 YzAwZmYzZDJhMTY2MDZlOThjNzJjYjM2Y2I2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwMCBAQAor MjAxOS0wMS0xNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFJl Z3Jlc3Npb24oUFNPTikgVmlldyBiZWNvbWVzIGJsYW5rIGFmdGVyIGNsaWNrIGEgY3Jvc3Mtc2l0 ZSBkb3dubG9hZCBsaW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTMzNjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBpc3N1ZSB0cmFj a2VkIGJ5IHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczIGlzIHRoYXQgYSBwcm92aXNpb25hbCBsb2Fk IG1heSBnZXQKKyAgICAgICAgY2FuY2VsZWQgKG9yIGNvbnZlcnRlZCBpbnRvIGEgZG93bmxvYWQp ICphZnRlciogd2UndmUgZGVjaWRlZCB0byBwcm9jZXNzLXN3YXAuCisgICAgICAgIEluIHN1Y2gg Y2FzZXMsIHRoZSB2aWV3IHNob3VsZCBrZWVwIGRpc3BsYXlpbmcgdGhlIGN1cnJlbnQgc2l0ZSBh bmQgaXQgc2hvdWxkCisgICAgICAgIHN0aWxsIGJlIGludGVyYWN0aXZlLiBIb3dldmVyLCB3aXRo IHRoZSBwcmV2aW91cyBQU09OIG1vZGVsLCB0aGUgdmlldyAocGFnZVByb3h5KQorICAgICAgICB3 b3VsZCBoYXZlIGFscmVhZHkgc3dhcHBlZCB0byB0aGUgbmV3IHByb2Nlc3MgYW5kIHdvdWxkIGVu ZCB1cCBkaXNwbGF5aW5nIHRoZQorICAgICAgICBpbml0aWFsbHkgZW1wdHkgZG9jdW1lbnQuCisK KyAgICAgICAgVG8gYWRkcmVzcyB0aGUgaXNzdWUsIHRoaXMgcGF0Y2ggaW50cm9kdWNlcyB0aGUg Y29uY2VwdCBvZiBhIHByb3Zpc2lvbmFsIGxvYWQKKyAgICAgICAgaW4gdGhlIFVJUHJvY2Vzcywg aGFuZGxlZCBieSBhIFByb3Zpc2lvbmFsUGFnZVByb3h5IHdoaWNoIGhhcyBpdHMgb3duIHByaXZp c2lvbmFsCisgICAgICAgIHByb2Nlc3MuIFRoZSBXZWJQYWdlUHJveHkgb3ducyB0aGUgUHJvdmlz aW9uYWxQYWdlUHJveHkgYnV0IHdlIGRvIG5vdCBjb21taXQgdGhlCisgICAgICAgIHByb3Zpc2lv bmFsIHBhZ2UgdW50aWwgYWZ0ZXIgdGhlIGxvYWQgd2FzIGNvbW1pdHRlZCBpbiB0aGUgbmV3IHBy b2Nlc3MuIFRoaXMgbWVhbnMKKyAgICAgICAgdGhhdCB0aGUgdmlldyAvIFdlYlBhZ2VQcm94eSBr ZWVwcyB1c2luZyB0aGUgb2xkIHByb2Nlc3MgYW5kIGRpc3BsYXlzIHRoZSBjdXJyZW50CisgICAg ICAgIGNvbnRlbnQgdW50aWwgYSBsb2FkIGhhcyBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFs IHBhZ2UuIElmIG5vIGxvYWQgY29tbWl0cworICAgICAgICBpbiB0aGUgcHJvdmlzaW9uYWwgcHJv Y2VzcyAoZS5nLiBiZWNhdXNlIHRoZSBsb2FkIGlzIGNhbmNlbGxlZCBvciBjb252ZXJ0ZWQgaW50 bworICAgICAgICBhIGRvd25sb2FkKSwgdGhlbiB3ZSBtZXJlbHkgZGVzdHJveSB0aGUgUHJvdmlz aW9uYWxQYWdlUHJveHkgYW5kIHRlcm1pbmF0ZSBpdHMKKyAgICAgICAgcHJvY2Vzcywgd2l0aG91 dCBpbXBhY3RpbmcgdGhlIFdlYlBhZ2VQcm94eS4KKworICAgICAgICAqIFNoYXJlZC9XZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVyczo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVycy5oOgorICAgICAgICBSZW5hbWUgaXNTd2FwRnJvbVN1c3BlbmRlZCB0byBpc1By b2Nlc3NTd2FwIGZvciBjbGFyaXR5IGFzIHdlIGFsd2F5cyB3YW50IHRvCisgICAgICAgIGRlbGF5 IGF0dGFjaGluZyB0aGUgZHJhd2luZyBhcmVhIGluIGNhc2Ugb2YgYSBwcm9jZXNzLXN3YXAsIG5v IG1hdHRlciB3aGF0CisgICAgICAgIG5vdyB0aGF0IHRoZSBwcmV2aW91cyBwcm9jZXNzIGlzIGtl cHQgYWxpdmUgdW50aWwgdGhlIHByb3Zpc2lvbmFsIGxvYWQgaXMKKyAgICAgICAgY29tbWl0dGVk IGluIHRoZSBuZXcgcHJvY2Vzcy4KKworICAgICAgICAqIFNoYXJlZC9XZWJQb2xpY3lBY3Rpb24u aDoKKyAgICAgICAgRHJvcCBTdXNwZW5kIHBvbGljeSBhY3Rpb24uIEF0IGRlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25BY3Rpb24gdGltZSwgaW4gY2FzZSBvZgorICAgICAgICBwcm9jZXNzLXN3YXAs IHdlIG5vdyB0ZWxsIHRoZSBwcmV2aW91cyBwcm9jZXNzIHRvIHNpbXBseSBpZ25vcmUgdGhlIGxv YWQsIHdoaWxlCisgICAgICAgIHdlIGNyZWF0ZSBhIFByb3Zpc2lvbmFsUGFnZVByb3h5IHRvIGRv IHRoZSBuZXcgbG9hZCBpbiBhIG5ldyBwcm9jZXNzLgorICAgICAgICBTdXNwZW5zaW9uIG9mIHRo ZSBwcmV2aW91cyBwYWdlIGluIHRoZSBvbGQgcHJvY2VzcywgaGFwcGVucyBsYXRlciwgd2hlbiBh IGxvYWQKKyAgICAgICAgaXMgYWN0dWFsbHkgY29tbWl0dGVkIGluIHRoZSBuZXcgcHJvY2Vzcy4K KworICAgICAgICAqIFNvdXJjZXMudHh0OgorICAgICAgICBBZGQgbmV3IFByb3Zpc2lvbmFsUGFn ZVByb3h5IGZpbGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5t bToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0 YXRlXSk6CisgICAgICAgIFdoZW4gY2FsbGluZyBfa2lsbFdlYkNvbnRlbnRQcm9jZXNzQW5kUmVz ZXRTdGF0ZSBvbiBhIFdLV2ViVmlldywga2lsbCBib3RoIHRoZSBjdXJyZW50CisgICAgICAgIHBy b2Nlc3MgYW5kIHRoZSBwcm92aXNpb25hbCBvbmUsIHRvIG1haW50YWluIHByZXZpb3VzIGJlaGF2 aW9yIGluIG91ciBBUEkgdGVzdHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUNsaWVudC5o OgorICAgICAgICBUaW55IGJ1aWxkIGZpeC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Qcm92aXNp b25hbFBhZ2VQcm94eS5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBh Z2VQcm94eTo6UHJvdmlzaW9uYWxQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6flByb3Zpc2lvbmFsUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6 UHJvdmlzaW9uYWxQYWdlUHJveHk6OnRha2VEcmF3aW5nQXJlYSk6CisgICAgICAgIChXZWJLaXQ6 OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpjYW5jZWwpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpQcm92 aXNpb25hbFBhZ2VQcm94eTo6bG9hZERhdGFXaXRoTmF2aWdhdGlvbik6CisgICAgICAgIChXZWJL aXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKToKKyAg ICAgICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0p OgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZy YW1lKToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQ cm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6 UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZSk6CisgICAgICAgIChX ZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2FnZSk6CisgICAgICAg IChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlU3luY01lc3NhZ2UpOgor ICAgICAgICAqIFVJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oOiBBZGRlZC4KKyAgICAg ICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OnBhZ2UpOgorICAgICAgICAoV2ViS2l0 OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6bWFpbkZyYW1lIGNvbnN0KToKKyAgICAgICAgKFdlYktp dDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OnByb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpQcm92 aXNpb25hbFBhZ2VQcm94eTo6cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBjb25zdCk6Cisg ICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpuYXZpZ2F0aW9uSUQgY29uc3Qp OgorICAgICAgICBBZGQgbmV3IFByb3Zpc2lvbmFsUGFnZVByb3h5IGNsYXNzIHRvIHdyYXAgdGhl IHByb3Zpc2lvbmFsIGxvYWQgaW4gdGhlIG5ldyBwcm9jZXNzCisgICAgICAgIGFmdGVyIGEgc3dh cC4gVGhlIHByb3Zpc2lvbmFsIHBhZ2UgaXMgb3duZWQgYnkgdGhlIFdlYlBhZ2VQcm94eSBhbmQg d2Ugb25seSBjb21taXQKKyAgICAgICAgdGhlIHByb3Zpc2lvbmFsIHBhZ2Ugd2hlbiB0aGUgbG9h ZCBpcyBjb21taXR0ZWQuIFVudGlsIHRoZW4sIHRoZSBXZWJQYWdlUHJveHkga2VlcHMKKyAgICAg ICAgdXNpbmcgdGhlIG9sZCBwcm9jZXNzIGFuZCBkaXNwbGF5aW5nIHRoZSBjdXJyZW50IGNvbnRl bnQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5Ojp+U3VzcGVuZGVkUGFnZVByb3h5KToKKyAg ICAgICAgKFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5Ojp1bnN1c3BlbmQpOgorICAgICAgICAo V2ViS2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6OmRpZFByb2Nlc3NSZXF1ZXN0VG9TdXNwZW5kKToK KyAgICAgICAgVW5yZWdpc3RlciB0aGUgU3VzcGVuZGVkUGFnZVByb3h5IGFzIGFuIElQQyBtZXNz YWdlIHJlY2VpdmVyIGEgbGl0dGxlIGJpdCBlYXJsaWVyCisgICAgICAgIHdoZW4gd2UncmUgZ29p bmcgdG8gdW5zdXNwZW5kIGl0LiBUaGlzIGF2b2lkcyBjb25mbGljdGluZyB3aXRoIHRoZSBQcm92 aXNpb25hbFBhZ2VQcm94eQorICAgICAgICB3aGljaCB0cmllcyB0byByZWdpc3RlciBpdHNlbGYg YXMgYW4gSVBDIG1lc3NhZ2UgcmVjZWl2ZXIgZm9yIHRoZSBzYW1lIHBhZ2VJRCB3aGVuCisgICAg ICAgIGEgcHJvY2Vzcy1zd2FwIG9jY3VycyBhbmQgd2UncmUgc3dpdGNoaW5nIHRvIGEgc3VzcGVu ZGVkIHBhZ2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYkZyYW1lUHJveHk6OmlzTWFpbkZyYW1lIGNvbnN0KToKKyAgICAgICAg V2ViRnJhbWVQcm94eTo6aXNNYWluRnJhbWUoKSByZWxpZXMgb24gY2hlY2tpbmcgdGhhdCB0aGUg ZnJhbWUgaXMgdGhlIFdlYlBhZ2VQcm94eSdzIG1fbWFpbkZyYW1lLgorICAgICAgICBOb3cgdGhh dCB0aGUgV2ViUGFnZVByb3h5IGNhbiBoYXZlIGEgUHJvdmlzaW9uYWxQYWdlUHJveHksIGFsc28g Y2hlY2sgaWYgaXQgaXMgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5J3MKKyAgICAgICAgbV9tYWlu RnJhbWUgdG8gbWFpbnRhaW4gcHJldmlvdXMgYmVoYXZpb3IuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpzd2Fw VG9XZWJQcm9jZXNzKToKKyAgICAgICAgc3dhcFRvV2ViUHJvY2VzcygpIG5vIGxvbmdlciB0YWtl cyBjYXJlIG9mIHVuc3VzcGVuZGluZyB0aGUgU3VzcGVuZGVkUGFnZSBiZWNhdXNlIHdlIG5vdyBj YWxsIHN3YXBUb1dlYlByb2Nlc3MoKQorICAgICAgICBsYXRlciwgd2hlbiBhIGxvYWQgaXMgYWN0 dWFsbHkgY29tbWl0dGVkIGluIHRoZSBwcm92aXNpb25hbCBwYWdlIC8gcHJvY2Vzcy4gc3dhcFRv V2ViUHJvY2VzcygpIG5vdyBhbHNvIG5lZWRzCisgICAgICAgIHRvIGluaXRpYWxpemUgc29tZSBk YXRhIG1lbWJlcnMgc3VjaCBhcyB0aGUgZHJhd2luZyBhcmVhIGFuZCB0aGUgbWFpbiBmcmFtZSBh cyBpdCBpcyB0cmFuc2ZlcnJpbmcgdGhlbSBvdmVyIGZyb20KKyAgICAgICAgdGhlIFByb3Zpc2lv bmFsUGFnZVByb3h5IHdoaWNoIHN0YXJ0ZWQgdGhlIHByb3Zpc2lvbmFsIGxvYWQuCisKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MpOgor ICAgICAgICBXZSBubyBsb25nZXIgbmVlZCBJc1N3YXBGcm9tU3VzcGVuZGVkIHBhcmFtZXRlciBh cyB0aGlzIGlzIGNhbGxlZCBsYXRlciBub3csIGFmdGVyIGEgbG9hZCBoYXMgYWN0dWFsbHkgYmVl bgorICAgICAgICBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHByb2Nlc3MuCisKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSk6CisgICAgICAgIC0g V2Ugbm8gbG9uZ2VyIG5lZWQgSXNTd2FwRnJvbVN1c3BlbmRlZCBwYXJhbWV0ZXIgYXMgdGhpcyBp cyBjYWxsZWQgbGF0ZXIgbm93LCBhZnRlciBhIGxvYWQgaGFzIGFjdHVhbGx5IGJlZW4KKyAgICAg ICAgICBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHByb2Nlc3MuCisgICAgICAgIC0gRmFj dG9yIHNvbWUgY29kZSBvdXQgdG8gV2ViUGFnZVByb3h5OjpzZXREcmF3aW5nQXJlYSgpIHNvIHRo YXQgaXQgY2FuIGJlIHNoYXJlZCB3aXRoIHN3YXBUb1dlYlByb2Nlc3MoKS4KKworICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24pOgorICAgICAg ICBPbmx5IGNhbGwgc2V0UGVuZGluZ0FQSVJlcXVlc3RVUkwoKSBpbiBsb2FkUmVxdWVzdFdpdGhO YXZpZ2F0aW9uKCkgb25seSBpZiBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQgaXMgbm90Cisg ICAgICAgIFllcy4gVGhpcyBhdm9pZHMgaGl0dGluZyBzb21lIGFzc2VydGlvbnMgYXMgdGhpcyB3 YXMgYWxyZWFkeSBjYWxsZWQgZHVyaW5nIHRoZSBmaXJzdCBBUEkgY2FsbCBpZiBuZWVkZWQuCisK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZWNlaXZlZE5hdmlnYXRpb25Qb2xpY3lE ZWNpc2lvbik6CisgICAgICAgIEluIGNhc2Ugb2YgcHJvY2VzcyBzd2FwLCB0ZWxsIHRoZSBwcmV2 aW91cyBwcm9jZXNzIHRvIGlnbm9yZSB0aGUgbG9hZCBpbnN0ZWFkIG9mIHN1c3BlbmRpbmcgaXQg cmlnaHQgYXdheS4KKyAgICAgICAgU3VzcGVuc2lvbiBub3cgaGFwcGVucyBsYXRlciwgb25seSBp ZiB3ZSBlbmQgdXAgY29tbWl0dGluZyB0aGUgcHJvdmlzaW9uYWwgbG9hZCBpbiB0aGUgbmV3IHBy b2Nlc3MuCisgICAgICAgIEFsc28gZGlzY2FyZCB0aGUgU3VzcGVuZGVkUGFnZSBpZiBpdCBmYWls ZWQgdG8gc3VzcGVuZCAod2Ugb25seSByZXVzZSBpdHMgcHJvY2VzcyBpbiB0aGlzIGNhc2UpLiBU aGlzIHVzZWQKKyAgICAgICAgdG8gaGFwcGVuIGEgYml0IGxhdGVyIGJ1dCBpdCBpcyBjbGVhcmVy IGlmIHdlIGRvIHRoaXMgYXMgZWFybHkgYXMgcG9zc2libGUgSSB0aGluay4KKworICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OmNvbW1pdFByb3Zpc2lvbmFsUGFnZSk6CisgICAgICAgIFdo ZW4gdGhlIGxvYWQgaXMgY29tbWl0dGVkIGluIHRoZSBuZXcgcHJvY2Vzcywgd2UgY2FsbCBXZWJQ YWdlUHJveHk6OmNvbW1pdFByb3Zpc2lvbmFsUGFnZSgpLiBJdCB0YWtlcyBjYXJlIG9mOgorICAg ICAgICAtIEFjdHVhbGx5IHN3YXBwaW5nIHRoZSBXZWJQYWdlUHJveHkgdG8gdGhlIG5ldyBwcm9j ZXNzIGJ5IGNhbGxpbmcgcHJvY2Vzc0RpZFRlcm1pbmF0ZSgpIC8gc3dhcFRvV2ViUHJvY2Vzcygp LgorICAgICAgICAtIFN1c3BlbmRpbmcgdGhlIGN1cnJlbnQgcGFnZS4KKyAgICAgICAgLSBMZXR0 aW5nIHRoZSBjbGllbnQga25vdyB0aGUgbG9hZCBpcyBjb21pdHRlZAorICAgICAgICAtIERlc3Ry b3kgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5LgorICAgICAgICBUaGlzIHdvcmsgdXNlZCB0byBo YXBwZW4gZWFybGllciBpbiBjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MoKS4KKworICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2Vz cyk6CisgICAgICAgIE1vdmVkIHNvbWUgb2YgdGhlIGxvZ2ljIHRvIGNvbW1pdFByb3Zpc2lvbmFs UGFnZSgpLiBXZSBub3cgbWVyZWx5IHN0YXJ0IHRoZSBsb2FkIGluIGEgbmV3IFByb3Zpc2lvbmFs UGFnZVByb3h5LAorICAgICAgICB3aXRob3V0IGFjdHVhbGx5IGhhdmluZyB0aGUgV2ViUGFnZVBy b3h5IHN3aXRjaCB0byB0aGUgbmV3IHByb2Nlc3MgeWV0LgorCisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZVByb3h5OjpkaWRDcmVhdGVXaW5kb3cpOgorICAgICAgICBEcm9wIHNvbWUgY29kZSB0aGF0IGlz IG5vIGxvbmdlciBuZWVkZWQsIG5vdyB0aGF0IHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eSB0YWtl cyBjYXJlIG9mIHRoaXMuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWREZXN0 cm95TmF2aWdhdGlvbik6CisgICAgICAgIE9uIHByb2Nlc3Mtc3dhcCwgd2hlbiB0ZWxsaW5nIHRo ZSBwcmV2aW91cyBwcm9jZXNzIHRvIGlnbm9yZSB0aGUgbG9hZCBhbmQgc3RhcnRpbmcgdGhlIG5l dyBsb2FkIGluIGEgbmV3CisgICAgICAgIFByb3Zpc2lvbmFsUGFnZVByb3h5LCB0aGUgcHJldmlv dXMgV2ViUGFnZSBhdHRlbXB0cyB0byBkZXN0cm95IHRoZSBuYXZpZ2F0aW9uLiBJbiB0aGlzIGNh c2UsIHdlIGlnbm9yZQorICAgICAgICB0aGUgY2FsbCBzaW5jZSB0aGUgbmF2aWdhdGlvbiBpcyBt ZXJlbHkgdGFrZW4gb3ZlciBieSB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkuCisKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKToK KyAgICAgICAgTW92ZWQgc29tZSBQU09OIGxvZ2ljIHRvIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94 eSBpbnN0ZWFkLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zp c2lvbmFsTG9hZEZvckZyYW1lKToKKyAgICAgICAgV2hlbiBkaWRGYWlsUHJvdmlzaW9uYWxMb2Fk Rm9yRnJhbWUoKSBpcyBjYWxsZWQgZm9yIGEgUHJvdmlzaW9uYWxQYWdlUHJveHksIGRlc3Ryb3kg aXQuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uQXN5bmMpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lk ZVBvbGljeUZvclJlc3BvbnNlKToKKyAgICAgICAgQ2FwdHVyZSB0aGUgcHJvY2VzcyBpbiB0aGUg bGFtYmRhLCB0byBtYWtlIHN1cmUgd2Ugc2VuZCB0aGUgcG9saWN5IGRlY2lzaW9uIHRvIHRoZSBz YW1lIHByb2Nlc3MgdGhhdAorICAgICAgICBhc2tlZCBmb3IgaXQsIHNvIGFzIHRvIG5vdCBnZXQg Y29uZnVzZWQgYnkgcHJvY2VzcyBzd2Fwcy4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OnJlc2V0U3RhdGUpOgorICAgICAgICBEcm9wIHNvbWUgY29kZSB0aGF0IGlzIG5vIGxvbmdl ciBuZWVkZWQuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjcmVhdGlvblBhcmFt ZXRlcnMpOgorICAgICAgICBNb3ZlIHRoZSBoYXNSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMgZmxh ZyBpbml0aWFsaXphdGlvbiBmcm9tIHRoZSBjYWxsIHNpdGUgdG8gaGVyZSBub3cgdGhhdCB3ZSBo YXZlCisgICAgICAgIG1vcmUgdGhhbiBvbmUgY2FsbCBzaXRlLiBUaGlzIHdhcyBqdXN0IHNvbWUg YmFkIGZhY3RvcmluZy4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OlBhZ2VQcm9j ZXNzT3ZlcnJpZGU6OlBhZ2VQcm9jZXNzT3ZlcnJpZGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OlBhZ2VQcm9jZXNzT3ZlcnJpZGU6On5QYWdlUHJvY2Vzc092ZXJyaWRlKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6dGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MpOgorICAgICAgICBBZGQgdXRpbGl0 eSBjbGFzcyB0byB0ZW1wb3JhcmlseSBvdmVycmlkZSB0aGUgV2ViUGFnZVByb3h5J3MgbV9wcm9j ZXNzIHdpdGggdGhlIHByb3Zpc2lvbmFsIG9uZSB3aGVuCisgICAgICAgIHRoZSBQcm92aXNpb25h bFBhZ2VQcm94eSBpbnRlcmFjdHMgd2l0aCB0aGUgV2ViUGFnZVByb3h5LgorCisgICAgICAgICog VUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nl c3NQcm94eTo6aGFzUHJvdmlzaW9uYWxQYWdlV2l0aElEIGNvbnN0KToKKyAgICAgICAgKFdlYktp dDo6V2ViUHJvY2Vzc1Byb3h5Ojp1cGRhdGVCYWNrRm9yd2FyZEl0ZW0pOgorICAgICAgICBCZWZv cmUgdXBkYXRpbmcgYSBCYWNrRm9yd2FyZExpc3RJdGVtLCB3ZSBub3JtYWxseSBtYWtlIHN1cmUg dGhlIHByb2Nlc3MgaGFzIGEgV2ViUGFnZVByb3h5IHdpdGggdGhlCisgICAgICAgIGl0ZW0ncyBw YWdlSUQuIFdlIGhhdmUgdG8gdHdlYWsgdGhlIGxvZ2ljIGJlY2F1c2UgdGhlcmUgbWF5IG5vdyBi ZSBubyBXZWJQYWdlUHJveHkgd2l0aCB0aGlzIHBhZ2VJRAorICAgICAgICBhc3NvY2lhdGVkIHdp dGggdGhpcyBwcm9jZXNzIHlldCwgYmVjYXVzZSBpdCBpcyBzdGlsbCBhIFByb3Zpc2lvbmFsUGFn ZVByb3h5LgorCisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6Y2FuVGVybWluYXRl Q2hpbGRQcm9jZXNzKToKKyAgICAgICAgRG8gbm90IHRlcm1pbmF0ZSB0aGUgV2ViUHJvY2VzcyBp ZiB0aGVyZSBhcmUgUHJvdmlzaW9uYWxQYWdlUHJveHkgb2JqZWN0cyB1c2luZyBpdC4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzc1Byb3h5OjphZGRQcm92aXNpb25hbFBhZ2VQcm94eSk6CisgICAgICAgIChXZWJLaXQ6 OldlYlByb2Nlc3NQcm94eTo6cmVtb3ZlUHJvdmlzaW9uYWxQYWdlUHJveHkpOgorCisgICAgICAg ICogV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwOgorICAgICAgICAoV2ViS2l0Ojp0b1BvbGljeUFjdGlv bik6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24p OgorICAgICAgICBTdG9wIGRlYWxpbmcgd2l0aCBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQgYXMg aXQgbm8gbG9uZ2VyIGV4aXN0cy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cmVpbml0aWFsaXplV2ViUGFnZSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbik6CisK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0SXNTdXNwZW5kZWQpOgorICAgICAgICBTdXNw ZW5kIHRoZSBQYWdlIHdoZW4gc2V0SXNTdXNwZW5kZWQodHJ1ZSkgaXMgY2FsbGVkLCBub3cgdGhh dCB0aGVyZSBpcyBubyBsb25nZXIgYSBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQuCisgICAgICAg IHNldElzU3VzcGVuZGVkKHRydWUpIElQQyBpcyBzZW50IHdoZW4gd2UgYWN0dWFsbHkgY29tbWl0 IHRoZSBwcm92aXNpb25hbCBwYWdlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21h Yy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbToKKyAgICAgICAgKFdlYktpdDo6VGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh KToKKwogMjAxOS0wMS0xMSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4K IAogICAgICAgICBbaU9TXSBQcmVjaXNpb24gZHJvcCBzdGF0ZSB0aHJhc2hlcyB3aGVuIGRyYWdn aW5nIG5lYXIgdGhlIHRvcCBlZGdlIG9mIGFuIGVkaXRhYmxlIGVsZW1lbnQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDRjMjZhNjk4MWI0NjRkYTU5MTZmMDVlYjczNTk2 NjkxNTdlZTlmZmUuLmViZjk1MGJhNmMyZWQ5MWY2MjMyYmQyYjVlZmI5Zjc5NTU3YWI1OGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMjAzMiwxMSArMjAzMiwxMSBA QCB2b2lkIEZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQoKQogCiAgICAgICAgIE9w dGlvbmFsPEhhc0luc2VjdXJlQ29udGVudD4gaGFzSW5zZWN1cmVDb250ZW50ID0gY2FjaGVkUGFn ZS0+Y2FjaGVkTWFpbkZyYW1lKCktPmhhc0luc2VjdXJlQ29udGVudCgpOwogCisgICAgICAgIGRp c3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOworCiAgICAgICAgIC8vIEZJ WE1FOiBUaGlzIEFQSSBzaG91bGQgYmUgdHVybmVkIGFyb3VuZCBzbyB0aGF0IHdlIGdyb3VuZCBD YWNoZWRQYWdlIGludG8gdGhlIFBhZ2UuCiAgICAgICAgIGNhY2hlZFBhZ2UtPnJlc3RvcmUoKm1f ZnJhbWUucGFnZSgpKTsKIAotICAgICAgICBkaXNwYXRjaERpZENvbW1pdExvYWQoaGFzSW5zZWN1 cmVDb250ZW50KTsKLQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgICAgIG1fZnJhbWUu cGFnZSgpLT5jaHJvbWUoKS5zZXREaXNwYXRjaFZpZXdwb3J0RGF0YURpZENoYW5nZVN1cHByZXNz ZWQoZmFsc2UpOwogICAgICAgICBtX2ZyYW1lLnBhZ2UoKS0+Y2hyb21lKCkuZGlzcGF0Y2hWaWV3 cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UobV9mcmFtZS5wYWdlKCktPnZpZXdwb3J0QXJndW1lbnRz KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzLmNwcAppbmRleCBjYTJkZjQwZWUxZGQyY2EzNmYzYTQ4YTA0NzU3Zjk3YmRiYjYzNjQ3Li42 ZDA3YzAzYWQ4YzkyN2U1NDUzYzVmZGE5NTk2NzA5YTc3MjYxZTJiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcApAQCAtNzMsNyAr NzMsNyBAQCB2b2lkIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZShJUEM6OkVuY29k ZXImIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2Rlci5lbmNvZGVFbnVtKGxheWVySG9zdGluZ01v ZGUpOwogICAgIGVuY29kZXIgPDwgbWltZVR5cGVzV2l0aEN1c3RvbUNvbnRlbnRQcm92aWRlcnM7 CiAgICAgZW5jb2RlciA8PCBjb250cm9sbGVkQnlBdXRvbWF0aW9uOwotICAgIGVuY29kZXIgPDwg aXNTd2FwRnJvbVN1c3BlbmRlZDsKKyAgICBlbmNvZGVyIDw8IGlzUHJvY2Vzc1N3YXA7CiAKICNp ZiBQTEFURk9STShNQUMpCiAgICAgZW5jb2RlciA8PCBjb2xvclNwYWNlOwpAQCAtMjI3LDcgKzIy Nyw3IEBAIE9wdGlvbmFsPFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM+IFdlYlBhZ2VDcmVhdGlv blBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkRlY29kCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxv cHQ7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmNvbnRyb2xsZWRCeUF1dG9t YXRpb24pKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotICAgIGlmICghZGVjb2Rlci5k ZWNvZGUocGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKSkKKyAgICBpZiAoIWRlY29kZXIu ZGVjb2RlKHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkpCiAgICAgICAgIHJldHVybiBXVEY6Om51 bGxvcHQ7CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9X ZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgKaW5kZXggYWU0MzI1Y2JkNWYxZTU2NzYxNjU4NmY1 ZTlmYTczZWU1YjM1YjkzNy4uYjM4MmNlZWRkNDQ5YThkOWEwZjg2OTQ3MzVmMjZjMDU5NWRkZWNk OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1l dGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnMuaApAQCAtMTI5LDcgKzEyOSw3IEBAIHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz IHsKICAgICBWZWN0b3I8U3RyaW5nPiBtaW1lVHlwZXNXaXRoQ3VzdG9tQ29udGVudFByb3ZpZGVy czsKIAogICAgIGJvb2wgY29udHJvbGxlZEJ5QXV0b21hdGlvbjsKLSAgICBib29sIGlzU3dhcEZy b21TdXNwZW5kZWQgeyBmYWxzZSB9OworICAgIGJvb2wgaXNQcm9jZXNzU3dhcCB7IGZhbHNlIH07 CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgQ29sb3JTcGFjZURhdGEgY29sb3JTcGFjZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oIGIvU291cmNl L1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKaW5kZXggMTQyYTUxOGRmMDk3ZTVlZjJm YTE4MDQ4NGUwOWQwMzMzYzEwNWI4MS4uMzk3MTc5NWM0NmE1MWIzODgxOGM1NWI3NmQ2NTNhMzRi NTI4OWU5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9u LmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKQEAgLTI5LDEx ICsyOSwxMSBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorLy8gRklYTUU6IFJlbW92ZSB0aGlz IHR5cGUgYW5kIHVzZSBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gaW5zdGVhZC4KIGVudW0gY2xhc3Mg V2ViUG9saWN5QWN0aW9uIDogdWludDhfdCB7CiAgICAgVXNlLAogICAgIERvd25sb2FkLAotICAg IElnbm9yZSwKLSAgICBTdXNwZW5kCisgICAgSWdub3JlCiB9OwogCiB9CkBAIC00NSw4ICs0NSw3 IEBAIHRlbXBsYXRlPD4gc3RydWN0IEVudW1UcmFpdHM8V2ViS2l0OjpXZWJQb2xpY3lBY3Rpb24+ IHsKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb24sCiAgICAgICAgIFdlYktpdDo6V2Vi UG9saWN5QWN0aW9uOjpVc2UsCiAgICAgICAgIFdlYktpdDo6V2ViUG9saWN5QWN0aW9uOjpEb3du bG9hZCwKLSAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246Oklnbm9yZSwKLSAgICAgICAg V2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQKKyAgICAgICAgV2ViS2l0OjpXZWJQb2xp Y3lBY3Rpb246Oklnbm9yZQogICAgID47CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1NvdXJjZXMudHh0IGIvU291cmNlL1dlYktpdC9Tb3VyY2VzLnR4dAppbmRleCBhMGI2ZjcyODQ2 MDQxYzI2M2E1NDc2NzEwZWFjOTg3ZmVkMWQxNjA0Li44YWVjYjg2NDcyNTAyZDAyN2EzNGFmMzcx OWRkODI4YjAwN2RiMTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMudHh0Cisr KyBiL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQKQEAgLTIzMCw2ICsyMzAsNyBAQCBVSVByb2Nl c3MvSW5zcGVjdG9yVGFyZ2V0UHJveHkuY3BwCiBVSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5jcHAK IFVJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcAogVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRs ZXIuY3BwCitVSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCiBVSVByb2Nlc3MvUmVt b3RlV2ViSW5zcGVjdG9yUHJveHkuY3BwCiBVSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NUaW1lci5j cHAKIFVJUHJvY2Vzcy9TZXJ2aWNlV29ya2VyUHJvY2Vzc1Byb3h5LmNwcApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMTE2MzNjNmI0ZDAy ZmVmN2NhYjBkNmEyN2VlYjM4MGMyOWY1ZjIzMC4uM2RhZTk2NGMyOWMxODA5Y2Y1NzMxOTAxYjQ0 Y2M4NGE5OGIyMTZiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tCkBAIC00NCw2ICs0NCw3IEBACiAjaW1wb3J0ICJOYXZpZ2F0aW9uU3RhdGUu aCIKICNpbXBvcnQgIk9iakNPYmplY3RHcmFwaC5oIgogI2ltcG9ydCAiUGFnZUNsaWVudC5oIgor I2ltcG9ydCAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbXBvcnQgIlJlbW90ZUxheWVyVHJl ZVNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YS5oIgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJUcmVlVHJh bnNhY3Rpb24uaCIKICNpbXBvcnQgIlJlbW90ZU9iamVjdFJlZ2lzdHJ5LmgiCkBAIC00NjY1LDYg KzQ2NjYsMTEgQEAgLSAodm9pZClfa2lsbFdlYkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRTdGF0ZQog ewogICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nlc3NQcm94eT4gcHJvdGVjdGVkUHJvY2Vzc1Byb3h5 KF9wYWdlLT5wcm9jZXNzKCkpOwogICAgIHByb3RlY3RlZFByb2Nlc3NQcm94eS0+cmVxdWVzdFRl cm1pbmF0aW9uKFdlYktpdDo6UHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpSZXF1ZXN0ZWRCeUNs aWVudCk7CisKKyAgICBpZiAoYXV0byogcHJvdmlzaW9uYWxQYWdlUHJveHkgPSBfcGFnZS0+cHJv dmlzaW9uYWxQYWdlUHJveHkoKSkgeworICAgICAgICBSZWY8V2ViS2l0OjpXZWJQcm9jZXNzUHJv eHk+IHByb3RlY3RlZFByb2Nlc3NQcm94eShwcm92aXNpb25hbFBhZ2VQcm94eS0+cHJvY2Vzcygp KTsKKyAgICAgICAgcHJvdGVjdGVkUHJvY2Vzc1Byb3h5LT5yZXF1ZXN0VGVybWluYXRpb24oV2Vi S2l0OjpQcm9jZXNzVGVybWluYXRpb25SZWFzb246OlJlcXVlc3RlZEJ5Q2xpZW50KTsKKyAgICB9 CiB9CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9QYWdlQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgK aW5kZXggMTQ5NzE0YWIxZDIyNjVhNjgzNGQ1N2VmNDdiMTE2ZWE0ZTI5ZTM1MS4uODJjNzczMjJm MmRmODdlM2FlZDVlMDA0YzYxYjJmNzkzOTUwZTM4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Bh Z2VDbGllbnQuaApAQCAtNDgsNiArNDgsNyBAQAogCiBPQkpDX0NMQVNTIENBTGF5ZXI7CiBPQkpD X0NMQVNTIE5TRmlsZVdyYXBwZXI7CitPQkpDX0NMQVNTIE5TTWVudTsKIE9CSkNfQ0xBU1MgTlNT ZXQ7CiBPQkpDX0NMQVNTIFdLRHJhd2luZ1ZpZXc7CiBPQkpDX0NMQVNTIF9XS1JlbW90ZU9iamVj dFJlZ2lzdHJ5OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9u YWxQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdl UHJveHkuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjc5ZjUyMzY2NTY0NmVhYjQxODYyMjY2OTc2OGU4ZWQzODZk MmIzOTMKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNp b25hbFBhZ2VQcm94eS5jcHAKQEAgLTAsMCArMSwzMDUgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMp IDIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAor ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJj ZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIu IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUg Y29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRI SVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9S UyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElO Q0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBP RiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9T RSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09O VFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVO VEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElO Q0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVU RSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJV U0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZ IE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFks IE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVk ZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKKworI2luY2x1 ZGUgIkFQSU5hdmlnYXRpb24uaCIKKyNpbmNsdWRlICJEcmF3aW5nQXJlYVByb3h5LmgiCisjaW5j bHVkZSAiTG9nZ2luZy5oIgorI2luY2x1ZGUgIlBhZ2VDbGllbnQuaCIKKyNpbmNsdWRlICJXZWJC YWNrRm9yd2FyZExpc3QuaCIKKyNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3RJdGVtLmgiCisj aW5jbHVkZSAiV2ViRXJyb3JzLmgiCisjaW5jbHVkZSAiV2ViTmF2aWdhdGlvblN0YXRlLmgiCisj aW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2VzLmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCisj aW5jbHVkZSAiV2ViUGFnZVByb3h5TWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNzTWVz c2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNzUHJveHkuaCIKKyNpbmNsdWRlIDxXZWJDb3Jl L1Nob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZC5oPgorCituYW1lc3BhY2UgV2ViS2l0IHsKKwor I2RlZmluZSBSRUxFQVNFX0xPR19JRl9BTExPV0VEKGNoYW5uZWwsIGZtdCwgLi4uKSBSRUxFQVNF X0xPR19JRihtX3BhZ2UuaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCksIGNoYW5uZWwsICIlcCAt IFByb3Zpc2lvbmFsUGFnZVByb3h5OjoiIGZtdCwgdGhpcywgIyNfX1ZBX0FSR1NfXykKKworUHJv dmlzaW9uYWxQYWdlUHJveHk6OlByb3Zpc2lvbmFsUGFnZVByb3h5KFdlYlBhZ2VQcm94eSYgcGFn ZSwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVu ZGVkUGFnZVByb3h5PiBzdXNwZW5kZWRQYWdlLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGJvb2wg aXNTZXJ2ZXJSZWRpcmVjdCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0 LCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGll bnQpCisgICAgOiBtX3BhZ2UocGFnZSkKKyAgICAsIG1fcHJvY2VzcyhXVEZNb3ZlKHByb2Nlc3Mp KQorICAgICwgbV9uYXZpZ2F0aW9uSUQobmF2aWdhdGlvbklEKQorICAgICwgbV9pc1NlcnZlclJl ZGlyZWN0KGlzU2VydmVyUmVkaXJlY3QpCisgICAgLCBtX3JlcXVlc3QocmVxdWVzdCkKKyAgICAs IG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudChwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xp ZW50KQorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgLCBtX3N1c3BlbnNpb25Ub2tlbiht X3Byb2Nlc3MtPnRocm90dGxlcigpLmJhY2tncm91bmRBY3Rpdml0eVRva2VuKCkpCisjZW5kaWYK K3sKKyAgICBtX3Byb2Nlc3MtPmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSwgKnRoaXMpOworICAg IG1fcHJvY2Vzcy0+YWRkUHJvdmlzaW9uYWxQYWdlUHJveHkoKnRoaXMpOworCisgICAgLy8gSWYg d2UgYXJlIHJlYXR0YWNoaW5nIHRvIGEgU3VzcGVuZGVkUGFnZSwgdGhlbiB0aGUgV2ViUHJvY2Vz cycgV2ViUGFnZSBhbHJlYWR5IGV4aXN0cyBhbmQKKyAgICAvLyBXZWJQYWdlUHJveHk6OmRpZENy ZWF0ZU1haW5GcmFtZSgpIHdpbGwgbm90IGJlIGNhbGxlZCB0byBpbml0aWFsaXplIG1fbWFpbkZy YW1lLiBJbiBzdWNoCisgICAgLy8gY2FzZSwgd2UgbmVlZCB0byBpbml0aWFsaXplIG1fbWFpbkZy YW1lIHRvIHJlZmxlY3QgdGhlIGZhY3QgdGhlIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdlCisgICAg Ly8gYWxyZWFkeSBleGlzdHMgYW5kIGFscmVhZHkgaGFzIGEgbWFpbiBmcmFtZS4KKyAgICBpZiAo c3VzcGVuZGVkUGFnZSkgeworICAgICAgICBBU1NFUlQoJnN1c3BlbmRlZFBhZ2UtPnByb2Nlc3Mo KSA9PSBtX3Byb2Nlc3MucHRyKCkpOworICAgICAgICBzdXNwZW5kZWRQYWdlLT51bnN1c3BlbmQo KTsKKyAgICAgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5OjpjcmVhdGUobV9wYWdlLCBz dXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpKTsKKyAgICAgICAgbV9wcm9jZXNzLT5mcmFtZUNy ZWF0ZWQoc3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSwgKm1fbWFpbkZyYW1lKTsKKyAgICB9 CisKKyAgICBpbml0aWFsaXplV2ViUGFnZSgpOworfQorCitQcm92aXNpb25hbFBhZ2VQcm94eTo6 flByb3Zpc2lvbmFsUGFnZVByb3h5KCkKK3sKKyAgICBtX3Byb2Nlc3MtPnJlbW92ZVByb3Zpc2lv bmFsUGFnZVByb3h5KCp0aGlzKTsKKworICAgIGlmIChtX3dhc0NvbW1pdHRlZCkKKyAgICAgICAg cmV0dXJuOworCisgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOwor ICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9wYWdlLnBh Z2VJRCgpKTsKKworICAgIGlmIChtX2RyYXdpbmdBcmVhKSB7CisgICAgICAgIGF1dG8gcGFnZVBy b2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nl c3MpOworICAgICAgICBtX2RyYXdpbmdBcmVhID0gbnVsbHB0cjsKKyAgICB9CisKKyAgICBSdW5M b29wOjptYWluKCkuZGlzcGF0Y2goW3Byb2Nlc3MgPSBtX3Byb2Nlc3MuY29weVJlZigpXSB7Cisg ICAgICAgIHByb2Nlc3MtPm1heWJlU2h1dERvd24oKTsKKyAgICB9KTsKK30KKworc3RkOjp1bmlx dWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IFByb3Zpc2lvbmFsUGFnZVByb3h5Ojp0YWtlRHJhd2lu Z0FyZWEoKQoreworICAgIHJldHVybiBXVEZNb3ZlKG1fZHJhd2luZ0FyZWEpOworfQorCit2b2lk IFByb3Zpc2lvbmFsUGFnZVByb3h5OjpjYW5jZWwoKQoreworICAgIC8vIElmIHRoZSBwcm92aXNp b25hbCBsb2FkIHN0YXJ0ZWQsIHRoZW4gaW5kaWNhdGUgdGhhdCBpdCBmYWlsZWQgZHVlIHRvIGNh bmNlbGxhdGlvbiBieSBjYWxsaW5nIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSgpLgor ICAgIGlmIChtX3Byb3Zpc2lvbmFsTG9hZFVSTC5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsK KworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiY2FuY2VsOiBT aW11bGF0aW5nIGEgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lIGZvciBwYWdlSUQgPSAl IiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKKyAg ICBhdXRvIGVycm9yID0gV2ViS2l0OjpjYW5jZWxsZWRFcnJvcihtX3JlcXVlc3QpOworICAgIGVy cm9yLnNldFR5cGUoV2ViQ29yZTo6UmVzb3VyY2VFcnJvcjo6VHlwZTo6Q2FuY2VsbGF0aW9uKTsK KyAgICBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUobV9tYWluRnJhbWUtPmZyYW1lSUQo KSwgeyB9LCBtX25hdmlnYXRpb25JRCwgbV9wcm92aXNpb25hbExvYWRVUkwsIGVycm9yLCBVc2Vy RGF0YSB7IH0pOyAvLyBXaWxsIGRlbGV0ZSB8dGhpc3wuCit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQ YWdlUHJveHk6OnByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmcoKQoreworICAgIGZpbmlzaEluaXRp YWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2goKTsKK30KKwordm9pZCBQcm92aXNpb25h bFBhZ2VQcm94eTo6ZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCgp Cit7CisgICAgQVNTRVJUKG1fcHJvY2Vzcy0+c3RhdGUoKSA9PSBXZWJQcm9jZXNzUHJveHk6OlN0 YXRlOjpSdW5uaW5nKTsKKworICAgIC8vIEZJWE1FOiBUaGUgV2ViUGFnZVByb3h5IGRlbGF5cyBh ZGRpbmcgdGhlIHZpc2l0ZWQgbGluayBzdG9yZSB1bnRpbCBhZnRlciB0aGUgcHJvY2VzcyBoYXMg bGF1bmNoZWQKKyAgICAvLyBzbyB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkgZG9lcyB0aGUgc2Ft ZS4gSG93ZXZlciwgZG8gd2UgcmVhbGx5IG5lZWQgdG8/CisgICAgbV9wcm9jZXNzLT5hZGRWaXNp dGVkTGlua1N0b3JlKG1fcGFnZS52aXNpdGVkTGlua1N0b3JlKCkpOworfQorCit2b2lkIFByb3Zp c2lvbmFsUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSgpCit7CisgICAgYXV0byBwYWdlUHJv Y2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vz cyk7CisgICAgbV9kcmF3aW5nQXJlYSA9IG1fcGFnZS5wYWdlQ2xpZW50KCkuY3JlYXRlRHJhd2lu Z0FyZWFQcm94eSgpOworCisgICAgYXV0byBwYXJhbWV0ZXJzID0gbV9wYWdlLmNyZWF0aW9uUGFy YW1ldGVycygpOworICAgIHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCA9IHRydWU7CisgICAgbV9w cm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpDcmVhdGVXZWJQYWdlKG1fcGFnZS5w YWdlSUQoKSwgcGFyYW1ldGVycyksIDApOworCisgICAgaWYgKG1fcHJvY2Vzcy0+c3RhdGUoKSA9 PSBXZWJQcm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKQorICAgICAgICBmaW5pc2hJbml0aWFs aXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNoKCk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQ YWdlUHJveHk6OmxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0 aW9uLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEsIGNvbnN0IFN0cmluZyYgTUlNRVR5 cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpP YmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQ b2xpY2llcykKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9y YXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBtX3BhZ2UubG9hZERhdGFXaXRo TmF2aWdhdGlvbihuYXZpZ2F0aW9uLCBkYXRhLCBNSU1FVHlwZSwgZW5jb2RpbmcsIGJhc2VVUkws IHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RG TW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6 bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIFdl YkNvcmU6OlJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRl cm5hbFVSTHNQb2xpY3kgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgQVBJOjpPYmplY3Qq IHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2ll cykKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlP dmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBtX3BhZ2UubG9hZFJlcXVlc3RXaXRoTmF2 aWdhdGlvbihuYXZpZ2F0aW9uLCBXVEZNb3ZlKHJlcXVlc3QpLCBzaG91bGRPcGVuRXh0ZXJuYWxV UkxzUG9saWN5LCB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2Fk OjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQ YWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0oQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9u LCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtJiBpdGVtLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNE YXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBhdXRvIGl0ZW1TdGF0ZXMgPSBtX3BhZ2Uu YmFja0ZvcndhcmRMaXN0KCkuZmlsdGVyZWRJdGVtU3RhdGVzKFt0aGlzLCB0YXJnZXRJdGVtID0g Jml0ZW1dKGF1dG8mIGl0ZW0pIHsKKyAgICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBpdGVtLnN1c3Bl bmRlZFBhZ2UoKSkgeworICAgICAgICAgICAgaWYgKCZwYWdlLT5wcm9jZXNzKCkgPT0gbV9wcm9j ZXNzLnB0cigpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAg ICAgICByZXR1cm4gJml0ZW0gIT0gdGFyZ2V0SXRlbTsKKyAgICB9KTsKKyAgICBtX3Byb2Nlc3Mt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlVwZGF0ZUJhY2tGb3J3YXJkTGlzdEZvclJlYXR0YWNo KFdURk1vdmUoaXRlbVN0YXRlcykpLCBtX3BhZ2UucGFnZUlEKCkpOworICAgIG1fcHJvY2Vzcy0+ c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uLm5h dmlnYXRpb25JRCgpLCBpdGVtLml0ZW1JRCgpLCAqbmF2aWdhdGlvbi5iYWNrRm9yd2FyZEZyYW1l TG9hZFR5cGUoKSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdU Rk1vdmUod2Vic2l0ZVBvbGljaWVzKSksIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgbV9wcm9jZXNz LT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBh Z2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCit7CisgICAgUkVM RUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJkaWRDcmVhdGVNYWluRnJhbWU6 IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlE KCksIGZyYW1lSUQpOworICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOworCisgICAgbV9tYWluRnJh bWUgPSBXZWJGcmFtZVByb3h5OjpjcmVhdGUobV9wYWdlLCBmcmFtZUlEKTsKKworICAgIC8vIEFk ZCB0aGUgZnJhbWUgdG8gdGhlIHByb2Nlc3Mgd2lkZSBtYXAuCisgICAgbV9wcm9jZXNzLT5mcmFt ZUNyZWF0ZWQoZnJhbWVJRCwgKm1fbWFpbkZyYW1lKTsKKworICAgIC8vIFRoaXMgbmF2aWdhdGlv biB3YXMgZGVzdHJveWVkIHNvIG5vIG5lZWQgdG8gbm90aWZ5IG9mIHJlZGlyZWN0LgorICAgIGlm ICghbV9wYWdlLm5hdmlnYXRpb25TdGF0ZSgpLmhhc05hdmlnYXRpb24obV9uYXZpZ2F0aW9uSUQp KQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBSZXN0b3JlIHRoZSBtYWluIGZyYW1lJ3MgY29t bWl0dGVkIFVSTCBhcyBzb21lIGNsaWVudHMgbWF5IHJlbHkgb24gaXQgdW50aWwgdGhlIG5leHQg bG9hZCBpcyBjb21taXR0ZWQuCisgICAgaWYgKGF1dG8qIG1haW5GcmFtZSA9IG1fcGFnZS5tYWlu RnJhbWUoKSkKKyAgICAgICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkuc2V0VVJMKG1h aW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS51cmwoKSk7CisKKyAgICAvLyBOb3JtYWxseSwgbm90 aWZpY2F0aW9uIG9mIGEgc2VydmVyIHJlZGlyZWN0IGNvbWVzIGZyb20gdGhlIFdlYkNvbnRlbnQg cHJvY2Vzcy4KKyAgICAvLyBJZiB3ZSBhcmUgcHJvY2VzcyBzd2FwcGluZyBpbiByZXNwb25zZSB0 byBhIHNlcnZlciByZWRpcmVjdCB0aGVuIHRoYXQgbm90aWZpY2F0aW9uIHdpbGwgbm90IGNvbWUg ZnJvbSB0aGUgbmV3IFdlYkNvbnRlbnQgcHJvY2Vzcy4KKyAgICAvLyBJbiB0aGlzIGNhc2Ugd2Ug aGF2ZSB0aGUgVUlQcm9jZXNzIHN5bnRoZXNpemUgdGhlIHJlZGlyZWN0IG5vdGlmaWNhdGlvbiBh dCB0aGUgYXBwcm9wcmlhdGUgdGltZS4KKyAgICBpZiAobV9pc1NlcnZlclJlZGlyZWN0KSB7Cisg ICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLmRpZFN0YXJ0UHJvdmlzaW9uYWxM b2FkKG1fcmVxdWVzdC51cmwoKSk7CisKKyAgICAgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRl ID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgICAg IG1fcGFnZS5kaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFt ZShtX21haW5GcmFtZS0+ZnJhbWVJRCgpLCBtX25hdmlnYXRpb25JRCwgV1RGTW92ZShtX3JlcXVl c3QpLCB7IH0pOworICAgIH0KK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkU3Rh cnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZp Z2F0aW9uSUQsIFVSTCYmIHVybCwgVVJMJiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJEYXRh JiB1c2VyRGF0YSkKK3sKKyAgICAvLyBJZiB0aGUgcHJldmlvdXMgcHJvdmlzaW9uYWwgbG9hZCB1 c2VkIHRoZSBzYW1lIHByb2Nlc3MsIHdlIG1heSByZWNlaXZlIElQQyBmb3IgdGhpcyBwcmV2aW91 cyBwcm92aXNpb25hbCdzIG1haW4gZnJhbWUgdGhhdCB3ZSBuZWVkIHRvIGlnbm9yZS4KKyAgICBp ZiAoIW1fbWFpbkZyYW1lIHx8IG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkgIT0gZnJhbWVJRCkKKyAg ICAgICAgcmV0dXJuOworCisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBp bmcsICJkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOiBwYWdlSUQgPSAlIiBQUkl1NjQg IiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgPSAlIiBQUkl1NjQsIG1fcGFn ZS5wYWdlSUQoKSwgZnJhbWVJRCwgbmF2aWdhdGlvbklEKTsKKyAgICBBU1NFUlQobV9wcm92aXNp b25hbExvYWRVUkwuaXNOdWxsKCkpOworICAgIG1fcHJvdmlzaW9uYWxMb2FkVVJMID0gdXJsOwor CisgICAgLy8gTWVyZWx5IGZvbGxvd2luZyBhIHNlcnZlciBzaWRlIHJlZGlyZWN0IHNvIHRoZXJl IGlzIG5vIG5lZWQgdG8gc2VuZCBhIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkIGFnYWluLgorICAg IGlmIChtX2lzU2VydmVyUmVkaXJlY3QpCisgICAgICAgIHJldHVybjsKKworICAgIC8vIENsaWVu dHMgZXhwZWN0IHRoZSBQYWdlJ3MgbWFpbiBmcmFtZSdzIGV4cGVjdGVkVVJMIHRvIGJlIHRoZSBw cm92aXNpb25hbCBvbmUgd2hlbiBhIHByb3Zpc2lvbmFsIGxvYWQgaXMgc3RhcnRlZC4KKyAgICBp ZiAoYXV0byogcGFnZU1haW5GcmFtZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAgICAgcGFn ZU1haW5GcmFtZS0+ZGlkU3RhcnRQcm92aXNpb25hbExvYWQodXJsKTsKKworICAgIGF1dG8gcGFn ZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3By b2Nlc3MpOworICAgIG1fcGFnZS5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKGZyYW1l SUQsIG5hdmlnYXRpb25JRCwgV1RGTW92ZSh1cmwpLCBXVEZNb3ZlKHVucmVhY2hhYmxlVVJMKSwg dXNlckRhdGEpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlz aW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6U2VjdXJp dHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQs IGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJy b3ImIGVycm9yLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCit7CisgICAgYXV0byBwYWdlUHJv Y2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vz cyk7CisKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZEZh aWxQcm92aXNpb25hbExvYWRGb3JGcmFtZTogcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQg PSAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCks IGZyYW1lSUQsIG5hdmlnYXRpb25JRCk7CisgICAgbV9wcm92aXNpb25hbExvYWRVUkwgPSB7IH07 CisKKyAgICAvLyBNYWtlIHN1cmUgdGhlIFBhZ2UncyBtYWluIGZyYW1lJ3MgZXhwZWN0ZWRVUkwg Z2V0cyBjbGVhcmVkIHNpbmNlIHdlIHVwZGF0ZWQgaXQgaW4gZGlkU3RhcnRQcm92aXNpb25hbExv YWQuCisgICAgaWYgKGF1dG8qIHBhZ2VNYWluRnJhbWUgPSBtX3BhZ2UubWFpbkZyYW1lKCkpCisg ICAgICAgIHBhZ2VNYWluRnJhbWUtPmRpZEZhaWxQcm92aXNpb25hbExvYWQoKTsKKworICAgIG1f cGFnZS5kaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoZnJhbWVJRCwgZnJhbWVTZWN1cml0 eU9yaWdpbiwgbmF2aWdhdGlvbklELCBwcm92aXNpb25hbFVSTCwgZXJyb3IsIHVzZXJEYXRhKTsg Ly8gV2lsbCBkZWxldGUgfHRoaXN8LgorfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpk aWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlv bklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFBy b3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0 ZUluZm8mIGNlcnRpZmljYXRlSW5mbywgYm9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBPcHRp b25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJlQ29udGVu dCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAgIC8vIElmIHRoZSBwcmV2aW91cyBw cm92aXNpb25hbCBsb2FkIHVzZWQgdGhlIHNhbWUgcHJvY2Vzcywgd2UgbWF5IHJlY2VpdmUgSVBD IGZvciB0aGlzIHByZXZpb3VzIHByb3Zpc2lvbmFsJ3MgbWFpbiBmcmFtZSB0aGF0IHdlIG5lZWQg dG8gaWdub3JlLgorICAgIGlmICghbV9tYWluRnJhbWUgfHwgbV9tYWluRnJhbWUtPmZyYW1lSUQo KSAhPSBmcmFtZUlEKQorICAgICAgICByZXR1cm47CisKKyAgICBSRUxFQVNFX0xPR19JRl9BTExP V0VEKFByb2Nlc3NTd2FwcGluZywgImRpZENvbW1pdExvYWRGb3JGcmFtZTogcGFnZUlEID0gJSIg UFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEID0gJSIgUFJJdTY0 LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCk7CisgICAgbV9wcm92aXNp b25hbExvYWRVUkwgPSB7IH07CisgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIo TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFn ZUlEKCkpOworCisgICAgbV93YXNDb21taXR0ZWQgPSB0cnVlOworICAgIG1fcGFnZS5jb21taXRQ cm92aXNpb25hbFBhZ2UoZnJhbWVJRCwgbmF2aWdhdGlvbklELCBtaW1lVHlwZSwgZnJhbWVIYXND dXN0b21Db250ZW50UHJvdmlkZXIsIGZyYW1lTG9hZFR5cGUsIGNlcnRpZmljYXRlSW5mbywgY29u dGFpbnNQbHVnaW5Eb2N1bWVudCwgZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCB1c2VyRGF0YSk7 IC8vIFdpbGwgZGVsZXRlIHx0aGlzfC4KK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6 ZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBJUEM6OkRlY29k ZXImIGRlY29kZXIpCit7CisgICAgQVNTRVJUKGRlY29kZXIubWVzc2FnZVJlY2VpdmVyTmFtZSgp ID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSk7CisKKyAg ICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRp ZFN0YXJ0UHJvZ3Jlc3M6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkg PT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ2hhbmdlUHJvZ3Jlc3M6Om5hbWUoKQorICAg ICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6 QmFja0ZvcndhcmRBZGRJdGVtOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFt ZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkxvZ0RpYWdub3N0aWNNZXNzYWdlOjpuYW1l KCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OkxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aEVuaGFuY2VkUHJpdmFjeTo6bmFtZSgpCisg ICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjpTZXROZXR3b3JrUmVxdWVzdHNJblByb2dyZXNzOjpuYW1lKCkKKyNpZiBQTEFURk9STShDT0NP QSkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OlJlZ2lzdGVyV2ViUHJvY2Vzc0FjY2Vzc2liaWxpdHlUb2tlbjo6bmFtZSgpCisjZW5k aWYKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OkRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYzo6bmFtZSgpCisgICAg ICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpT dGFydFVSTFNjaGVtZVRhc2s6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1l KCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGVjaWRlUG9saWN5Rm9yUmVzcG9uc2U6Om5h bWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6RGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0OjpuYW1lKCkKKyAgICAgICAgfHwgZGVj b2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENoYW5nZVBy b3Zpc2lvbmFsVVJMRm9yRnJhbWU6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VO YW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlv bkRhdGE6Om5hbWUoKSkKKyAgICB7CisgICAgICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9 IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgICAgICBt X3BhZ2UuZGlkUmVjZWl2ZU1lc3NhZ2UoY29ubmVjdGlvbiwgZGVjb2Rlcik7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OkRpZENyZWF0ZU1haW5GcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQ Qzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDcmVhdGVNYWluRnJh bWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZy YW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VO YW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU3RhcnRQcm92aXNpb25hbExvYWRG b3JGcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lPihkZWNvZGVyLCB0 aGlzLCAmUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJh bWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5h bWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWU6Om5hbWUoKSkgeworICAgICAgICBJUEM6OmhhbmRsZU1lc3NhZ2U8TWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6RGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lPihkZWNvZGVyLCB0aGlz LCAmUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgp ID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENvbW1pdExvYWRGb3JGcmFtZTo6bmFtZSgp KSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpE aWRDb21taXRMb2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94 eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAg IExPRyhQcm9jZXNzU3dhcHBpbmcsICJVbmhhbmRsZWQgbWVzc2FnZSAlczo6JXMgZnJvbSBwcm92 aXNpb25hbCBwcm9jZXNzIiwgZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkudG9TdHJpbmco KS5kYXRhKCksIGRlY29kZXIubWVzc2FnZU5hbWUoKS50b1N0cmluZygpLmRhdGEoKSk7Cit9CisK K3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVTeW5jTWVzc2FnZShJUEM6OkNv bm5lY3Rpb24mIGNvbm5lY3Rpb24sIElQQzo6RGVjb2RlciYgZGVjb2Rlciwgc3RkOjp1bmlxdWVf cHRyPElQQzo6RW5jb2Rlcj4mIGVuY29kZXIpCit7CisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5h bWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpCYWNrRm9yd2FyZEl0ZW1BdEluZGV4Ojpu YW1lKCkgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 OkJhY2tGb3J3YXJkR29Ub0l0ZW06Om5hbWUoKSkgeworICAgICAgICBhdXRvIHBhZ2VQcm9jZXNz T3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsK KyAgICAgICAgbV9wYWdlLmRpZFJlY2VpdmVTeW5jTWVzc2FnZShjb25uZWN0aW9uLCBkZWNvZGVy LCBlbmNvZGVyKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIExPRyhQcm9jZXNzU3dh cHBpbmcsICJVbmhhbmRsZWQgc3luYyBtZXNzYWdlICVzOjolcyBmcm9tIHByb3Zpc2lvbmFsIHBy b2Nlc3MiLCBkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKS50b1N0cmluZygpLmRhdGEoKSwg ZGVjb2Rlci5tZXNzYWdlTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgpKTsKK30KKworfSAvLyBuYW1l c3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNp b25hbFBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdl UHJveHkuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi45MDIwZDgxZjZmNWY1ZGYwZTQ5YTBiYTZiMmIwMzEwZDRiMzBm ZDg3Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9u YWxQYWdlUHJveHkuaApAQCAtMCwwICsxLDkzIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE5 IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1v ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u ZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29k ZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRp c3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHly aWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIg bWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNP RlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBB UyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJ TkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVS Q0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJF IERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJV VE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwg U1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJ TkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09P RFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVT UworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBM SUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBU T1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFO WSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9G CisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI3ByYWdtYSBvbmNl CisKKyNpbmNsdWRlICJNZXNzYWdlUmVjZWl2ZXIuaCIKKworbmFtZXNwYWNlIFdlYkNvcmUgewor Y2xhc3MgUmVzb3VyY2VSZXF1ZXN0OworfQorCituYW1lc3BhY2UgV2ViS2l0IHsKKworY2xhc3Mg RHJhd2luZ0FyZWFQcm94eTsKK2NsYXNzIFN1c3BlbmRlZFBhZ2VQcm94eTsKK2NsYXNzIFdlYkZy YW1lUHJveHk7CitjbGFzcyBXZWJQYWdlUHJveHk7CitjbGFzcyBXZWJQcm9jZXNzUHJveHk7CisK K2NsYXNzIFByb3Zpc2lvbmFsUGFnZVByb3h5IDogcHVibGljIElQQzo6TWVzc2FnZVJlY2VpdmVy IHsKKyAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKK3B1YmxpYzoKKyAgICBQcm92aXNpb25h bFBhZ2VQcm94eShXZWJQYWdlUHJveHkmLCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmLCBzdGQ6OnVu aXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBib29s IGlzU2VydmVyUmVkaXJlY3QsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIFByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpOworICAgIH5Qcm92aXNpb25hbFBhZ2VQcm94eSgpOwor CisgICAgV2ViUGFnZVByb3h5JiBwYWdlKCkgeyByZXR1cm4gbV9wYWdlOyB9CisgICAgV2ViRnJh bWVQcm94eSogbWFpbkZyYW1lKCkgY29uc3QgeyByZXR1cm4gbV9tYWluRnJhbWUuZ2V0KCk7IH0K KyAgICBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MoKSB7IHJldHVybiBtX3Byb2Nlc3MuZ2V0KCk7 IH0KKyAgICBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVk QnlDbGllbnQoKSBjb25zdCB7IHJldHVybiBtX3Byb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQ7 IH0KKyAgICB1aW50NjRfdCBuYXZpZ2F0aW9uSUQoKSBjb25zdCB7IHJldHVybiBtX25hdmlnYXRp b25JRDsgfQorCisgICAgRHJhd2luZ0FyZWFQcm94eSogZHJhd2luZ0FyZWEoKSBjb25zdCB7IHJl dHVybiBtX2RyYXdpbmdBcmVhLmdldCgpOyB9CisgICAgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdB cmVhUHJveHk+IHRha2VEcmF3aW5nQXJlYSgpOworCisgICAgdm9pZCBsb2FkRGF0YVdpdGhOYXZp Z2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYsIGNvbnN0 IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYg YmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNE YXRhPiYmID0gV1RGOjpudWxsb3B0KTsKKyAgICB2b2lkIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRp b24oQVBJOjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6 OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0 aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7CisgICAgdm9pZCBn b1RvQmFja0ZvcndhcmRJdGVtKEFQSTo6TmF2aWdhdGlvbiYsIFdlYkJhY2tGb3J3YXJkTGlzdEl0 ZW0mLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmKTsKKyAgICB2b2lkIGNhbmNlbCgp OworCisgICAgdm9pZCBwcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5nKCk7CisKK3ByaXZhdGU6Cisg ICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKKyAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQ Qzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIGZpbmFsOworICAgIHZvaWQgZGlkUmVjZWl2 ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYsIHN0ZDo6dW5pcXVl X3B0cjxJUEM6OkVuY29kZXI+JikgZmluYWw7CisKKyAgICB2b2lkIGRpZENyZWF0ZU1haW5GcmFt ZSh1aW50NjRfdCBmcmFtZUlEKTsKKyAgICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiwgVVJM JiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRDb21taXRM b2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25z dCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1 aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mLCBi b29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJl Q29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYpOworICAg IHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNv bnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWlu dDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJMLCBjb25zdCBX ZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgY29uc3QgVXNlckRhdGEmKTsKKworICAgIHZvaWQgaW5p dGlhbGl6ZVdlYlBhZ2UoKTsKKyAgICB2b2lkIGZpbmlzaEluaXRpYWxpemluZ1dlYlBhZ2VBZnRl clByb2Nlc3NMYXVuY2goKTsKKworICAgIFdlYlBhZ2VQcm94eSYgbV9wYWdlOworICAgIFJlZjxX ZWJQcm9jZXNzUHJveHk+IG1fcHJvY2VzczsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0Fy ZWFQcm94eT4gbV9kcmF3aW5nQXJlYTsKKyAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9tYWlu RnJhbWU7CisgICAgdWludDY0X3QgbV9uYXZpZ2F0aW9uSUQ7CisgICAgYm9vbCBtX2lzU2VydmVy UmVkaXJlY3Q7CisgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IG1fcmVxdWVzdDsKKyAgICBQ cm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVu dDsKKyAgICBib29sIG1fd2FzQ29tbWl0dGVkIHsgZmFsc2UgfTsKKyAgICBVUkwgbV9wcm92aXNp b25hbExvYWRVUkw7CisKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIFByb2Nlc3NUaHJv dHRsZXI6OkJhY2tncm91bmRBY3Rpdml0eVRva2VuIG1fc3VzcGVuc2lvblRva2VuOworI2VuZGlm Cit9OworCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwCmluZGV4IGYxOThhODE1MzNmNzZiMmU4ZTJiZjcxZDRh M2I5ZDI3NDBjOTUwNzguLmZmNzZkOWY3Zjk3YWM2ZmE0ZmJiMzAyZjY0NjY2MWQxNjc4YWUyNTcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcApA QCAtMTAwLDcgKzEwMCw5IEBAIFN1c3BlbmRlZFBhZ2VQcm94eTo6flN1c3BlbmRlZFBhZ2VQcm94 eSgpCiAgICAgLy8gSWYgdGhlIHN1c3BlbmRlZCBwYWdlIHdhcyBub3QgY29uc3VtZWQgYmVmb3Jl IGdldHRpbmcgZGVzdHJveWVkLCB0aGVuIGNsb3NlIHRoZSBjb3JyZXNwb25kaW5nIHBhZ2UKICAg ICAvLyBvbiB0aGUgV2ViUHJvY2VzcyBzaWRlLgogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdl czo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKLSAgICBtX3Byb2Nlc3MtPnJl bW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2 ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisKKyAgICBpZiAobV9zdXNwZW5zaW9uU3RhdGUg PT0gU3VzcGVuc2lvblN0YXRlOjpTdXNwZW5kaW5nKQorICAgICAgICBtX3Byb2Nlc3MtPnJlbW92 ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJO YW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CiAKICAgICAvLyBXZSBjYWxsIG1heWJlU2h1dERvd24o KSBhc3luY2hyb25vdXNseSBzaW5jZSB0aGUgU3VzcGVuZGVkUGFnZSBpcyBjdXJyZW50bHkgYmVp bmcgcmVtb3ZlZCBmcm9tIHRoZSBXZWJQcm9jZXNzUG9vbAogICAgIC8vIGFuZCB3ZSB3YW50IHRv IGF2b2lkIHJlLWVudGVyaW5nIFdlYlByb2Nlc3NQb29sIG1ldGhvZHMuCkBAIC0xMzQsNyArMTM2 LDYgQEAgdm9pZCBTdXNwZW5kZWRQYWdlUHJveHk6OnVuc3VzcGVuZCgpCiAgICAgQVNTRVJUKG1f c3VzcGVuc2lvblN0YXRlID09IFN1c3BlbnNpb25TdGF0ZTo6U3VzcGVuZGVkKTsKIAogICAgIG1f c3VzcGVuc2lvblN0YXRlID0gU3VzcGVuc2lvblN0YXRlOjpSZXN1bWVkOwotICAgIG1fcHJvY2Vz cy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VS ZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OlNldElzU3VzcGVuZGVkKGZhbHNlKSwgbV9wYWdlLnBhZ2VJRCgpKTsK IH0KIApAQCAtMTUxLDYgKzE1Miw4IEBAIHZvaWQgU3VzcGVuZGVkUGFnZVByb3h5OjpkaWRQcm9j ZXNzUmVxdWVzdFRvU3VzcGVuZChTdXNwZW5zaW9uU3RhdGUgbmV3U3VzcGVuc2lvCiAgICAgbV9z dXNwZW5zaW9uVG9rZW4gPSBudWxscHRyOwogI2VuZGlmCiAKKyAgICBtX3Byb2Nlc3MtPnJlbW92 ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJO YW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisKICAgICBpZiAobV9yZWFkeVRvVW5zdXNwZW5kSGFu ZGxlcikKICAgICAgICAgbV9yZWFkeVRvVW5zdXNwZW5kSGFuZGxlcih0aGlzKTsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKaW5kZXggYzc3YTI2Yjc0MjdjMzFj ODI4ZTJlYWEyMjFmODA3MGI3N2FkZDI2Mi4uNTNjNzE5NmMyYWEwYTMzZDIyMDc1ODE5MGNkNGJk OTVhNWNkMDI1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQ cm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAK QEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJXZWJGcmFtZVByb3h5LmgiCiAKICNpbmNsdWRl ICJBUElOYXZpZ2F0aW9uLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNp bmNsdWRlICJXZWJDZXJ0aWZpY2F0ZUluZm8uaCIKICNpbmNsdWRlICJXZWJGcmFtZVBvbGljeUxp c3RlbmVyUHJveHkuaCIKICNpbmNsdWRlICJXZWJQYWdlTWVzc2FnZXMuaCIKQEAgLTc0LDcgKzc1 LDcgQEAgYm9vbCBXZWJGcmFtZVByb3h5Ojppc01haW5GcmFtZSgpIGNvbnN0CiAgICAgaWYgKCFt X3BhZ2UpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHJldHVybiB0aGlzID09IG1fcGFn ZS0+bWFpbkZyYW1lKCk7CisgICAgcmV0dXJuIHRoaXMgPT0gbV9wYWdlLT5tYWluRnJhbWUoKSB8 fCAobV9wYWdlLT5wcm92aXNpb25hbFBhZ2VQcm94eSgpICYmIHRoaXMgPT0gbV9wYWdlLT5wcm92 aXNpb25hbFBhZ2VQcm94eSgpLT5tYWluRnJhbWUoKSk7CiB9CiAKIHZvaWQgV2ViRnJhbWVQcm94 eTo6bG9hZFVSTChjb25zdCBVUkwmIHVybCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCmluZGV4IGM4YWI3MDMzM2I0MDM5YTg3NzljNGNhM2YzMWUxOTA3NTYzYTMzNjku LmQzMWNlYTE1YjcxZDA2OGQ2OGVkOTU0NmVkOTc5N2E4MWRhNGE0ZDkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNzcsNiArNzcsNyBAQAogI2luY2x1ZGUg IlBsdWdpbkluZm9ybWF0aW9uLmgiCiAjaW5jbHVkZSAiUGx1Z2luUHJvY2Vzc01hbmFnZXIuaCIK ICNpbmNsdWRlICJQcmludEluZm8uaCIKKyNpbmNsdWRlICJQcm92aXNpb25hbFBhZ2VQcm94eS5o IgogI2luY2x1ZGUgIlNhZmVCcm93c2luZ1dhcm5pbmcuaCIKICNpbmNsdWRlICJTaGFyZVNoZWV0 Q2FsbGJhY2tJRC5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlckRhdGFSZWZlcmVuY2UuaCIKQEAg LTU0NSw2ICs1NDYsMTMgQEAgUEFMOjpTZXNzaW9uSUQgV2ViUGFnZVByb3h5OjpzZXNzaW9uSUQo KSBjb25zdAogICAgIHJldHVybiBtX3dlYnNpdGVEYXRhU3RvcmUtPnNlc3Npb25JRCgpOwogfQog CitEcmF3aW5nQXJlYVByb3h5KiBXZWJQYWdlUHJveHk6OmRyYXdpbmdBcmVhKCkgY29uc3QKK3sK KyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UgJiYgbV9wcm9jZXNzLnB0cigpID09ICZtX3Byb3Zp c2lvbmFsUGFnZS0+cHJvY2VzcygpICYmIG1fcHJvdmlzaW9uYWxQYWdlLT5kcmF3aW5nQXJlYSgp KQorICAgICAgICByZXR1cm4gbV9wcm92aXNpb25hbFBhZ2UtPmRyYXdpbmdBcmVhKCk7CisgICAg cmV0dXJuIG1fZHJhd2luZ0FyZWEuZ2V0KCk7Cit9CisKIHZvaWQgV2ViUGFnZVByb3h5OjpjaGFu Z2VXZWJzaXRlRGF0YVN0b3JlKFdlYnNpdGVEYXRhU3RvcmUmIHdlYnNpdGVEYXRhU3RvcmUpCiB7 CiAgICAgbV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgpLnBhZ2VFbmRVc2luZ1dlYnNpdGVEYXRhU3Rv cmUoKnRoaXMpOwpAQCAtNzY4LDM4ICs3NzYsMjYgQEAgYm9vbCBXZWJQYWdlUHJveHk6OnN1c3Bl bmRDdXJyZW50UGFnZUlmUG9zc2libGUoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBPcHQK ICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OnN3YXBUb1dlYlByb2Nl c3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVu ZGVkUGFnZVByb3h5PiYmIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSwgSXNTd2FwRnJvbVN1c3Bl bmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9pZCBXZWJQYWdlUHJveHk6OnN3YXBUb1dlYlBy b2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVuaXF1ZV9wdHI8RHJh d2luZ0FyZWFQcm94eT4mJiBkcmF3aW5nQXJlYSwgUmVmUHRyPFdlYkZyYW1lUHJveHk+JiYgbWFp bkZyYW1lKQogewogICAgIEFTU0VSVCghbV9pc0Nsb3NlZCk7CiAgICAgUkVMRUFTRV9MT0dfSUZf QUxMT1dFRChMb2FkaW5nLCAic3dhcFRvV2ViUHJvY2Vzczogd2ViUElEID0gJWksIHBhZ2VJRCA9 ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCk7CiAK ICAgICBtX3Byb2Nlc3MgPSBXVEZNb3ZlKHByb2Nlc3MpOworICAgIEFTU0VSVCghbV9kcmF3aW5n QXJlYSk7CisgICAgc2V0RHJhd2luZ0FyZWEoV1RGTW92ZShkcmF3aW5nQXJlYSkpOworICAgIEFT U0VSVCghbV9tYWluRnJhbWUpOworICAgIG1fbWFpbkZyYW1lID0gV1RGTW92ZShtYWluRnJhbWUp OwogICAgIG1faXNWYWxpZCA9IHRydWU7CiAKLSAgICAvLyBJZiB3ZSBhcmUgcmVhdHRhY2hpbmcg dG8gYSBTdXNwZW5kZWRQYWdlLCB0aGVuIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdlIGFscmVhZHkg ZXhpc3RzIGFuZAotICAgIC8vIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKCkgd2ls bCBub3QgYmUgY2FsbGVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUuIEluIHN1Y2gKLSAgICAv LyBjYXNlLCB3ZSBuZWVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUgdG8gcmVmbGVjdCB0aGUg ZmFjdCB0aGUgdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UKLSAgICAvLyBhbHJlYWR5IGV4aXN0cyBh bmQgYWxyZWFkeSBoYXMgYSBtYWluIGZyYW1lLgotICAgIGlmIChkZXN0aW5hdGlvblN1c3BlbmRl ZFBhZ2UpIHsKLSAgICAgICAgaWYgKCFkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPmZhaWxlZFRv U3VzcGVuZCgpKSB7Ci0gICAgICAgICAgICBBU1NFUlQoIW1fbWFpbkZyYW1lKTsKLSAgICAgICAg ICAgIEFTU0VSVCgmZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5wcm9jZXNzKCkgPT0gbV9wcm9j ZXNzLnB0cigpKTsKLSAgICAgICAgICAgIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZS0+dW5zdXNw ZW5kKCk7Ci0gICAgICAgICAgICBtX21haW5GcmFtZSA9IFdlYkZyYW1lUHJveHk6OmNyZWF0ZSgq dGhpcywgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpKTsKLSAgICAgICAg ICAgIG1fcHJvY2Vzcy0+ZnJhbWVDcmVhdGVkKGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZS0+bWFp bkZyYW1lSUQoKSwgKm1fbWFpbkZyYW1lKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAg IC8vIFdlIGZhaWxlZCB0byBzdXNwZW5kIHRoZSBwYWdlIHNvIGRlc3Ryb3kgaXQgbm93IGFuZCBt ZXJlbHkgcmV1c2UgaXRzIFdlYkNvbnRlbnQgcHJvY2Vzcy4KLSAgICAgICAgICAgIGRlc3RpbmF0 aW9uU3VzcGVuZGVkUGFnZSA9IG51bGxwdHI7Ci0gICAgICAgIH0KLSAgICB9Ci0KICAgICBtX3By b2Nlc3MtPmFkZEV4aXN0aW5nV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQsIFdlYlByb2Nlc3NQcm94 eTo6QmVnaW5zVXNpbmdEYXRhU3RvcmU6Ok5vKTsKICAgICBtX3Byb2Nlc3MtPmFkZE1lc3NhZ2VS ZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1f cGFnZUlELCAqdGhpcyk7CiAKLSAgICBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoaXNTd2Fw RnJvbVN1c3BlbmRlZCk7CisgICAgLy8gTm8gbmVlZCB0byBpbml0aWFsaXplIHRoZSBXZWJQYWdl IHNpbmNlIGl0IHdhcyBjcmVhdGVkIHdoZW4gd2UgY3JlYXRlZCB0aGUgUHJvdmlzaW9uYWxQYWdl UHJveHkuCisgICAgZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKFNob3VsZEluaXRpYWxpemVX ZWJQYWdlOjpObyk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hpbmdUb1dl YlByb2Nlc3MoSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9pZCBX ZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhTaG91bGRJbml0aWFsaXpl V2ViUGFnZSBzaG91bGRJbml0aWFsaXplUGFnZSkKIHsKICAgICBBU1NFUlQobV9wcm9jZXNzLT5z dGF0ZSgpICE9IENoaWxkUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6VGVybWluYXRlZCk7CiAKQEAgLTgz NSw3ICs4MzEsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9j ZXNzKElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1cwogICAgIG1fZWRpdGFibGVJbWFn ZUNvbnRyb2xsZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyPigq dGhpcyk7CiAjZW5kaWYKIAotICAgIGluaXRpYWxpemVXZWJQYWdlKGlzU3dhcEZyb21TdXNwZW5k ZWQpOworICAgIGlmIChzaG91bGRJbml0aWFsaXplUGFnZSA9PSBTaG91bGRJbml0aWFsaXplV2Vi UGFnZTo6WWVzKQorICAgICAgICBpbml0aWFsaXplV2ViUGFnZSgpOwogCiAgICAgbV9pbnNwZWN0 b3ItPnVwZGF0ZUZvck5ld1BhZ2VQcm9jZXNzKHRoaXMpOwogCkBAIC05MDAsMTIgKzg5NywxMSBA QCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9XZWJQcm9j ZXNzV2l0aEl0ZW0oV2ViQmFja0ZvcndhcgogICAgIHJldHVybiBXVEZNb3ZlKG5hdmlnYXRpb24p OwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoSXNTd2FwRnJvbVN1 c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9pZCBXZWJQYWdlUHJveHk6OnNldERyYXdp bmdBcmVhKHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmIGRyYXdpbmdBcmVhKQog ewotICAgIEFTU0VSVChpc1ZhbGlkKCkpOwotCi0gICAgbV9kcmF3aW5nQXJlYSA9IHBhZ2VDbGll bnQoKS5jcmVhdGVEcmF3aW5nQXJlYVByb3h5KCk7Ci0gICAgQVNTRVJUKG1fZHJhd2luZ0FyZWEp OworICAgIG1fZHJhd2luZ0FyZWEgPSBXVEZNb3ZlKGRyYXdpbmdBcmVhKTsKKyAgICBpZiAoIW1f ZHJhd2luZ0FyZWEpCisgICAgICAgIHJldHVybjsKIAogI2lmIEVOQUJMRShBU1lOQ19TQ1JPTExJ TkcpICYmIFBMQVRGT1JNKENPQ09BKQogICAgIGlmIChtX2RyYXdpbmdBcmVhLT50eXBlKCkgPT0g RHJhd2luZ0FyZWFUeXBlUmVtb3RlTGF5ZXJUcmVlKSB7CkBAIC05MTYsMTUgKzkxMiwxNiBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoSXNTd2FwRnJvbVN1c3BlbmRlZCBp c1N3YXBGcm9tU3VzcGVuZGVkKQogI2VuZGlmCiAgICAgfQogI2VuZGlmCit9CiAKLSAgICBhdXRv IHBhcmFtZXRlcnMgPSBjcmVhdGlvblBhcmFtZXRlcnMoKTsKLSAgICBwYXJhbWV0ZXJzLmlzU3dh cEZyb21TdXNwZW5kZWQgPSBpc1N3YXBGcm9tU3VzcGVuZGVkID09IElzU3dhcEZyb21TdXNwZW5k ZWQ6OlllczsKK3ZvaWQgV2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSgpCit7CisgICAg QVNTRVJUKGlzVmFsaWQoKSk7CiAKLSNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCi0gICAgcGFy YW1ldGVycy5oYXNSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMgPSBwcm9jZXNzKCkucHJvY2Vzc1Bv b2woKS5tYXlIYXZlUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXJzKG1fd2Vic2l0ZURhdGFTdG9yZSk7 Ci0jZW5kaWYKKyAgICBzZXREcmF3aW5nQXJlYShwYWdlQ2xpZW50KCkuY3JlYXRlRHJhd2luZ0Fy ZWFQcm94eSgpKTsKKyAgICBBU1NFUlQobV9kcmF3aW5nQXJlYSk7CiAKLSAgICBwcm9jZXNzKCku c2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6Q3JlYXRlV2ViUGFnZShtX3BhZ2VJRCwgcGFyYW1l dGVycyksIDApOworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpDcmVh dGVXZWJQYWdlKG1fcGFnZUlELCBjcmVhdGlvblBhcmFtZXRlcnMoKSksIDApOwogCiAgICAgbV9u ZWVkc1RvRmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCA9IHRydWU7 CiAgICAgZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCgpOwpAQCAt MTA3Niw3ICsxMDczLDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRSZXF1ZXN0V2l0aE5hdmln YXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBSZXNvdXIKICAgICBhdXRvIHRyYW5z YWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CiAKICAgICBhdXRvIHVybCA9 IHJlcXVlc3QudXJsKCk7Ci0gICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1ZXN0 VVJMKHRyYW5zYWN0aW9uLCB1cmwpOworICAgIGlmIChzaG91bGRUcmVhdEFzQ29udGludWluZ0xv YWQgIT0gU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMpCisgICAgICAgIG1fcGFnZUxv YWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFuc2FjdGlvbiwgdXJsKTsKIAogICAg IGlmICghaXNWYWxpZCgpKQogICAgICAgICByZWF0dGFjaFRvV2ViUHJvY2VzcygpOwpAQCAtMTI5 NCw2ICsxMjkyLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnN0b3BMb2FkaW5nKCkKICAgICB9CiAK ICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlN0b3BMb2FkaW5nKCksIG1f cGFnZUlEKTsKKyAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7CiAgICAgbV9wcm9jZXNz LT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKIH0KIApAQCAtMjY5OCw3ICsyNjk3LDcg QEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uKFdl YlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24KICAgICAgICAgfQogCiAgICAgICAgIGlmIChwcm9j ZXNzRm9yTmF2aWdhdGlvbi5wdHIoKSAhPSAmcHJvY2VzcygpKSB7Ci0gICAgICAgICAgICBwb2xp Y3lBY3Rpb24gPSBpc1BhZ2VPcGVuZWRCeURPTVNob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgp ID8gV2ViUG9saWN5QWN0aW9uOjpJZ25vcmUgOiBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQ7Cisg ICAgICAgICAgICBwb2xpY3lBY3Rpb24gPSBXZWJQb2xpY3lBY3Rpb246Oklnbm9yZTsKICAgICAg ICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiZGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiwgc3dhcHBpbmcgcHJvY2VzcyAlaSB3aXRoIHByb2Nlc3Mg JWkgZm9yIG5hdmlnYXRpb24sIHJlYXNvbjogJXtwdWJsaWN9cyIsIHByb2Nlc3NJZGVudGlmaWVy KCksIHByb2Nlc3NGb3JOYXZpZ2F0aW9uLT5wcm9jZXNzSWRlbnRpZmllcigpLCByZWFzb24udXRm OCgpLmRhdGEoKSk7CiAgICAgICAgICAgICBMT0coUHJvY2Vzc1N3YXBwaW5nLCAiKFByb2Nlc3NT d2FwcGluZykgU3dpdGNoaW5nIGZyb20gcHJvY2VzcyAlaSB0byBuZXcgcHJvY2VzcyAoJWkpIGZv ciBuYXZpZ2F0aW9uICUiIFBSSXU2NCAiICclcyciLCBwcm9jZXNzSWRlbnRpZmllcigpLCBwcm9j ZXNzRm9yTmF2aWdhdGlvbi0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbmF2aWdhdGlvbi0+bmF2aWdh dGlvbklEKCksIG5hdmlnYXRpb24tPmxvZ2dpbmdTdHJpbmcoKSk7CiAgICAgICAgIH0gZWxzZQpA QCAtMjcwNyw4ICsyNzA2LDE0IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZE5hdmlnYXRp b25Qb2xpY3lEZWNpc2lvbihXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uCiAgICAgICAgIGJv b2wgc2hvdWxkUHJvY2Vzc1N3YXAgPSBwcm9jZXNzRm9yTmF2aWdhdGlvbi5wdHIoKSAhPSAmcHJv Y2VzcygpOwogICAgICAgICByZWNlaXZlZFBvbGljeURlY2lzaW9uKHBvbGljeUFjdGlvbiwgbmF2 aWdhdGlvbi5wdHIoKSwgc2hvdWxkUHJvY2Vzc1N3YXAgPyBXVEY6Om51bGxvcHQgOiBXVEZNb3Zl KGRhdGEpLCBXVEZNb3ZlKHNlbmRlcikpOwogCi0gICAgICAgIGlmIChzaG91bGRQcm9jZXNzU3dh cCkKLSAgICAgICAgICAgIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhuYXZpZ2F0aW9u LCBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UgPyBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS50YWtl U3VzcGVuZGVkUGFnZSgqZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlKSA6IG51bGxwdHIsIFdURk1v dmUocHJvY2Vzc0Zvck5hdmlnYXRpb24pLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBX VEZNb3ZlKGRhdGEpKTsKKyAgICAgICAgaWYgKCFzaG91bGRQcm9jZXNzU3dhcCkKKyAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICBhdXRvIHN1c3BlbmRlZFBhZ2UgPSBkZXN0aW5hdGlvblN1 c3BlbmRlZFBhZ2UgPyBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS50YWtlU3VzcGVuZGVkUGFnZSgq ZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlKSA6IG51bGxwdHI7CisgICAgICAgIGlmIChzdXNwZW5k ZWRQYWdlICYmIHN1c3BlbmRlZFBhZ2UtPmZhaWxlZFRvU3VzcGVuZCgpKQorICAgICAgICAgICAg c3VzcGVuZGVkUGFnZSA9IG51bGxwdHI7CisKKyAgICAgICAgY29udGludWVOYXZpZ2F0aW9uSW5O ZXdQcm9jZXNzKG5hdmlnYXRpb24sIFdURk1vdmUoc3VzcGVuZGVkUGFnZSksIFdURk1vdmUocHJv Y2Vzc0Zvck5hdmlnYXRpb24pLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBXVEZNb3Zl KGRhdGEpKTsKICAgICB9KTsKIH0KIApAQCAtMjc0NCwyNCArMjc0OSw0NSBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6cmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihXZWJQb2xpY3lBY3Rpb24gYWN0aW9uLCBB UEk6Ok5hdmlnYXRpbwogICAgIHNlbmRlci0+c2VuZChhY3Rpb24sIG5hdmlnYXRpb24gPyBuYXZp Z2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSA6IDAsIGRvd25sb2FkSUQsIFdURk1vdmUod2Vic2l0ZVBv bGljaWVzKSk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojpjb250aW51ZU5hdmlnYXRpb25Jbk5l d1Byb2Nlc3MoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBzdGQ6OnVuaXF1ZV9wdHI8U3Vz cGVuZGVkUGFnZVByb3h5PiYmIHN1c3BlbmRlZFBhZ2VQcm94eSwgUmVmPFdlYlByb2Nlc3NQcm94 eT4mJiBwcm9jZXNzLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVx dWVzdGVkQnlDbGllbnQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBv bGljaWVzKQordm9pZCBXZWJQYWdlUHJveHk6OmNvbW1pdFByb3Zpc2lvbmFsUGFnZSh1aW50NjRf dCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUs IGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90IGZyYW1lTG9hZFR5 cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYgY2VydGlmaWNhdGVJbmZvLCBib29s IGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29u dGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEp CiB7Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiY29udGludWVOYXZpZ2F0 aW9uSW5OZXdQcm9jZXNzOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nl c3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKLSAgICBMT0coTG9hZGluZywgIkNv bnRpbnVpbmcgbmF2aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMnIGluIGEgbmV3IHdlYiBwcm9jZXNz IiwgbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi5sb2dnaW5nU3RyaW5nKCkp OworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFnZSk7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxM T1dFRChMb2FkaW5nLCAiY29tbWl0UHJvdmlzaW9uYWxQYWdlOiBwcmV2aW91c1BJRCA9ICVpLCBu ZXdQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlm aWVyKCksIG1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCkucHJvY2Vzc0lkZW50aWZpZXIoKSwg bV9wYWdlSUQpOwogCi0gICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gcHJldmlvdXNQcm9jZXNzID0g bV9wcm9jZXNzLmNvcHlSZWYoKTsKICAgICBPcHRpb25hbDx1aW50NjRfdD4gbWFpbkZyYW1lSURJ blByZXZpb3VzUHJvY2VzcyA9IG1fbWFpbkZyYW1lID8gbWFrZU9wdGlvbmFsKG1fbWFpbkZyYW1l LT5mcmFtZUlEKCkpIDogV1RGOjpudWxsb3B0OwotICAgIGF1dG8gbWFpbkZyYW1lVVJMID0gbV9t YWluRnJhbWUgPyBtX21haW5GcmFtZS0+dXJsKCkgOiBVUkwoKTsKIAotICAgIEFTU0VSVChtX3By b2Nlc3MucHRyKCkgIT0gcHJvY2Vzcy5wdHIoKSk7CisgICAgQVNTRVJUKG1fcHJvY2Vzcy5wdHIo KSAhPSAmbV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3MoKSk7CiAKICAgICBwcm9jZXNzRGlkVGVy bWluYXRlKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbjo6TmF2aWdhdGlvblN3YXApOwogCiAgICAg bV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6 bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2VJRCk7Ci0gICAgYm9vbCBkaWRTdXNwZW5kUHJl dmlvdXNQYWdlID0gc3VzcGVuZEN1cnJlbnRQYWdlSWZQb3NzaWJsZShuYXZpZ2F0aW9uLCBtYWlu RnJhbWVJREluUHJldmlvdXNQcm9jZXNzLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KTsK KyAgICBhdXRvKiBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlvbihtX3By b3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkpOworICAgIGJvb2wgZGlkU3VzcGVuZFByZXZp b3VzUGFnZSA9IG5hdmlnYXRpb24gPyBzdXNwZW5kQ3VycmVudFBhZ2VJZlBvc3NpYmxlKCpuYXZp Z2F0aW9uLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzLCBtX3Byb3Zpc2lvbmFsUGFnZS0+ cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCgpKSA6IGZhbHNlOwogICAgIG1fcHJvY2Vzcy0+ cmVtb3ZlV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQsIFdlYlByb2Nlc3NQcm94eTo6RW5kc1VzaW5n RGF0YVN0b3JlOjpObyk7CiAKLSAgICBzd2FwVG9XZWJQcm9jZXNzKFdURk1vdmUocHJvY2Vzcyks IFdURk1vdmUoc3VzcGVuZGVkUGFnZVByb3h5KSwgZGlkU3VzcGVuZFByZXZpb3VzUGFnZSA/IElz U3dhcEZyb21TdXNwZW5kZWQ6OlllcyA6IElzU3dhcEZyb21TdXNwZW5kZWQ6Ok5vKTsKKyAgICAv LyBUaGVyZSBpcyBubyB3YXkgd2UnbGwgYmUgYWJsZSB0byByZXR1cm4gdG8gdGhlIHBhZ2UgaW4g dGhlIHByZXZpb3VzIHBhZ2Ugc28gY2xvc2UgaXQuCisgICAgaWYgKCFkaWRTdXNwZW5kUHJldmlv dXNQYWdlKQorICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNsb3Nl KCksIHBhZ2VJRCgpKTsKKworICAgIHN3YXBUb1dlYlByb2Nlc3MobV9wcm92aXNpb25hbFBhZ2Ut PnByb2Nlc3MoKSwgbV9wcm92aXNpb25hbFBhZ2UtPnRha2VEcmF3aW5nQXJlYSgpLCBtX3Byb3Zp c2lvbmFsUGFnZS0+bWFpbkZyYW1lKCkpOworCisgICAgZGlkQ29tbWl0TG9hZEZvckZyYW1lKGZy YW1lSUQsIG5hdmlnYXRpb25JRCwgbWltZVR5cGUsIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3Zp ZGVyLCBmcmFtZUxvYWRUeXBlLCBjZXJ0aWZpY2F0ZUluZm8sIGNvbnRhaW5zUGx1Z2luRG9jdW1l bnQsIGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgdXNlckRhdGEpOworCisgICAgbV9wcm92aXNp b25hbFBhZ2UgPSBudWxscHRyOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6Y29udGludWVOYXZp Z2F0aW9uSW5OZXdQcm9jZXNzKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgc3RkOjp1bmlx dWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiBzdXNwZW5kZWRQYWdlUHJveHksIFJlZjxXZWJQ cm9jZXNzUHJveHk+JiYgbmV3UHJvY2VzcywgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBw cm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRh PiYmIHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRp bmcsICJjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3M6IHdlYlBJRCA9ICVpLCBwYWdlSUQg PSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQpOwor ICAgIExPRyhMb2FkaW5nLCAiQ29udGludWluZyBuYXZpZ2F0aW9uICUiIFBSSXU2NCAiICclcycg aW4gYSBuZXcgd2ViIHByb2Nlc3MiLCBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBuYXZpZ2F0 aW9uLmxvZ2dpbmdTdHJpbmcoKSk7CisKKyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UpIHsKKyAg ICAgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSAhPSBuYXZpZ2F0aW9u Lm5hdmlnYXRpb25JRCgpKQorICAgICAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UtPmNhbmNlbCgp OworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7CisgICAgfQorCisgICAgbV9w cm92aXNpb25hbFBhZ2UgPSBzdGQ6Om1ha2VfdW5pcXVlPFByb3Zpc2lvbmFsUGFnZVByb3h5Pigq dGhpcywgbmV3UHJvY2Vzcy5jb3B5UmVmKCksIFdURk1vdmUoc3VzcGVuZGVkUGFnZVByb3h5KSwg bmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdElzUmVk aXJlY3QoKSwgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpLCBwcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50KTsKIAogICAgIGlmIChhdXRvKiBpdGVtID0gbmF2aWdhdGlvbi50YXJnZXRJdGVt KCkpIHsKICAgICAgICAgTE9HKExvYWRpbmcsICJXZWJQYWdlUHJveHkgJXAgY29udGludWVOYXZp Z2F0aW9uSW5OZXdQcm9jZXNzIHRvIGJhY2sgaXRlbSBVUkwgJXMiLCB0aGlzLCBpdGVtLT51cmwo KS51dGY4KCkuZGF0YSgpKTsKQEAgLTI3NjksNjcgKzI3OTUsMjIgQEAgdm9pZCBXZWJQYWdlUHJv eHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhBUEk6Ok5hdmlnYXRpb24mIG5hdmln YXRpb24sIHMKICAgICAgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFnZUxvYWRTdGF0ZS50cmFu c2FjdGlvbigpOwogICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0UGVuZGluZ0FQSVJlcXVlc3RV UkwodHJhbnNhY3Rpb24sIGl0ZW0tPnVybCgpKTsKIAotICAgICAgICBhdXRvIGl0ZW1TdGF0ZXMg PSBtX2JhY2tGb3J3YXJkTGlzdC0+ZmlsdGVyZWRJdGVtU3RhdGVzKFt0aGlzLCB0YXJnZXRJdGVt ID0gaXRlbV0oV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYgaXRlbSkgewotICAgICAgICAgICAgaWYg KGF1dG8qIHBhZ2UgPSBpdGVtLnN1c3BlbmRlZFBhZ2UoKSkgewotICAgICAgICAgICAgICAgIGlm ICgmcGFnZS0+cHJvY2VzcygpID09IG1fcHJvY2Vzcy5wdHIoKSkKLSAgICAgICAgICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgcmV0dXJuICZpdGVt ICE9IHRhcmdldEl0ZW07Ci0gICAgICAgIH0pOwotICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OlVwZGF0ZUJhY2tGb3J3YXJkTGlzdEZvclJlYXR0YWNoKFdURk1vdmUo aXRlbVN0YXRlcykpLCBtX3BhZ2VJRCk7Ci0gICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdl czo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgp LCBpdGVtLT5pdGVtSUQoKSwgKm5hdmlnYXRpb24uYmFja0ZvcndhcmRGcmFtZUxvYWRUeXBlKCks IFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2ll cykpLCBtX3BhZ2VJRCk7Ci0gICAgICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigp LnN0YXJ0KCk7Ci0KKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UtPmdvVG9CYWNrRm9yd2FyZEl0 ZW0obmF2aWdhdGlvbiwgKml0ZW0sIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiAgICAgICAg IHJldHVybjsKICAgICB9CiAKICAgICBpZiAobV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVt KCkgJiYgKG5hdmlnYXRpb24ubG9ja0JhY2tGb3J3YXJkTGlzdCgpID09IExvY2tCYWNrRm9yd2Fy ZExpc3Q6OlllcyB8fCBuYXZpZ2F0aW9uLmxvY2tIaXN0b3J5KCkgPT0gTG9ja0hpc3Rvcnk6Olll cykpIHsKICAgICAgICAgLy8gSWYgV2ViQ29yZSBpcyBzdXBwb3NlZCB0byBsb2NrIHRoZSBoaXN0 b3J5IGZvciB0aGlzIGxvYWQsIHRoZW4gdGhlIG5ldyBwcm9jZXNzIG5lZWRzIHRvIGtub3cgYWJv dXQgdGhlIGN1cnJlbnQgaGlzdG9yeSBpdGVtIHNvIGl0IGNhbiB1cGRhdGUKICAgICAgICAgLy8g aXQgaW5zdGVhZCBvZiBjcmVhdGluZyBhIG5ldyBvbmUuCi0gICAgICAgIG1fcHJvY2Vzcy0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0Q3VycmVudEhpc3RvcnlJdGVtRm9yUmVhdHRhY2gobV9i YWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCktPml0ZW1TdGF0ZSgpKSwgbV9wYWdlSUQpOwor ICAgICAgICBuZXdQcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRDdXJyZW50SGlz dG9yeUl0ZW1Gb3JSZWF0dGFjaChtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKS0+aXRl bVN0YXRlKCkpLCBtX3BhZ2VJRCk7CiAgICAgfQogCiAgICAgLy8gRklYTUU6IFdvcmsgb3V0IHRp bWluZyBvZiByZXNwb25kaW5nIHdpdGggdGhlIGxhc3QgcG9saWN5IGRlbGVnYXRlLCBldGMKICAg ICBBU1NFUlQoIW5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKS5pc0VtcHR5KCkpOwogICAgIGlm IChhdXRvJiBzdWJzdGl0dXRlRGF0YSA9IG5hdmlnYXRpb24uc3Vic3RpdHV0ZURhdGEoKSkKLSAg ICAgICAgbG9hZERhdGFXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCB7IHN1YnN0aXR1dGVEYXRh LT5jb250ZW50LmRhdGEoKSwgc3Vic3RpdHV0ZURhdGEtPmNvbnRlbnQuc2l6ZSgpIH0sIHN1YnN0 aXR1dGVEYXRhLT5NSU1FVHlwZSwgc3Vic3RpdHV0ZURhdGEtPmVuY29kaW5nLCBzdWJzdGl0dXRl RGF0YS0+YmFzZVVSTCwgc3Vic3RpdHV0ZURhdGEtPnVzZXJEYXRhLmdldCgpLCBTaG91bGRUcmVh dEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKKyAgICAg ICAgbV9wcm92aXNpb25hbFBhZ2UtPmxvYWREYXRhV2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwg eyBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5kYXRhKCksIHN1YnN0aXR1dGVEYXRhLT5jb250ZW50 LnNpemUoKSB9LCBzdWJzdGl0dXRlRGF0YS0+TUlNRVR5cGUsIHN1YnN0aXR1dGVEYXRhLT5lbmNv ZGluZywgc3Vic3RpdHV0ZURhdGEtPmJhc2VVUkwsIHN1YnN0aXR1dGVEYXRhLT51c2VyRGF0YS5n ZXQoKSwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKICAgICBlbHNlCi0gICAgICAgIGxvYWRS ZXF1ZXN0V2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgUmVzb3VyY2VSZXF1ZXN0IHsgbmF2aWdh dGlvbi5jdXJyZW50UmVxdWVzdCgpIH0sIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQ b2xpY3k6OlNob3VsZEFsbG93RXh0ZXJuYWxTY2hlbWVzLCBudWxscHRyLCBTaG91bGRUcmVhdEFz Q29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKLQotICAgIEFT U0VSVCghbV9tYWluRnJhbWUpOwotICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyID0gW3Ro aXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCBuYXZpZ2F0aW9uSUQgPSBuYXZpZ2F0 aW9uLm5hdmlnYXRpb25JRCgpLCByZXF1ZXN0ID0gIG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3Qo KSwgbWFpbkZyYW1lVVJMLCBpc1NlcnZlclJlZGlyZWN0ID0gbmF2aWdhdGlvbi5jdXJyZW50UmVx dWVzdElzUmVkaXJlY3QoKV0oKSBtdXRhYmxlIHsKLSAgICAgICAgaWYgKCF3ZWFrVGhpcykKLSAg ICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBBU1NFUlQobV9tYWluRnJhbWUpOwotICAgICAg ICAvLyBUaGlzIG5hdmlnYXRpb24gd2FzIGRlc3Ryb3llZCBzbyBubyBuZWVkIHRvIG5vdGlmeSBv ZiByZWRpcmVjdC4KLSAgICAgICAgaWYgKCFuYXZpZ2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG5h dmlnYXRpb25JRCkpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgLy8gUmVzdG9yZSB0 aGUgbWFpbiBmcmFtZSdzIGNvbW1pdHRlZCBVUkwgYXMgc29tZSBjbGllbnRzIG1heSByZWx5IG9u IGl0IHVudGlsIHRoZSBuZXh0IGxvYWQgaXMgY29tbWl0dGVkLgotICAgICAgICBtX21haW5GcmFt ZS0+ZnJhbWVMb2FkU3RhdGUoKS5zZXRVUkwobWFpbkZyYW1lVVJMKTsKLQotICAgICAgICAvLyBO b3JtYWxseSwgbm90aWZpY2F0aW9uIG9mIGEgc2VydmVyIHJlZGlyZWN0IGNvbWVzIGZyb20gdGhl IFdlYkNvbnRlbnQgcHJvY2Vzcy4KLSAgICAgICAgLy8gSWYgd2UgYXJlIHByb2Nlc3Mgc3dhcHBp bmcgaW4gcmVzcG9uc2UgdG8gYSBzZXJ2ZXIgcmVkaXJlY3QgdGhlbiB0aGF0IG5vdGlmaWNhdGlv biB3aWxsIG5vdCBjb21lIGZyb20gdGhlIG5ldyBXZWJDb250ZW50IHByb2Nlc3MuCi0gICAgICAg IC8vIEluIHRoaXMgY2FzZSB3ZSBoYXZlIHRoZSBVSVByb2Nlc3Mgc3ludGhlc2l6ZSB0aGUgcmVk aXJlY3Qgbm90aWZpY2F0aW9uIGF0IHRoZSBhcHByb3ByaWF0ZSB0aW1lLgotICAgICAgICBpZiAo aXNTZXJ2ZXJSZWRpcmVjdCkgewotICAgICAgICAgICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0 YXRlKCkuZGlkU3RhcnRQcm92aXNpb25hbExvYWQocmVxdWVzdC51cmwoKSk7Ci0gICAgICAgICAg ICBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZShtX21h aW5GcmFtZS0+ZnJhbWVJRCgpLCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUocmVxdWVzdCksIHsgfSk7 Ci0gICAgICAgIH0KLSAgICB9OwotCi0gICAgaWYgKCFtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCku Y29uZmlndXJhdGlvbigpLnByb2Nlc3NTd2Fwc09uV2luZG93T3BlbldpdGhPcGVuZXIoKSB8fCAh aXNQYWdlT3BlbmVkQnlET01TaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSB8fCAhbWFpbkZy YW1lSURJblByZXZpb3VzUHJvY2VzcykgewotICAgICAgICAvLyBUaGVyZSBpcyBubyB3YXkgd2Un bGwgYmUgYWJsZSB0byByZXR1cm4gdG8gdGhlIHBhZ2UgaW4gdGhlIHByZXZpb3VzIHBhZ2Ugc28g Y2xvc2UgaXQuCi0gICAgICAgIGlmICghZGlkU3VzcGVuZFByZXZpb3VzUGFnZSkKLSAgICAgICAg ICAgIHByZXZpb3VzUHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9w YWdlSUQpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgbV9tYWluRnJhbWVXaW5kb3dD cmVhdGlvbkhhbmRsZXIgPSBbdGhpcywgcHJldmlvdXNQcm9jZXNzID0gV1RGTW92ZShwcmV2aW91 c1Byb2Nlc3MpLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzID0gKm1haW5GcmFtZUlESW5Q cmV2aW91c1Byb2Nlc3NdKGNvbnN0IEdsb2JhbFdpbmRvd0lkZW50aWZpZXImIHdpbmRvd0lkZW50 aWZpZXIpIHsKLSAgICAgICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKLSAgICAgICAgR2xvYmFsRnJh bWVJZGVudGlmaWVyIG5hdmlnYXRlZEZyYW1lSWRlbnRpZmllckluTmV3UHJvY2VzcyB7IHBhZ2VJ RCgpLCBtX21haW5GcmFtZS0+ZnJhbWVJRCgpIH07Ci0gICAgICAgIHByZXZpb3VzUHJvY2Vzcy0+ c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RnJhbWVCZWNhbWVSZW1vdGUobWFpbkZyYW1lSURJblBy ZXZpb3VzUHJvY2VzcywgbmF2aWdhdGVkRnJhbWVJZGVudGlmaWVySW5OZXdQcm9jZXNzLCB3aW5k b3dJZGVudGlmaWVyKSwgcGFnZUlEKCkpOwotICAgIH07CisgICAgICAgIG1fcHJvdmlzaW9uYWxQ YWdlLT5sb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIFJlc291cmNlUmVxdWVz dCB7IG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKSB9LCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0 ZXJuYWxVUkxzUG9saWN5OjpTaG91bGRBbGxvd0V4dGVybmFsU2NoZW1lcywgbnVsbHB0ciwgV1RG TW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKIH0KIAogYm9vbCBXZWJQYWdlUHJveHk6OmlzUGFnZU9w ZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgY29uc3QKQEAgLTM2OTQsMTEg KzM2NzUsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKHVpbnQ2NF90 IGZyYW1lSUQpCiAKICAgICAvLyBBZGQgdGhlIGZyYW1lIHRvIHRoZSBwcm9jZXNzIHdpZGUgbWFw LgogICAgIG1fcHJvY2Vzcy0+ZnJhbWVDcmVhdGVkKGZyYW1lSUQsICptX21haW5GcmFtZSk7Ci0K LSAgICBpZiAobV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIpIHsKLSAgICAgICAgbV9tYWluRnJh bWVDcmVhdGlvbkhhbmRsZXIoKTsKLSAgICAgICAgbV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIg PSBudWxscHRyOwotICAgIH0KIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVN1YmZy YW1lKHVpbnQ2NF90IGZyYW1lSUQpCkBAIC0zNzIzLDEwICszNjk5LDYgQEAgdm9pZCBXZWJQYWdl UHJveHk6OmRpZENyZWF0ZVN1YmZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCiAKIHZvaWQgV2ViUGFn ZVByb3h5OjpkaWRDcmVhdGVXaW5kb3codWludDY0X3QgZnJhbWVJRCwgR2xvYmFsV2luZG93SWRl bnRpZmllciYmIHdpbmRvd0lkZW50aWZpZXIpCiB7Ci0gICAgaWYgKG1fbWFpbkZyYW1lICYmIG1f bWFpbkZyYW1lLT5mcmFtZUlEKCkgPT0gZnJhbWVJRCkgewotICAgICAgICBpZiAoYXV0byBtYWlu RnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIgPSBXVEZNb3ZlKG1fbWFpbkZyYW1lV2luZG93Q3Jl YXRpb25IYW5kbGVyKSkKLSAgICAgICAgICAgIG1haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxl cih3aW5kb3dJZGVudGlmaWVyKTsKLSAgICB9CiB9CiAKIGRvdWJsZSBXZWJQYWdlUHJveHk6OmVz dGltYXRlZFByb2dyZXNzKCkgY29uc3QKQEAgLTM3NzksNiArMzc1MSwxMCBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6ZGlkRGVzdHJveU5hdmlnYXRpb24odWludDY0X3QgbmF2aWdhdGlvbklEKQogewog ICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKKyAgICAv LyBPbiBwcm9jZXNzLXN3YXAsIHRoZSBwcmV2aW91cyBwcm9jZXNzIHRyaWVzIHRvIGRlc3Ryb3kg dGhlIG5hdmlnYXRpb24gYnV0IHRoZSBwcm92aXNpb25hbCBwcm9jZXNzIGlzIGFjdHVhbGx5IHRh a2luZyBvdmVyIHRoZSBuYXZpZ2F0aW9uLgorICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZSAmJiBt X3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkgPT0gbmF2aWdhdGlvbklEKQorICAgICAg ICByZXR1cm47CisKICAgICAvLyBGSVhNRTogTWVzc2FnZSBjaGVjayB0aGUgbmF2aWdhdGlvbklE LgogICAgIG1fbmF2aWdhdGlvblN0YXRlLT5kaWREZXN0cm95TmF2aWdhdGlvbihuYXZpZ2F0aW9u SUQpOwogfQpAQCAtMzc5NiwxNCArMzc3Miw2IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRTdGFy dFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hCiAg ICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpICYmIG5hdmlnYXRpb25JRCkKICAgICAgICAgbmF2 aWdhdGlvbiA9IG5hdmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRpb24obmF2aWdhdGlvbklEKTsKIAot ICAgIC8vIElmIHRoaXMgc2VlbWluZ2x5IG5ldyBsb2FkIGlzIGFjdHVhbGx5IGNvbnRpbnVpbmcg YSBzZXJ2ZXIgcmVkaXJlY3QgZm9yIGEgcHJldmlvdXMgbmF2aWdhdGlvbiBpbiBhIG5ldyBwcm9j ZXNzLAotICAgIC8vIHRoZW4gd2UgaWdub3JlIHRoaXMgbm90aWZpY2F0aW9uLgotICAgIGlmIChu YXZpZ2F0aW9uICYmIG5hdmlnYXRpb24tPmN1cnJlbnRSZXF1ZXN0SXNSZWRpcmVjdCgpKSB7Ci0g ICAgICAgIGF1dG8gbmF2aWdhdGlvblByb2Nlc3NJZGVudGlmaWVyID0gbmF2aWdhdGlvbi0+Y3Vy cmVudFJlcXVlc3RQcm9jZXNzSWRlbnRpZmllcigpOwotICAgICAgICBpZiAobmF2aWdhdGlvblBy b2Nlc3NJZGVudGlmaWVyICYmICpuYXZpZ2F0aW9uUHJvY2Vzc0lkZW50aWZpZXIgIT0gbV9wcm9j ZXNzLT5jb3JlUHJvY2Vzc0lkZW50aWZpZXIoKSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICB9 Ci0KICAgICBMT0coTG9hZGluZywgIldlYlBhZ2VQcm94eSAlIiBQUkl1NjQgIiBpbiBwcm9jZXNz IHBpZCAlaSBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lIHRvIGZyYW1lSUQgJSIgUFJJ dTY0ICIsIG5hdmlnYXRpb25JRCAlIiBQUkl1NjQgIiwgdXJsICVzIiwgbV9wYWdlSUQsIG1fcHJv Y2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgZnJhbWVJRCwgbmF2aWdhdGlvbklELCB1cmwuc3Ry aW5nKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5n LCAiZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTogd2ViUElEID0gJWksIHBhZ2VJRCA9 ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVu dGlmaWVyKCksIG1fcGFnZUlELCBmcmFtZUlEKTsKIApAQCAtMzkxMSw2ICszODc5LDExIEBAIHZv aWQgV2ViUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3Qg ZnJhbWVJRCwgY29uc3QgU2VjdXJpCiAKICAgICBQYWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3Rv cihwYWdlQ2xpZW50KCkpOwogCisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlICYmIG1fcHJvdmlz aW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSA9PSBuYXZpZ2F0aW9uSUQgJiYgJm1fcHJvdmlzaW9u YWxQYWdlLT5wcm9jZXNzKCkgIT0gbV9wcm9jZXNzLnB0cigpKSB7CisgICAgICAgIC8vIFRoZSBs b2FkIGRpZCBub3QgZmFpbCwgaXQgbWVyZWx5IGhhcHBlbmluZyBpbiBhIG5ldyBwcm92aXNpb25h bCBwcm9jZXNzLgorICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgV2ViRnJhbWVQcm94eSog ZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwogICAgIE1FU1NBR0VfQ0hFQ0so ZnJhbWUpOwogCkBAIC0zOTQ5LDYgKzM5MjIsMTAgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZh aWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cmkK ICAgICB9CiAKICAgICBtX2ZhaWxpbmdQcm92aXNpb25hbExvYWRVUkwgPSB7IH07CisKKyAgICAv LyBJZiB0aGUgcHJvdmlzaW9uYWwgcGFnZSdzIGxvYWQgZmFpbHMgdGhlbiB3ZSBkZXN0cm95IHRo ZSBwcm92aXNpb25hbCBwYWdlLgorICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZSAmJiBtX3Byb3Zp c2lvbmFsUGFnZS0+bWFpbkZyYW1lKCkgPT0gZnJhbWUpCisgICAgICAgIG1fcHJvdmlzaW9uYWxQ YWdlID0gbnVsbHB0cjsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmNsZWFyTG9hZERlcGVuZGVu dENhbGxiYWNrcygpCkBAIC00MzQwLDggKzQzMTcsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVj aWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jKHVpbnQ2NF90IGZyYW1lSUQsIFdlYkNv cgogICAgIGF1dG8qIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKICAgICBN RVNTQUdFX0NIRUNLKGZyYW1lKTsKIAotICAgIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rp b24oKmZyYW1lLCBXVEZNb3ZlKGZyYW1lU2VjdXJpdHlPcmlnaW4pLCBuYXZpZ2F0aW9uSUQsIFdU Rk1vdmUobmF2aWdhdGlvbkFjdGlvbkRhdGEpLCBXVEZNb3ZlKGZyYW1lSW5mb0RhdGEpLCBvcmln aW5hdGluZ1BhZ2VJRCwgb3JpZ2luYWxSZXF1ZXN0LCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3Zl KHJlcXVlc3RCb2R5KSwgV1RGTW92ZShyZWRpcmVjdFJlc3BvbnNlKSwgdXNlckRhdGEsIFBvbGlj eURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0 aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRF0gKGF1dG8uLi4gYXJncykgewotICAgICAgICBtX3By b2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihm cmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQpOworICAgIGRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb24oKmZyYW1lLCBXVEZNb3ZlKGZyYW1lU2VjdXJpdHlPcmlnaW4p LCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUobmF2aWdhdGlvbkFjdGlvbkRhdGEpLCBXVEZNb3ZlKGZy YW1lSW5mb0RhdGEpLCBvcmlnaW5hdGluZ1BhZ2VJRCwgb3JpZ2luYWxSZXF1ZXN0LCBXVEZNb3Zl KHJlcXVlc3QpLCBXVEZNb3ZlKHJlcXVlc3RCb2R5KSwgV1RGTW92ZShyZWRpcmVjdFJlc3BvbnNl KSwgdXNlckRhdGEsIFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3Rl ZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRCwgcHJvY2VzcyA9IG1f cHJvY2Vzcy5jb3B5UmVmKCldIChhdXRvLi4uIGFyZ3MpIHsKKyAgICAgICAgcHJvY2Vzcy0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxp c3RlbmVySUQsIGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CiAgICAgfSkpOwogfQogCkBAIC00NTc1LDEy ICs0NTUyLDEyIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JSZXNwb25zZSh1 aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cml0eU9yaWdpCiAgICAgTUVTU0FHRV9DSEVDS19V UkwocmVzcG9uc2UudXJsKCkpOwogCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gbmF2aWdh dGlvbiA9IG5hdmlnYXRpb25JRCA/IG1fbmF2aWdhdGlvblN0YXRlLT5uYXZpZ2F0aW9uKG5hdmln YXRpb25JRCkgOiBudWxscHRyOwotICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtlUmVmKGZyYW1lLT5z ZXRVcFBvbGljeUxpc3RlbmVyUHJveHkoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0 aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRCwgbmF2aWdhdGlvbiA9IFdURk1vdmUobmF2aWdhdGlv bildIChXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCBBUEk6OldlYnNpdGVQb2xpY2llcyos IFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVu dCwgUmVmUHRyPFNhZmVCcm93c2luZ1dhcm5pbmc+JiYgc2FmZUJyb3dzaW5nV2FybmluZykgbXV0 YWJsZSB7CisgICAgYXV0byBsaXN0ZW5lciA9IG1ha2VSZWYoZnJhbWUtPnNldFVwUG9saWN5TGlz dGVuZXJQcm94eShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBmcmFtZUlE LCBsaXN0ZW5lcklELCBuYXZpZ2F0aW9uID0gV1RGTW92ZShuYXZpZ2F0aW9uKSwgcHJvY2VzcyA9 IG1fcHJvY2Vzcy5jb3B5UmVmKCldIChXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCBBUEk6 OldlYnNpdGVQb2xpY2llcyosIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3 YXBSZXF1ZXN0ZWRCeUNsaWVudCwgUmVmUHRyPFNhZmVCcm93c2luZ1dhcm5pbmc+JiYgc2FmZUJy b3dzaW5nV2FybmluZykgbXV0YWJsZSB7CiAgICAgICAgIC8vIEZJWE1FOiBBc3NlcnQgdGhlIEFQ STo6V2Vic2l0ZVBvbGljaWVzKiBpcyBudWxscHRyIGhlcmUgb25jZSBjbGllbnRzIG9mIFdLRnJh bWVQb2xpY3lMaXN0ZW5lclVzZVdpdGhQb2xpY2llcyBnbyBhd2F5LgogICAgICAgICBSRUxFQVNF X0FTU0VSVChwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50ID09IFByb2Nlc3NTd2FwUmVxdWVz dGVkQnlDbGllbnQ6Ok5vKTsKICAgICAgICAgQVNTRVJUX1VOVVNFRChzYWZlQnJvd3NpbmdXYXJu aW5nLCAhc2FmZUJyb3dzaW5nV2FybmluZyk7Ci0gICAgICAgIHJlY2VpdmVkUG9saWN5RGVjaXNp b24ocG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uLmdldCgpLCBXVEY6Om51bGxvcHQsIFBvbGljeURl Y2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3Rl Y3RlZFRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklEXSAoYXV0by4uLiBhcmdzKSB7Ci0gICAgICAg ICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xpY3lE ZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQpOworICAgICAg ICByZWNlaXZlZFBvbGljeURlY2lzaW9uKHBvbGljeUFjdGlvbiwgbmF2aWdhdGlvbi5nZXQoKSwg V1RGOjpudWxsb3B0LCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0 ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRCwgcHJv Y2VzcyA9IFdURk1vdmUocHJvY2VzcyldIChhdXRvLi4uIGFyZ3MpIHsKKyAgICAgICAgICAgIHBy b2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihm cmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQpOwogICAgICAgICB9KSk7CiAg ICAgfSwgU2hvdWxkRXhwZWN0U2FmZUJyb3dzaW5nUmVzdWx0OjpObykpOwogCkBAIC02NDg3LDgg KzY0NjQsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cHJvY2Vzc1dpbGxCZWNvbWVGb3JlZ3JvdW5k KCkKIHZvaWQgV2ViUGFnZVByb3h5OjpyZXNldFN0YXRlKFJlc2V0U3RhdGVSZWFzb24gcmVzZXRT dGF0ZVJlYXNvbikKIHsKICAgICBtX21haW5GcmFtZSA9IG51bGxwdHI7Ci0gICAgbV9tYWluRnJh bWVDcmVhdGlvbkhhbmRsZXIgPSBudWxscHRyOwotICAgIG1fbWFpbkZyYW1lV2luZG93Q3JlYXRp b25IYW5kbGVyID0gbnVsbHB0cjsKIAogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIG1fc2Nyb2xs aW5nUGVyZm9ybWFuY2VEYXRhID0gbnVsbHB0cjsKQEAgLTY3NzksNiArNjc1NCwxMCBAQCBXZWJQ YWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKCkK ICAgICBwYXJhbWV0ZXJzLmFwcGxpY2F0aW9uTWFuaWZlc3QgPSBtX2NvbmZpZ3VyYXRpb24tPmFw cGxpY2F0aW9uTWFuaWZlc3QoKSA/IE9wdGlvbmFsPFdlYkNvcmU6OkFwcGxpY2F0aW9uTWFuaWZl c3Q+KG1fY29uZmlndXJhdGlvbi0+YXBwbGljYXRpb25NYW5pZmVzdCgpLT5hcHBsaWNhdGlvbk1h bmlmZXN0KCkpIDogV1RGOjpudWxsb3B0OwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoU0VSVklDRV9X T1JLRVIpCisgICAgcGFyYW1ldGVycy5oYXNSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMgPSBwcm9j ZXNzKCkucHJvY2Vzc1Bvb2woKS5tYXlIYXZlUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXJzKG1fd2Vi c2l0ZURhdGFTdG9yZSk7CisjZW5kaWYKKwogICAgIHBhcmFtZXRlcnMubmVlZHNGb250QXR0cmli dXRlcyA9IG1fbmVlZHNGb250QXR0cmlidXRlczsKIAogICAgIG1fcHJvY2Vzcy0+YWRkV2ViVXNl ckNvbnRlbnRDb250cm9sbGVyUHJveHkobV91c2VyQ29udGVudENvbnRyb2xsZXIsIHBhcmFtZXRl cnMpOwpAQCAtODU0MCw2ICs4NTE5LDIxIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzaW11bGF0ZURl dmljZU9yaWVudGF0aW9uQ2hhbmdlKGRvdWJsZSBhbHBoYSwgZG91YmxlIGJldGEsIGRvCiAgICAg bV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTaW11bGF0ZURldmljZU9yaWVudGF0 aW9uQ2hhbmdlKGFscGhhLCBiZXRhLCBnYW1tYSksIG1fcGFnZUlEKTsKIH0KIAorV2ViUGFnZVBy b3h5OjpQYWdlUHJvY2Vzc092ZXJyaWRlOjpQYWdlUHJvY2Vzc092ZXJyaWRlKFdlYlBhZ2VQcm94 eSYgcGFnZSwgV2ViUHJvY2Vzc1Byb3h5JiBuZXdQcm9jZXNzKQorICAgIDogbV9wYWdlKCZwYWdl KQorICAgICwgbV9wcmV2aW91c1Byb2Nlc3MocGFnZS5wcm9jZXNzKCkpCit7CisgICAgcGFnZS5t X3Byb2Nlc3MgPSBuZXdQcm9jZXNzOworfQorCitXZWJQYWdlUHJveHk6OlBhZ2VQcm9jZXNzT3Zl cnJpZGU6OlBhZ2VQcm9jZXNzT3ZlcnJpZGUoUGFnZVByb2Nlc3NPdmVycmlkZSYmKSA9IGRlZmF1 bHQ7CisKK1dlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6flBhZ2VQcm9jZXNzT3Zl cnJpZGUoKQoreworICAgIGlmIChtX3BhZ2UpCisgICAgICAgIG1fcGFnZS0+bV9wcm9jZXNzID0g V1RGTW92ZShtX3ByZXZpb3VzUHJvY2Vzcyk7Cit9CisKICNpZiBFTkFCTEUoREFUQV9ERVRFQ1RJ T04pCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkZXRlY3REYXRhSW5BbGxGcmFtZXMoV2ViQ29yZTo6 RGF0YURldGVjdG9yVHlwZXMgdHlwZXMsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgRGF0 YURldGVjdGlvblJlc3VsdCYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBkZTk4Njk0YWEzN2RiM2M3ZjJjZTI3Y2M4MjlhOTIw MDIxMWRlMTBkLi5mMzQwY2RhMjVmNDY1NWVkYTNkNjE0NWNiOGJlZmFlNDFkMTZjZGNiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMjI1LDYgKzIyNSw3IEBAIGNs YXNzIE5hdGl2ZVdlYktleWJvYXJkRXZlbnQ7CiBjbGFzcyBOYXRpdmVXZWJNb3VzZUV2ZW50Owog Y2xhc3MgTmF0aXZlV2ViV2hlZWxFdmVudDsKIGNsYXNzIFBhZ2VDbGllbnQ7CitjbGFzcyBQcm92 aXNpb25hbFBhZ2VQcm94eTsKIGNsYXNzIFJlbW90ZUxheWVyVHJlZUhvc3Q7CiBjbGFzcyBSZW1v dGVMYXllclRyZWVTY3JvbGxpbmdQZXJmb3JtYW5jZURhdGE7CiBjbGFzcyBSZW1vdGVMYXllclRy ZWVUcmFuc2FjdGlvbjsKQEAgLTM1Niw3ICszNTcsNyBAQCBwdWJsaWM6CiAgICAgV2ViRnJhbWVQ cm94eSogZm9jdXNlZEZyYW1lKCkgY29uc3QgeyByZXR1cm4gbV9mb2N1c2VkRnJhbWUuZ2V0KCk7 IH0KICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZVNldExhcmdlc3RGcmFtZSgpIGNvbnN0IHsgcmV0 dXJuIG1fZnJhbWVTZXRMYXJnZXN0RnJhbWUuZ2V0KCk7IH0KIAotICAgIERyYXdpbmdBcmVhUHJv eHkqIGRyYXdpbmdBcmVhKCkgY29uc3QgeyByZXR1cm4gbV9kcmF3aW5nQXJlYS5nZXQoKTsgfQor ICAgIERyYXdpbmdBcmVhUHJveHkqIGRyYXdpbmdBcmVhKCkgY29uc3Q7CiAKICAgICBXZWJOYXZp Z2F0aW9uU3RhdGUmIG5hdmlnYXRpb25TdGF0ZSgpIHsgcmV0dXJuICptX25hdmlnYXRpb25TdGF0 ZS5nZXQoKTsgfQogCkBAIC0zNzksNiArMzgwLDcgQEAgcHVibGljOgogCiAgICAgYm9vbCBhZGRz VmlzaXRlZExpbmtzKCkgY29uc3QgeyByZXR1cm4gbV9hZGRzVmlzaXRlZExpbmtzOyB9CiAgICAg dm9pZCBzZXRBZGRzVmlzaXRlZExpbmtzKGJvb2wgYWRkc1Zpc2l0ZWRMaW5rcykgeyBtX2FkZHNW aXNpdGVkTGlua3MgPSBhZGRzVmlzaXRlZExpbmtzOyB9CisgICAgVmlzaXRlZExpbmtTdG9yZSYg dmlzaXRlZExpbmtTdG9yZSgpIHsgcmV0dXJuIG1fdmlzaXRlZExpbmtTdG9yZTsgfQogCiAgICAg dm9pZCBleGl0RnVsbHNjcmVlbkltbWVkaWF0ZWx5KCk7CiAgICAgdm9pZCBmdWxsc2NyZWVuTWF5 UmV0dXJuVG9JbmxpbmUoKTsKQEAgLTQ1OCw4ICs0NjAsOCBAQCBwdWJsaWM6CiAgICAgQVBJOjpJ Y29uTG9hZGluZ0NsaWVudCYgaWNvbkxvYWRpbmdDbGllbnQoKSB7IHJldHVybiAqbV9pY29uTG9h ZGluZ0NsaWVudDsgfQogICAgIHZvaWQgc2V0SWNvbkxvYWRpbmdDbGllbnQoc3RkOjp1bmlxdWVf cHRyPEFQSTo6SWNvbkxvYWRpbmdDbGllbnQ+JiYpOwogCi0gICAgZW51bSBjbGFzcyBJc1N3YXBG cm9tU3VzcGVuZGVkIHsgTm8sIFllcyB9OwotICAgIHZvaWQgaW5pdGlhbGl6ZVdlYlBhZ2UoSXNT d2FwRnJvbVN1c3BlbmRlZCA9IElzU3dhcEZyb21TdXNwZW5kZWQ6Ok5vKTsKKyAgICB2b2lkIGlu aXRpYWxpemVXZWJQYWdlKCk7CisgICAgdm9pZCBzZXREcmF3aW5nQXJlYShzdGQ6OnVuaXF1ZV9w dHI8RHJhd2luZ0FyZWFQcm94eT4mJik7CiAKICAgICBXZWFrUHRyPFNlY0tleVByb3h5U3RvcmU+ IHNlY0tleVByb3h5U3RvcmUoY29uc3QgV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2Um KTsKICAgICAgICAgCkBAIC0xMDI1LDYgKzEwMjcsMTkgQEAgcHVibGljOgogICAgIFdlYlByb2Nl c3NQcm94eSYgcHJvY2VzcygpIHsgcmV0dXJuIG1fcHJvY2VzczsgfQogICAgIFByb2Nlc3NJRCBw cm9jZXNzSWRlbnRpZmllcigpIGNvbnN0OwogCisgICAgY2xhc3MgUGFnZVByb2Nlc3NPdmVycmlk ZSB7CisgICAgcHVibGljOgorICAgICAgICBQYWdlUHJvY2Vzc092ZXJyaWRlKFdlYlBhZ2VQcm94 eSYsIFdlYlByb2Nlc3NQcm94eSYgbmV3UHJvY2Vzcyk7CisgICAgICAgIFBhZ2VQcm9jZXNzT3Zl cnJpZGUoUGFnZVByb2Nlc3NPdmVycmlkZSYmKTsKKyAgICAgICAgflBhZ2VQcm9jZXNzT3ZlcnJp ZGUoKTsKKworICAgIHByaXZhdGU6CisgICAgICAgIFJlZlB0cjxXZWJQYWdlUHJveHk+IG1fcGFn ZTsKKyAgICAgICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gbV9wcmV2aW91c1Byb2Nlc3M7CisgICAg fTsKKworICAgIFBhZ2VQcm9jZXNzT3ZlcnJpZGUgdGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3Mo V2ViUHJvY2Vzc1Byb3h5JiBuZXdQcm9jZXNzKSB7IHJldHVybiBQYWdlUHJvY2Vzc092ZXJyaWRl KCp0aGlzLCBuZXdQcm9jZXNzKTsgfQorCiAgICAgV2ViUHJlZmVyZW5jZXMmIHByZWZlcmVuY2Vz KCkgeyByZXR1cm4gbV9wcmVmZXJlbmNlczsgfQogICAgIHZvaWQgc2V0UHJlZmVyZW5jZXMoV2Vi UHJlZmVyZW5jZXMmKTsKIApAQCAtMTQxNSw2ICsxNDMwLDIxIEBAIHB1YmxpYzoKICAgICBFZGl0 YWJsZUltYWdlQ29udHJvbGxlciYgZWRpdGFibGVJbWFnZUNvbnRyb2xsZXIoKSB7IHJldHVybiAq bV9lZGl0YWJsZUltYWdlQ29udHJvbGxlcjsgfQogI2VuZGlmCiAKKyAgICBQcm92aXNpb25hbFBh Z2VQcm94eSogcHJvdmlzaW9uYWxQYWdlUHJveHkoKSBjb25zdCB7IHJldHVybiBtX3Byb3Zpc2lv bmFsUGFnZS5nZXQoKTsgfQorICAgIHZvaWQgY29tbWl0UHJvdmlzaW9uYWxQYWdlKHVpbnQ2NF90 IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwg Ym9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVMb2FkVHlw ZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiwgYm9vbCBjb250YWluc1BsdWdpbkRv Y3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0lu c2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmKTsKKworICAgIHZvaWQgZGlkU3RhcnRQcm92 aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9u SUQsIFVSTCYmLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2 b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25z dCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2 NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2Vi Q29yZTo6UmVzb3VyY2VFcnJvciYsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRSZWNl aXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFt ZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBj b25zdCBVc2VyRGF0YSYpOworCisgICAgdm9pZCBsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKEFQSTo6 TmF2aWdhdGlvbiYsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYsIGNvbnN0IFN0cmluZyYgTUlN RVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJ OjpPYmplY3QqIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQs IE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOworICAgIHZv aWQgbG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBXZWJDb3JlOjpS ZXNvdXJjZVJlcXVlc3QmJiwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwg QVBJOjpPYmplY3QqIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xv YWQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOworCisg ICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKKyAgICAvLyBJbXBsZW1lbnRlZCBpbiBnZW5lcmF0 ZWQgV2ViUGFnZVByb3h5TWVzc2FnZVJlY2VpdmVyLmNwcAorICAgIHZvaWQgZGlkUmVjZWl2ZU1l c3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgb3ZlcnJpZGU7CisgICAgdm9p ZCBkaWRSZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJiwg c3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mKSBvdmVycmlkZTsKKwogcHJpdmF0ZToKICAg ICBXZWJQYWdlUHJveHkoUGFnZUNsaWVudCYsIFdlYlByb2Nlc3NQcm94eSYsIHVpbnQ2NF90IHBh Z2VJRCwgUmVmPEFQSTo6UGFnZUNvbmZpZ3VyYXRpb24+JiYpOwogICAgIHZvaWQgcGxhdGZvcm1J bml0aWFsaXplKCk7CkBAIC0xNDM5LDEyICsxNDY5LDYgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQg c2V0VXNlckFnZW50KFN0cmluZyYmKTsKIAotICAgIC8vIElQQzo6TWVzc2FnZVJlY2VpdmVyCi0g ICAgLy8gSW1wbGVtZW50ZWQgaW4gZ2VuZXJhdGVkIFdlYlBhZ2VQcm94eU1lc3NhZ2VSZWNlaXZl ci5jcHAKLSAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6 RGVjb2RlciYpIG92ZXJyaWRlOwotICAgIHZvaWQgZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6 Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYsIHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+ Jikgb3ZlcnJpZGU7Ci0KLQogICAgIC8vIElQQzo6TWVzc2FnZVNlbmRlcgogICAgIGJvb2wgc2Vu ZE1lc3NhZ2Uoc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4sIE9wdGlvblNldDxJUEM6OlNl bmRPcHRpb24+KSBvdmVycmlkZTsKICAgICBJUEM6OkNvbm5lY3Rpb24qIG1lc3NhZ2VTZW5kZXJD b25uZWN0aW9uKCkgb3ZlcnJpZGU7CkBAIC0xNDY2LDEyICsxNDkwLDkgQEAgcHJpdmF0ZToKICAg ICB2b2lkIGRpZENyZWF0ZVN1YmZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpOwogICAgIHZvaWQgZGlk Q3JlYXRlV2luZG93KHVpbnQ2NF90IGZyYW1lSUQsIFdlYkNvcmU6Okdsb2JhbFdpbmRvd0lkZW50 aWZpZXImJik7CiAKLSAgICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWlu dDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiwgVVJMJiYgdW5yZWFj aGFibGVVUkwsIGNvbnN0IFVzZXJEYXRhJik7Ci0gICAgdm9pZCBkaWRSZWNlaXZlU2VydmVyUmVk aXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRf dCBuYXZpZ2F0aW9uSUQsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBjb25zdCBVc2VyRGF0 YSYpOwogICAgIHZvaWQgd2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdEZvckZyYW1lKHVpbnQ2NF90 IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgdXJsLCBkb3VibGUgZGVsYXksIFdlYkNvcmU6OkxvY2tC YWNrRm9yd2FyZExpc3QpOwogICAgIHZvaWQgZGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3RGb3JGcmFt ZSh1aW50NjRfdCBmcmFtZUlEKTsKICAgICB2b2lkIGRpZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9y RnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJik7Ci0g ICAgdm9pZCBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwg Y29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1 aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0 IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlk Q29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25J RCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92 aWRlciwgdWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJ bmZvJiwgYm9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJ bnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEm KTsKICAgICB2b2lkIGRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1l SUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2b2lkIGRp ZEZpbmlzaExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9u SUQsIGNvbnN0IFVzZXJEYXRhJik7CkBAIC0xNTc1LDE4ICsxNTk2LDE2IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBzZXRDYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMoYm9vbCBjYW5T aG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMpIHsgbV9jYW5TaG9ydENpcmN1aXRIb3Jp em9udGFsV2hlZWxFdmVudHMgPSBjYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHM7 IH0KIAogICAgIHZvaWQgcmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsKLSAgICB2b2lkIHN3YXBUb1dl YlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiwgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRl ZFBhZ2VQcm94eT4mJiwgSXNTd2FwRnJvbVN1c3BlbmRlZCk7CisgICAgdm9pZCBzd2FwVG9XZWJQ cm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJl YVByb3h5PiYmLCBSZWZQdHI8V2ViRnJhbWVQcm94eT4mJiBtYWluRnJhbWUpOwogICAgIHZvaWQg ZGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAoKTsKICAgICB2b2lkIGRpZFN1c3BlbmRB ZnRlclByb2Nlc3NTd2FwKCk7CiAKLSAgICB2b2lkIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2Vz cyhJc1N3YXBGcm9tU3VzcGVuZGVkID0gSXNTd2FwRnJvbVN1c3BlbmRlZDo6Tm8pOworICAgIGVu dW0gY2xhc3MgU2hvdWxkSW5pdGlhbGl6ZVdlYlBhZ2UgeyBObywgWWVzIH07CisgICAgdm9pZCBm aW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoU2hvdWxkSW5pdGlhbGl6ZVdlYlBhZ2UgPSBTaG91 bGRJbml0aWFsaXplV2ViUGFnZTo6WWVzKTsKIAogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+ IHJlYXR0YWNoVG9XZWJQcm9jZXNzRm9yUmVsb2FkKCk7CiAgICAgUmVmUHRyPEFQSTo6TmF2aWdh dGlvbj4gcmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRlbShXZWJCYWNrRm9yd2FyZExpc3RJdGVt Jik7CiAKLSAgICB2b2lkIGxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwg Y29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3Qg U3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNl ckRhdGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vi c2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7Ci0gICAgdm9pZCBsb2FkUmVxdWVz dFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVz dCYmLCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCog dXNlckRhdGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8 V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7Ci0KICAgICB2b2lkIHJlcXVl c3ROb3RpZmljYXRpb25QZXJtaXNzaW9uKHVpbnQ2NF90IG5vdGlmaWNhdGlvbklELCBjb25zdCBT dHJpbmcmIG9yaWdpblN0cmluZyk7CiAgICAgdm9pZCBzaG93Tm90aWZpY2F0aW9uKGNvbnN0IFN0 cmluZyYgdGl0bGUsIGNvbnN0IFN0cmluZyYgYm9keSwgY29uc3QgU3RyaW5nJiBpY29uVVJMLCBj b25zdCBTdHJpbmcmIHRhZywgY29uc3QgU3RyaW5nJiBsYW5nLCBXZWJDb3JlOjpOb3RpZmljYXRp b25EaXJlY3Rpb24sIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nLCB1aW50NjRfdCBub3RpZmlj YXRpb25JRCk7CiAgICAgdm9pZCBjYW5jZWxOb3RpZmljYXRpb24odWludDY0X3Qgbm90aWZpY2F0 aW9uSUQpOwpAQCAtMTk1Miw4ICsxOTcxLDYgQEAgcHJpdmF0ZToKICAgICBSZWY8V2Vic2l0ZURh dGFTdG9yZT4gbV93ZWJzaXRlRGF0YVN0b3JlOwogCiAgICAgUmVmUHRyPFdlYkZyYW1lUHJveHk+ IG1fbWFpbkZyYW1lOwotICAgIEZ1bmN0aW9uPHZvaWQoKT4gbV9tYWluRnJhbWVDcmVhdGlvbkhh bmRsZXI7Ci0gICAgRnVuY3Rpb248dm9pZChjb25zdCBXZWJDb3JlOjpHbG9iYWxXaW5kb3dJZGVu dGlmaWVyJik+IG1fbWFpbkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyOwogCiAgICAgUmVmUHRy PFdlYkZyYW1lUHJveHk+IG1fZm9jdXNlZEZyYW1lOwogICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5 PiBtX2ZyYW1lU2V0TGFyZ2VzdEZyYW1lOwpAQCAtMjMyNCw2ICsyMzQxLDggQEAgcHJpdmF0ZToK ICAgICBib29sIG1fbmVlZHNGb250QXR0cmlidXRlcyB7IGZhbHNlIH07CiAgICAgYm9vbCBtX21h eUhhdmVVbml2ZXJzYWxGaWxlUmVhZFNhbmRib3hFeHRlbnNpb24geyBmYWxzZSB9OwogCisgICAg c3RkOjp1bmlxdWVfcHRyPFByb3Zpc2lvbmFsUGFnZVByb3h5PiBtX3Byb3Zpc2lvbmFsUGFnZTsK KwogI2lmIEhBVkUoUEVOQ0lMS0lUKQogICAgIHN0ZDo6dW5pcXVlX3B0cjxFZGl0YWJsZUltYWdl Q29udHJvbGxlcj4gbV9lZGl0YWJsZUltYWdlQ29udHJvbGxlcjsKICNlbmRpZgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKaW5kZXggZGIxZmQ1OGI5M2RmZjU4 NjVkMTNmYzU0MWI2ZTVkODc0NmViOGUwYS4uZGFiZWRiYzBhNzQ0MTI2YmRlNjhkNTk0NmQ3NTMx ZmVmNzVjNzU1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku Y3BwCkBAIC0zNCw2ICszNCw3IEBACiAjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIlBs dWdpbkluZm9TdG9yZS5oIgogI2luY2x1ZGUgIlBsdWdpblByb2Nlc3NNYW5hZ2VyLmgiCisjaW5j bHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbmNsdWRlICJUZXh0Q2hlY2tlci5oIgog I2luY2x1ZGUgIlRleHRDaGVja2VyU3RhdGUuaCIKICNpbmNsdWRlICJVSU1lc3NhZ2VQb3J0Q2hh bm5lbFByb3ZpZGVyLmgiCkBAIC01ODQsNiArNTg1LDE1IEBAIGJvb2wgV2ViUHJvY2Vzc1Byb3h5 OjpmdWxsS2V5Ym9hcmRBY2Nlc3NFbmFibGVkKCkKIH0KICNlbmRpZgogCitib29sIFdlYlByb2Nl c3NQcm94eTo6aGFzUHJvdmlzaW9uYWxQYWdlV2l0aElEKHVpbnQ2NF90IHBhZ2VJRCkgY29uc3QK K3sKKyAgICBmb3IgKGF1dG8qIHByb3Zpc2lvbmFsUGFnZSA6IG1fcHJvdmlzaW9uYWxQYWdlcykg eworICAgICAgICBpZiAocHJvdmlzaW9uYWxQYWdlLT5wYWdlKCkucGFnZUlEKCkgPT0gcGFnZUlE KQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKK30K Kwogdm9pZCBXZWJQcm9jZXNzUHJveHk6OnVwZGF0ZUJhY2tGb3J3YXJkSXRlbShjb25zdCBCYWNr Rm9yd2FyZExpc3RJdGVtU3RhdGUmIGl0ZW1TdGF0ZSkKIHsKICAgICBpZiAoYXV0byogaXRlbSA9 IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW06Oml0ZW1Gb3JJRChpdGVtU3RhdGUuaWRlbnRpZmllcikp IHsKQEAgLTU5MSw3ICs2MDEsNyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6dXBkYXRlQmFja0Zv cndhcmRJdGVtKGNvbnN0IEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSYgaXRlbQogICAgICAgICAv LyB0aGUgYmFjay9mb3J3YXJkIGl0ZW1zIHBhZ2UuCiAgICAgICAgIC8vIGUuZy4gVGhlIG9sZCB3 ZWIgcHJvY2VzcyBpcyBuYXZpZ2F0aW5nIHRvIGFib3V0OmJsYW5rIGZvciBzdXNwZW5zaW9uLgog ICAgICAgICAvLyBXZSBpZ25vcmUgdGhlc2UgdXBkYXRlcy4KLSAgICAgICAgaWYgKG1fcGFnZU1h cC5jb250YWlucyhpdGVtLT5wYWdlSUQoKSkpCisgICAgICAgIGlmIChtX3BhZ2VNYXAuY29udGFp bnMoaXRlbS0+cGFnZUlEKCkpIHx8IGhhc1Byb3Zpc2lvbmFsUGFnZVdpdGhJRChpdGVtLT5wYWdl SUQoKSkpCiAgICAgICAgICAgICBpdGVtLT5zZXRQYWdlU3RhdGUoaXRlbVN0YXRlLnBhZ2VTdGF0 ZSk7CiAgICAgfQogfQpAQCAtNzgwLDYgKzc5MCwxMiBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6 ZGlkRmluaXNoTGF1bmNoaW5nKFByb2Nlc3NMYXVuY2hlciogbGF1bmNoZXIsIElQQzo6Q29ubmVj dAogICAgICAgICBwYWdlLT5wcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5nKCk7CiAgICAgfQogCisg ICAgZm9yIChhdXRvKiBwcm92aXNpb25hbFBhZ2UgOiBtX3Byb3Zpc2lvbmFsUGFnZXMpIHsKKyAg ICAgICAgQVNTRVJUKHRoaXMgPT0gJnByb3Zpc2lvbmFsUGFnZS0+cHJvY2VzcygpKTsKKyAgICAg ICAgcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5nKCk7CisgICAgfQor CisKICAgICBSRUxFQVNFX0FTU0VSVCghbV93ZWJDb25uZWN0aW9uKTsKICAgICBtX3dlYkNvbm5l Y3Rpb24gPSBXZWJDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpjcmVhdGUodGhpcyk7CiAKQEAgLTg3 Myw3ICs4ODksNyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6bWF5YmVTaHV0RG93bigpCiAKIGJv b2wgV2ViUHJvY2Vzc1Byb3h5OjpjYW5UZXJtaW5hdGVDaGlsZFByb2Nlc3MoKQogewotICAgIGlm ICghbV9wYWdlTWFwLmlzRW1wdHkoKSB8fCBtX3Byb2Nlc3NQb29sLT5oYXNTdXNwZW5kZWRQYWdl Rm9yKCp0aGlzKSkKKyAgICBpZiAoIW1fcGFnZU1hcC5pc0VtcHR5KCkgfHwgbV9wcm9jZXNzUG9v bC0+aGFzU3VzcGVuZGVkUGFnZUZvcigqdGhpcykgfHwgIW1fcHJvdmlzaW9uYWxQYWdlcy5pc0Vt cHR5KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmICghbV9wcm9jZXNzUG9vbC0+ c2hvdWxkVGVybWluYXRlKHRoaXMpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUHJvY2Vzc1Byb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNz UHJveHkuaAppbmRleCA3NWY2NWE3ZjdlYjFhY2M4MTk5OTFjZTRmOWY2OTg2Yzk1YjYxZmYzLi41 MDQyNjMwZGUzNzFkODVhODI4Mzc0MzQ4YWE5NjkxNzM5YzljZDcwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaApAQCAtNzAsNiArNzAsNyBAQCBuYW1lc3BhY2Ug V2ViS2l0IHsKIGNsYXNzIE5ldHdvcmtQcm9jZXNzUHJveHk7CiBjbGFzcyBPYmpDT2JqZWN0R3Jh cGg7CiBjbGFzcyBQYWdlQ2xpZW50OworY2xhc3MgUHJvdmlzaW9uYWxQYWdlUHJveHk7CiBjbGFz cyBVc2VyTWVkaWFDYXB0dXJlTWFuYWdlclByb3h5OwogY2xhc3MgVmlzaXRlZExpbmtTdG9yZTsK IGNsYXNzIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW07CkBAIC0xMjQsNiArMTI1LDkgQEAgcHVibGlj OgogICAgIGVudW0gY2xhc3MgRW5kc1VzaW5nRGF0YVN0b3JlIDogYm9vbCB7IE5vLCBZZXMgfTsK ICAgICB2b2lkIHJlbW92ZVdlYlBhZ2UoV2ViUGFnZVByb3h5JiwgdWludDY0X3QgcGFnZUlELCBF bmRzVXNpbmdEYXRhU3RvcmUpOwogCisgICAgdm9pZCBhZGRQcm92aXNpb25hbFBhZ2VQcm94eShQ cm92aXNpb25hbFBhZ2VQcm94eSYgcHJvdmlzaW9uYWxQYWdlKSB7IEFTU0VSVCghbV9wcm92aXNp b25hbFBhZ2VzLmNvbnRhaW5zKCZwcm92aXNpb25hbFBhZ2UpKTsgbV9wcm92aXNpb25hbFBhZ2Vz LmFkZCgmcHJvdmlzaW9uYWxQYWdlKTsgfQorICAgIHZvaWQgcmVtb3ZlUHJvdmlzaW9uYWxQYWdl UHJveHkoUHJvdmlzaW9uYWxQYWdlUHJveHkmIHByb3Zpc2lvbmFsUGFnZSkgeyBBU1NFUlQobV9w cm92aXNpb25hbFBhZ2VzLmNvbnRhaW5zKCZwcm92aXNpb25hbFBhZ2UpKTsgbV9wcm92aXNpb25h bFBhZ2VzLnJlbW92ZSgmcHJvdmlzaW9uYWxQYWdlKTsgfQorCiAgICAgdHlwZW5hbWUgV2ViUGFn ZVByb3h5TWFwOjpWYWx1ZXNDb25zdEl0ZXJhdG9yUmFuZ2UgcGFnZXMoKSBjb25zdCB7IHJldHVy biBtX3BhZ2VNYXAudmFsdWVzKCk7IH0KICAgICB1bnNpZ25lZCBwYWdlQ291bnQoKSBjb25zdCB7 IHJldHVybiBtX3BhZ2VNYXAuc2l6ZSgpOyB9CiAgICAgdW5zaWduZWQgdmlzaWJsZVBhZ2VDb3Vu dCgpIGNvbnN0IHsgcmV0dXJuIG1fdmlzaWJsZVBhZ2VDb3VudGVyLnZhbHVlKCk7IH0KQEAgLTMz MCw2ICszMzQsOCBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBsb2dEaWFnbm9zdGljTWVzc2FnZUZv clJlc291cmNlTGltaXRUZXJtaW5hdGlvbihjb25zdCBTdHJpbmcmIGxpbWl0S2V5KTsKIAorICAg IGJvb2wgaGFzUHJvdmlzaW9uYWxQYWdlV2l0aElEKHVpbnQ2NF90IHBhZ2VJRCkgY29uc3Q7CisK ICAgICBlbnVtIGNsYXNzIElzV2VhayB7IE5vLCBZZXMgfTsKICAgICB0ZW1wbGF0ZTx0eXBlbmFt ZSBUPiBjbGFzcyBXZWFrT3JTdHJvbmdQdHIgewogICAgIHB1YmxpYzoKQEAgLTM3Myw2ICszNzks NyBAQCBwcml2YXRlOgogCiAgICAgV2ViUGFnZVByb3h5TWFwIG1fcGFnZU1hcDsKICAgICBXZWJG cmFtZVByb3h5TWFwIG1fZnJhbWVNYXA7CisgICAgSGFzaFNldDxQcm92aXNpb25hbFBhZ2VQcm94 eSo+IG1fcHJvdmlzaW9uYWxQYWdlczsKICAgICBVc2VySW5pdGlhdGVkQWN0aW9uTWFwIG1fdXNl ckluaXRpYXRlZEFjdGlvbk1hcDsKIAogICAgIEhhc2hTZXQ8VmlzaXRlZExpbmtTdG9yZSo+IG1f dmlzaXRlZExpbmtTdG9yZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29k ZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3By b2plY3QucGJ4cHJvagppbmRleCBkZWRiYWRjY2QzNGYwYTQzNGQ2ZGUxNDU0YzQ0YTk4OTIyY2Ew MWNkLi5kN2RhMjdhMDUxMjg5ZTdlNTFmNDhlMmM5ZWNhNzlmYTg5MTEyNDUxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1Nv dXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTMwNzAsNiAr MzA3MCw4IEBACiAJCTQ2NkJDMDM4MUZBMjY2QzkwMDJGQTlDMSAvKiBXZWJTV0NvbnRleHRNYW5h Z2VyQ29ubmVjdGlvbi5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBX ZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCTQ2NkJDMDM5MUZBMjY2QzkwMDJGQTlDMSAvKiBXZWJTV0NvbnRleHRNYW5hZ2VyQ29u bmVjdGlvbi5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXZWJTV0NvbnRleHRN YW5hZ2VyQ29ubmVjdGlvbi5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NjZCQzAz QTFGQTI2NkM5MDAyRkE5QzEgLyogV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24ubWVzc2Fn ZXMuaW4gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSB0ZXh0OyBwYXRoID0gV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rp b24ubWVzc2FnZXMuaW47IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTQ2ODM1NjlBMjFF ODFDQzcwMDZFMjdBMyAvKiBQcm92aXNpb25hbFBhZ2VQcm94eS5oICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jLmg7IHBhdGggPSBQcm92aXNpb25hbFBhZ2VQcm94eS5oOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OworCQk0NjgzNTY5QjIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQYWdl UHJveHkuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gUHJvdmlzaW9u YWxQYWdlUHJveHkuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NkEyQjYwNjFF NTY3NUEyMDBDM0RFREEgLyogQmFja2dyb3VuZFByb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVyLmNw cCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEJhY2tncm91bmRQcm9jZXNz UmVzcG9uc2l2ZW5lc3NUaW1lci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ2 QTJCNjA3MUU1Njc1QTIwMEMzREVEQSAvKiBCYWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVuZXNz VGltZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQmFja2dyb3VuZFByb2Nl c3NSZXNwb25zaXZlbmVzc1RpbWVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ2 REYwNjM5MUYzOTA1RTUwMDE5ODBCQiAvKiBOZXR3b3JrQ09SU1ByZWZsaWdodENoZWNrZXIuY3Bw ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gTmV0d29ya0NPUlNQcmVmbGln aHRDaGVja2VyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTczMTIsNiArNzMx NCw4IEBACiAJCQkJODZFNjdBMjIxOTBGNDExODAwMDA0QUI3IC8qIFByb2Nlc3NUaHJvdHRsZXIu Y3BwICovLAogCQkJCTg2RTY3QTIxMTkwRjQxMTgwMDAwNEFCNyAvKiBQcm9jZXNzVGhyb3R0bGVy LmggKi8sCiAJCQkJODMwNDhBRTUxQUNBNDVEQzAwODJDODMyIC8qIFByb2Nlc3NUaHJvdHRsZXJD bGllbnQuaCAqLywKKwkJCQk0NjgzNTY5QjIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQ YWdlUHJveHkuY3BwICovLAorCQkJCTQ2ODM1NjlBMjFFODFDQzcwMDZFMjdBMyAvKiBQcm92aXNp b25hbFBhZ2VQcm94eS5oICovLAogCQkJCUE1NUJBODFCMUJBMjVCMUUwMDdDRDMzRCAvKiBSZW1v dGVXZWJJbnNwZWN0b3JQcm94eS5jcHAgKi8sCiAJCQkJQTU1QkE4MTkxQkEyNUIxRTAwN0NEMzNE IC8qIFJlbW90ZVdlYkluc3BlY3RvclByb3h5LmggKi8sCiAJCQkJQTU1QkE4MUExQkEyNUIxRTAw N0NEMzNEIC8qIFJlbW90ZVdlYkluc3BlY3RvclByb3h5Lm1lc3NhZ2VzLmluICovLApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwCmluZGV4IDAwNzQ5YjQ3 N2EyNGNlOGNjYzgyNTAxZDk0ZTA4YjYwZWUxYTYyNjMuLmZmZWQwMGM4MjA2YTk0ZjBlNGZmYzdm ZjNhOGE5ZGZmODYxM2ZhYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYkZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJGcmFtZS5jcHAKQEAgLTI2Myw4ICsyNjMsNiBAQCBzdGF0aWMgV2ViQ29yZTo6UG9saWN5 QWN0aW9uIHRvUG9saWN5QWN0aW9uKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24pCiAgICAg ICAgIHJldHVybiBXZWJDb3JlOjpQb2xpY3lBY3Rpb246Oklnbm9yZTsKICAgICBjYXNlIFdlYlBv bGljeUFjdGlvbjo6RG93bmxvYWQ6CiAgICAgICAgIHJldHVybiBXZWJDb3JlOjpQb2xpY3lBY3Rp b246OkRvd25sb2FkOwotICAgIGNhc2UgV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kOgotICAgICAg ICBicmVhazsKICAgICB9CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgcmV0dXJuIFdl YkNvcmU6OlBvbGljeUFjdGlvbjo6SWdub3JlOwpAQCAtMjcyLDExICsyNzAsOCBAQCBzdGF0aWMg V2ViQ29yZTo6UG9saWN5QWN0aW9uIHRvUG9saWN5QWN0aW9uKFdlYlBvbGljeUFjdGlvbiBwb2xp Y3lBY3Rpb24pCiAKIHZvaWQgV2ViRnJhbWU6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1aW50 NjRfdCBsaXN0ZW5lcklELCBXZWJQb2xpY3lBY3Rpb24gYWN0aW9uLCB1aW50NjRfdCBuYXZpZ2F0 aW9uSUQsIERvd25sb2FkSUQgZG93bmxvYWRJRCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0 YT4mJiB3ZWJzaXRlUG9saWNpZXMpCiB7Ci0gICAgaWYgKCFtX2NvcmVGcmFtZSB8fCAhbV9wb2xp Y3lMaXN0ZW5lcklEIHx8IGxpc3RlbmVySUQgIT0gbV9wb2xpY3lMaXN0ZW5lcklEIHx8ICFtX3Bv bGljeUZ1bmN0aW9uKSB7Ci0gICAgICAgIGlmIChhY3Rpb24gPT0gV2ViUG9saWN5QWN0aW9uOjpT dXNwZW5kKQotICAgICAgICAgICAgcGFnZSgpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 OkRpZEZhaWxUb1N1c3BlbmRBZnRlclByb2Nlc3NTd2FwKCkpOworICAgIGlmICghbV9jb3JlRnJh bWUgfHwgIW1fcG9saWN5TGlzdGVuZXJJRCB8fCBsaXN0ZW5lcklEICE9IG1fcG9saWN5TGlzdGVu ZXJJRCB8fCAhbV9wb2xpY3lGdW5jdGlvbikKICAgICAgICAgcmV0dXJuOwotICAgIH0KIAogICAg IEZyYW1lUG9saWN5RnVuY3Rpb24gZnVuY3Rpb24gPSBXVEZNb3ZlKG1fcG9saWN5RnVuY3Rpb24p OwogICAgIGJvb2wgZm9yTmF2aWdhdGlvbkFjdGlvbiA9IG1fcG9saWN5RnVuY3Rpb25Gb3JOYXZp Z2F0aW9uQWN0aW9uID09IEZvck5hdmlnYXRpb25BY3Rpb246OlllczsKQEAgLTI5MiwxNiArMjg3 LDcgQEAgdm9pZCBXZWJGcmFtZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKHVpbnQ2NF90IGxp c3RlbmVySUQsIFdlYlBvbGljeUFjdGlvbiBhY3QKICAgICAgICAgICAgIGRvY3VtZW50TG9hZGVy LT5zZXROYXZpZ2F0aW9uSUQobmF2aWdhdGlvbklEKTsKICAgICB9CiAKLSAgICBib29sIHNob3Vs ZFN1c3BlbmQgPSBmYWxzZTsKLSAgICBpZiAoYWN0aW9uID09IFdlYlBvbGljeUFjdGlvbjo6U3Vz cGVuZCkgewotICAgICAgICBzaG91bGRTdXNwZW5kID0gdHJ1ZTsKLSAgICAgICAgYWN0aW9uID0g V2ViUG9saWN5QWN0aW9uOjpJZ25vcmU7Ci0gICAgfQotCiAgICAgZnVuY3Rpb24odG9Qb2xpY3lB Y3Rpb24oYWN0aW9uKSk7Ci0KLSAgICBpZiAoc2hvdWxkU3VzcGVuZCkKLSAgICAgICAgcGFnZSgp LT5zdXNwZW5kRm9yUHJvY2Vzc1N3YXAoKTsKIH0KIAogdm9pZCBXZWJGcmFtZTo6c3RhcnREb3du bG9hZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFN0cmlu ZyYgc3VnZ2VzdGVkTmFtZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAKaW5kZXggODAzYmE4Yjk5NWVkM2VjODMxYWI0NmI1Mzk3Yzc2NjJlNmE4MWM2NS4u NTc5ZWZiNTMxYmM4ZjNlMGU5ZDNjYWQ2YTNmOTZiZWFhOTVkNzE1ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTQwMSw3ICs0MDEsNyBAQCBX ZWJQYWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCwgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVy cyYmIHBhcmFtZXRlcnMpCiAgICAgLCBtX292ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5IHsg cGFyYW1ldGVycy5vdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSB9CiAgICAgLCBtX2NwdUxp bWl0KHBhcmFtZXRlcnMuY3B1TGltaXQpCiAjaWYgUExBVEZPUk0oTUFDKQotICAgICwgbV9zaG91 bGRBdHRhY2hEcmF3aW5nQXJlYU9uUGFnZVRyYW5zaXRpb24ocGFyYW1ldGVycy5pc1N3YXBGcm9t U3VzcGVuZGVkKQorICAgICwgbV9zaG91bGRBdHRhY2hEcmF3aW5nQXJlYU9uUGFnZVRyYW5zaXRp b24ocGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwKQogI2VuZGlmCiB7CiAgICAgQVNTRVJUKG1fcGFn ZUlEKTsKQEAgLTQ3MSw3ICs0NzEsNyBAQCBXZWJQYWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJ RCwgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAgICAgbV9kcmF3aW5n QXJlYS0+c2V0UGFpbnRpbmdFbmFibGVkKGZhbHNlKTsKICAgICBtX2RyYXdpbmdBcmVhLT5zZXRT aG91bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50KHBhcmFtZXRlcnMuc2hvdWxkU2NhbGVWaWV3VG9G aXREb2N1bWVudCk7CiAKLSAgICBpZiAocGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKQor ICAgIGlmIChwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXApCiAgICAgICAgIGZyZWV6ZUxheWVyVHJl ZShMYXllclRyZWVGcmVlemVSZWFzb246OlN3YXBGcm9tU3VzcGVuZGVkKTsKIAogI2lmIEVOQUJM RShBU1lOQ19TQ1JPTExJTkcpCkBAIC02OTYsNyArNjk2LDcgQEAgdm9pZCBXZWJQYWdlOjpyZWlu aXRpYWxpemVXZWJQYWdlKFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQog ICAgICAgICBtX2RyYXdpbmdBcmVhLT51cGRhdGVQcmVmZXJlbmNlcyhwYXJhbWV0ZXJzLnN0b3Jl KTsKICAgICAgICAgbV9kcmF3aW5nQXJlYS0+c2V0UGFpbnRpbmdFbmFibGVkKHRydWUpOwogI2lm IFBMQVRGT1JNKE1BQykKLSAgICAgICAgbV9zaG91bGRBdHRhY2hEcmF3aW5nQXJlYU9uUGFnZVRy YW5zaXRpb24gPSBwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQ7CisgICAgICAgIG1fc2hv dWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uID0gcGFyYW1ldGVycy5pc1Byb2Nl c3NTd2FwOwogI2VuZGlmCiAgICAgICAgIHVuZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6 ZVJlYXNvbjo6UGFnZVN1c3BlbmRlZCk7CiAgICAgfQpAQCAtMzA1MywxMiArMzA1Myw2IEBAIHZv aWQgV2ViUGFnZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKHVpbnQ2NF90IGZyYW1lSUQsIHVp bnQ2NF90IGxpc3RlbmVySUQsIFdlCiAgICAgV2ViRnJhbWUqIGZyYW1lID0gV2ViUHJvY2Vzczo6 c2luZ2xldG9uKCkud2ViRnJhbWUoZnJhbWVJRCk7CiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAg cmV0dXJuOwotICAgIGlmIChwb2xpY3lBY3Rpb24gPT0gV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5k KSB7Ci0gICAgICAgIEFTU0VSVChmcmFtZSA9PSBtX21haW5GcmFtZSk7Ci0gICAgICAgIHNldElz U3VzcGVuZGVkKHRydWUpOwotCi0gICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnNlbmRQ cmV3YXJtSW5mb3JtYXRpb24obWFpbldlYkZyYW1lKCktPnVybCgpKTsKLSAgICB9CiAgICAgZnJh bWUtPmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihsaXN0ZW5lcklELCBwb2xpY3lBY3Rpb24sIG5h dmlnYXRpb25JRCwgZG93bmxvYWRJRCwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKIH0KIApA QCAtNjMxMiw2ICs2MzA2LDEwIEBAIHZvaWQgV2ViUGFnZTo6c2V0SXNTdXNwZW5kZWQoYm9vbCBz dXNwZW5kZWQpCiAgICAgaWYgKG1faXNTdXNwZW5kZWQpIHsKICAgICAgICAgLy8gVW5mcm96ZW4g b24gZHJhd2luZyBhcmVhIHJlc2V0LgogICAgICAgICBmcmVlemVMYXllclRyZWUoTGF5ZXJUcmVl RnJlZXplUmVhc29uOjpQYWdlU3VzcGVuZGVkKTsKKworICAgICAgICBXZWJQcm9jZXNzOjpzaW5n bGV0b24oKS5zZW5kUHJld2FybUluZm9ybWF0aW9uKG1haW5XZWJGcmFtZSgpLT51cmwoKSk7CisK KyAgICAgICAgc3VzcGVuZEZvclByb2Nlc3NTd2FwKCk7CiAgICAgfSBlbHNlCiAgICAgICAgIG1f c2hvdWxkUmVzZXREcmF3aW5nQXJlYUFmdGVyU3VzcGVuZCA9IHRydWU7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9u RHJhd2luZ0FyZWEubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KaW5kZXggOTFhZDcxYWRlMWI3ZGI0ZjlkY2U2 NGQ0ZjMzMDQ2N2IyMmI4MzNjYy4uODNiNjU5OTI3MGI1MWM3YmIxOGVmZTczN2E1OTJlMDI1NzFh MjgwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Rp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQpAQCAtOTcs NyArOTcsNyBAQCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6VGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWEoV2ViUGFnZSYgd2ViUGFnZSwgYwogICAgIHVwZGF0ZUxheWVySG9zdGlu Z0NvbnRleHQoKTsKICAgICBzZXRDb2xvclNwYWNlKHBhcmFtZXRlcnMuY29sb3JTcGFjZSk7CiAK LSAgICBpZiAoIXBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCkKKyAgICBpZiAoIXBhcmFt ZXRlcnMuaXNQcm9jZXNzU3dhcCkKICAgICAgICAgYXR0YWNoKCk7CiB9CiAKZGlmZiAtLWdpdCBh L1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3ZWJkOGY1YzFkNGZmM2Qz ZTNlMTc4ZjZmNzlhMTgzOTA1ODNiOTE4Li5lNjE0YmIwNzU4MTE3YmEyMmRjMWMwYTdkMzQ4ZmEx OGZiN2JhMjNkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTktMDEtMTQgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFw cGxlLmNvbT4KKworICAgICAgICBSZWdyZXNzaW9uKFBTT04pIFZpZXcgYmVjb21lcyBibGFuayBh ZnRlciBjbGljayBhIGNyb3NzLXNpdGUgZG93bmxvYWQgbGluaworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzMzYxCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS80NzA5OTU3Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGQgQVBJIHRlc3QgY292ZXJhZ2UuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tOgorICAgICAgICAo LVtQU09OTmF2aWdhdGlvbkRlbGVnYXRlIHdlYlZpZXc6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlv blJlc3BvbnNlOmRlY2lzaW9uSGFuZGxlcjpdKToKKwogMjAxOS0wMS0xMSAgV2Vuc29uIEhzaWVo ICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBQcmVjaXNpb24gZHJv cCBzdGF0ZSB0aHJhc2hlcyB3aGVuIGRyYWdnaW5nIG5lYXIgdGhlIHRvcCBlZGdlIG9mIGFuIGVk aXRhYmxlIGVsZW1lbnQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCmluZGV4IGYzNWQ4 YmFhMzUzZjA3MDI0ZmQ0MGU3ZDUyNzQ1M2E3NDIxMGMzYmEuLmQ1YmQ1ZWM3NzZiZDVlMTdiMGJk OWM5NDAwMmNjYjU0NDdjYTVkMDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KKysrIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQpA QCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTcgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDE3LTIwMTkgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC03 Miw2ICs3Miw3IEBAIHN0YXRpYyBib29sIHNlcnZlclJlZGlyZWN0ZWQ7CiBzdGF0aWMgSGFzaFNl dDxwaWRfdD4gc2VlblBJRHM7CiBzdGF0aWMgYm9vbCB3aWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0 Owogc3RhdGljIGJvb2wgZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0Oworc3RhdGljIGJvb2wgc2hv dWxkQ29udmVydFRvRG93bmxvYWQ7CiBzdGF0aWMgUmV0YWluUHRyPE5TVVJMPiBjbGllbnRSZWRp cmVjdFNvdXJjZVVSTDsKIHN0YXRpYyBSZXRhaW5QdHI8TlNVUkw+IGNsaWVudFJlZGlyZWN0RGVz dGluYXRpb25VUkw7CiAKQEAgLTEyOCw2ICsxMjksMTEgQEAgLSAodm9pZCl3ZWJWaWV3OihXS1dl YlZpZXcgKil3ZWJWaWV3IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246KFdLTmF2aWdh dGkKICAgICBkaWRSZXBvbmRUb1BvbGljeURlY2lzaW9uQ2FsbCA9IHRydWU7CiB9CiAKKy0gKHZv aWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u UmVzcG9uc2U6KFdLTmF2aWdhdGlvblJlc3BvbnNlICopbmF2aWdhdGlvblJlc3BvbnNlIGRlY2lz aW9uSGFuZGxlcjoodm9pZCAoXikoV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3kpKWRlY2lzaW9u SGFuZGxlcgoreworICAgIGRlY2lzaW9uSGFuZGxlcihzaG91bGRDb252ZXJ0VG9Eb3dubG9hZCA/ IF9XS05hdmlnYXRpb25SZXNwb25zZVBvbGljeUJlY29tZURvd25sb2FkIDogV0tOYXZpZ2F0aW9u UmVzcG9uc2VQb2xpY3lBbGxvdyk7Cit9CisKIC0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICop d2ViVmlldyBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbE5hdmlnYXRpb246 KFdLTmF2aWdhdGlvbiAqKW5hdmlnYXRpb24KIHsKICAgICBzZWVuUElEcy5hZGQoW3dlYlZpZXcg X3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7CkBAIC0xNDA1LDcgKzE0MTEsNyBAQCBURVNUKFByb2Nl c3NTd2FwLCBTZXJ2ZXJSZWRpcmVjdCkKIAogICAgIEVYUEVDVF9GQUxTRShzZXJ2ZXJSZWRpcmVj dGVkKTsKICAgICBFWFBFQ1RfRVEoMywgbnVtYmVyT2ZEZWNpZGVQb2xpY3lDYWxscyk7Ci0gICAg RVhQRUNUX0VRKDJ1LCBzZWVuUElEcy5zaXplKCkpOworICAgIEVYUEVDVF9FUSgzdSwgc2VlblBJ RHMuc2l6ZSgpKTsKIH0KIAogVEVTVChQcm9jZXNzU3dhcCwgU2VydmVyUmVkaXJlY3QyKQpAQCAt MTQ2Nyw2ICsxNDczLDEwOSBAQCBURVNUKFByb2Nlc3NTd2FwLCBTZXJ2ZXJSZWRpcmVjdDIpCiAg ICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4xLmh0bWwiLCBb W3dlYlZpZXcgVVJMXSBhYnNvbHV0ZVN0cmluZ10pOwogfQogCitzdGF0aWMgY29uc3QgY2hhciog bGlua1RvV2ViS2l0Qnl0ZXMgPSBSIlBTT05SRVNPVVJDRSgKKzxib2R5PgorICA8YSBpZD0idGVz dExpbmsiIGhyZWY9InBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiPkxpbms8L2E+Cis8 L2JvZHk+CispUFNPTlJFU09VUkNFIjsKKworVEVTVChQcm9jZXNzU3dhcCwgUG9saWN5Q2FuY2Vs QWZ0ZXJTZXJ2ZXJSZWRpcmVjdCkKK3sKKyAgICBhdXRvIHByb2Nlc3NQb29sQ29uZmlndXJhdGlv biA9IGFkb3B0TlMoW1tfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsK KyAgICBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1N3YXBzT25OYXZpZ2F0 aW9uID0gWUVTOworICAgIGF1dG8gcHJvY2Vzc1Bvb2wgPSBhZG9wdE5TKFtbV0tQcm9jZXNzUG9v bCBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24u Z2V0KCldKTsKKworICAgIGF1dG8gd2ViVmlld0NvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tX ZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3Q29uZmlndXJh dGlvbiBzZXRQcm9jZXNzUG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07CisgICAgYXV0byBoYW5kbGVy ID0gYWRvcHROUyhbW1BTT05TY2hlbWUgYWxsb2NdIGluaXRdKTsKKyAgICBbaGFuZGxlciBhZGRN YXBwaW5nRnJvbVVSTFN0cmluZzpAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiIHRv RGF0YTpsaW5rVG9XZWJLaXRCeXRlc107CisgICAgW2hhbmRsZXIgYWRkUmVkaXJlY3RGcm9tVVJM U3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCIgdG9VUkxTdHJpbmc6QCJw c29uOi8vd3d3LmFwcGxlLmNvbS9pZ25vcmUuaHRtbCJdOworICAgIFt3ZWJWaWV3Q29uZmlndXJh dGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAicHNv biJdOworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5p dFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZp ZXdDb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBh ZG9wdE5TKFtbUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJW aWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCldOworCisg ICAgbmF2aWdhdGlvbkRlbGVnYXRlLT5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uID0g XihXS05hdmlnYXRpb25BY3Rpb24gKmFjdGlvbiwgdm9pZCAoXmRlY2lzaW9uSGFuZGxlcikoV0tO YXZpZ2F0aW9uQWN0aW9uUG9saWN5KSkgeworICAgICAgICBpZiAoW2FjdGlvbi5yZXF1ZXN0LlVS TC5hYnNvbHV0ZVN0cmluZyBoYXNTdWZmaXg6QCJpZ25vcmUuaHRtbCJdKSB7CisgICAgICAgICAg ICBkZWNpc2lvbkhhbmRsZXIoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5Q2FuY2VsKTsKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBkZWNpc2lvbkhhbmRsZXIoV0tOYXZp Z2F0aW9uQWN0aW9uUG9saWN5QWxsb3cpOworICAgIH07CisKKyAgICBOU1VSTFJlcXVlc3QgKnJl cXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5n OkAicHNvbjovL3d3dy5nb29nbGUuY29tL21haW4uaHRtbCJdXTsKKyAgICBbd2ViVmlldyBsb2Fk UmVxdWVzdDpyZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7 CisgICAgZG9uZSA9IGZhbHNlOworICAgIGF1dG8gcGlkQWZ0ZXJGaXJzdExvYWQgPSBbd2ViVmll dyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworCisgICAgRVhQRUNUX0VRKDEsIG51bWJlck9mRGVj aWRlUG9saWN5Q2FsbHMpOworCisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAidGVz dExpbmsuY2xpY2soKSIgY29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKworICAgIFRlc3RXZWJLaXRB UEk6OlV0aWw6OnJ1bigmZmFpbGVkKTsKKyAgICBmYWlsZWQgPSBmYWxzZTsKKyAgICBkb25lID0g ZmFsc2U7CisKKyAgICBFWFBFQ1RfRVEoMywgbnVtYmVyT2ZEZWNpZGVQb2xpY3lDYWxscyk7CisK KyAgICAvLyBXZSBzaG91bGQgc3RpbGwgYmUgb24gZ29vZ2xlLmNvbS4KKyAgICBFWFBFQ1RfRVEo cGlkQWZ0ZXJGaXJzdExvYWQsIFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0pOworICAg IEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiLCBbW3dl YlZpZXcgVVJMXSBhYnNvbHV0ZVN0cmluZ10pOworCisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZh U2NyaXB0OkAidGVzdExpbmsuaW5uZXJUZXh0IiBjb21wbGV0aW9uSGFuZGxlcjogWyZdIChpZCBp bm5lclRleHQsIE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAIkxp bmsiLCBpbm5lclRleHQpOworICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBUZXN0 V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKK30KKworVEVT VChQcm9jZXNzU3dhcCwgQ3Jvc3NTaXRlRG93bmxvYWQpCit7CisgICAgYXV0byBwcm9jZXNzUG9v bENvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFs bG9jXSBpbml0XSk7CisgICAgcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NT d2Fwc09uTmF2aWdhdGlvbiA9IFlFUzsKKyAgICBhdXRvIHByb2Nlc3NQb29sID0gYWRvcHROUyhb W1dLUHJvY2Vzc1Bvb2wgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xD b25maWd1cmF0aW9uLmdldCgpXSk7CisKKyAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0g YWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2Vi Vmlld0NvbmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0KCldOworICAg IGF1dG8gaGFuZGxlciA9IGFkb3B0TlMoW1tQU09OU2NoZW1lIGFsbG9jXSBpbml0XSk7CisgICAg W2hhbmRsZXIgYWRkTWFwcGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3Lmdvb2dsZS5jb20v bWFpbi5odG1sIiB0b0RhdGE6bGlua1RvV2ViS2l0Qnl0ZXNdOworICAgIFtoYW5kbGVyIGFkZE1h cHBpbmdGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCIgdG9E YXRhOiJIZWxsbyJdOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5k bGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAicHNvbiJdOworCisgICAgYXV0byB3ZWJW aWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0 KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0aW9uLmdldCgp XSk7CisgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBhZG9wdE5TKFtbUFNPTk5hdmlnYXRp b25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxl Z2F0ZTpuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCldOworCisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1 ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpA InBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiXV07CisgICAgW3dlYlZpZXcgbG9hZFJl cXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOwor ICAgIGRvbmUgPSBmYWxzZTsKKyAgICBhdXRvIHBpZEFmdGVyRmlyc3RMb2FkID0gW3dlYlZpZXcg X3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKworICAgIHNob3VsZENvbnZlcnRUb0Rvd25sb2FkID0g dHJ1ZTsKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJ0ZXN0TGluay5jbGljaygp IiBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVu KCZmYWlsZWQpOworICAgIGZhaWxlZCA9IGZhbHNlOworICAgIHNob3VsZENvbnZlcnRUb0Rvd25s b2FkID0gZmFsc2U7CisKKyAgICAvLyBXZSBzaG91bGQgc3RpbGwgYmUgb24gZ29vZ2xlLmNvbS4K KyAgICBFWFBFQ1RfRVEocGlkQWZ0ZXJGaXJzdExvYWQsIFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRl bnRpZmllcl0pOworICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9t YWluLmh0bWwiLCBbW3dlYlZpZXcgVVJMXSBhYnNvbHV0ZVN0cmluZ10pOworCisgICAgW3dlYlZp ZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAidGVzdExpbmsuaW5uZXJUZXh0IiBjb21wbGV0aW9uSGFu ZGxlcjogWyZdIChpZCBpbm5lclRleHQsIE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAgIEVYUEVD VF9XS19TVFJFUShAIkxpbmsiLCBpbm5lclRleHQpOworICAgICAgICBkb25lID0gdHJ1ZTsKKyAg ICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBm YWxzZTsKK30KKwogZW51bSBjbGFzcyBTaG91bGRFbmFibGVQU09OIHsgTm8sIFllcyB9Owogc3Rh dGljIHZvaWQgcnVuQ2xpZW50U2lkZVJlZGlyZWN0VGVzdChTaG91bGRFbmFibGVQU09OIHNob3Vs ZEVuYWJsZVBTT04pCiB7CkBAIC0yMjMyLDEyICsyMzQxLDI3IEBAIFRFU1QoUHJvY2Vzc1N3YXAs IFBhZ2VTaG93SGlkZSkKIAogICAgIEVYUEVDVF9FUSg3dSwgW3JlY2VpdmVkTWVzc2FnZXMgY291 bnRdKTsKICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5o dG1sIC0gcGFnZXNob3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMF0p OwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwg LSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKLSAgICBF WFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlc2hv dyBOT1QgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7Ci0gICAgRVhQRUNU X1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVy c2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVR KEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIs IHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNF0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246 Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZl ZE1lc3NhZ2VzLmdldCgpWzVdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFw cGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2Vz LmdldCgpWzZdKTsKKyAgICBpZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0gaGFzUHJlZml4 OkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9X S19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJz aXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NU UkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgTk9UIHBlcnNp c3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOworICAgIH0gZWxzZSB7CisgICAgICAg IEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2Vz aG93IE5PVCBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKKyAgICAgICAg RVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2Vo aWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOworICAgIH0KKyAgICBp ZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10gaGFzUHJlZml4OkAicHNvbjovL3d3dy5hcHBs ZS5jb20vbWFpbi5odG1sIl0pIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3 dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNz YWdlcy5nZXQoKVszXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Vi a2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2Vz LmdldCgpWzRdKTsKKyAgICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29u Oi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2 ZWRNZXNzYWdlcy5nZXQoKVszXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93 d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVz c2FnZXMuZ2V0KClbNF0pOworICAgIH0KKyAgICBpZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClb NV0gaGFzUHJlZml4OkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJdKSB7CisgICAg ICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBw YWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdKTsKKyAgICAgICAg RVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNo b3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7CisgICAgfSBlbHNlIHsK KyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1s IC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7CisgICAg ICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBw YWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAgICB9CiB9 CiAKIC8vIERpc2FibGluZyB0aGUgcGFnZSBjYWNoZSBleHBsaWNpdGx5IGlzIChmb3Igc29tZSBy ZWFzb24pIG5vdCBhdmFpbGFibGUgb24gaU9TLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDlmZWJlZjk5NjBkODA5YjQ4ZDMy NDdmODJjZWVhNTBhOGU5MGE2YjcuLjZlMmE1NTk3OTNiNWVmZjVkNTA0ZTljNTZhOTYxMjBiZTU2 MWEzODggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxOS0wMS0xNCAgQ2hyaXMgRHVtZXogIDxj ZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFJlZ3Jlc3Npb24oUFNPTikgVmlldyBiZWNvbWVz IGJsYW5rIGFmdGVyIGNsaWNrIGEgY3Jvc3Mtc2l0ZSBkb3dubG9hZCBsaW5rCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMzNjEKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzQ3MDk5NTczPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFNraXAgdGVzdCB0ZXN0aW5nIHRoZSBjcm9zcy1wcm9jZXNzIERPTVdp bmRvdyBBUEkgYXMgSSBicm9rZSBpdCB3aXRoIHRoaXMgcGF0Y2guCisgICAgICAgIFRoZSBmZWF0 dXJlIGlzIGZhciBmcm9tIHJlYWR5IGFuZCBvZmYgYnkgZGVmYXVsdCBhbnl3YXkuIEkgd2lsbCBh ZGQgc3VwcG9ydCBiYWNrCisgICAgICAgIGluIGEgZm9sbG93LXVwLgorCisgICAgICAgICogcGxh dGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTktMDEtMTEgIEFudHRpIEtvaXZpc3Rv ICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbGVhc2UgYXNzZXJ0IHdoZW4gcmVtb3Zp bmcgZWxlbWVudCB3aXRoIGEgbWFwIGVsZW1lbnQgaW4gdGhlIHNoYWRvdyB0cmVlCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRl c3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDhlOTU5ZWRhZmZkODkyN2Vm OWMyYWFjMzE2ZTllMzEwMGNkMTQwY2IuLjlkOTBiZThiNDhlNTdjOTYwYmNkYTY4NmNlMjQ0MGQ3 MTM4YmIwZjYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0 YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zCkBA IC03MzMsOCArNzMzLDggQEAgaHR0cC90ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL3JlbW92 ZS1ibG9ja2luZy1pbi1yZWRpcmVjdC5odG1sIFsgU2tpcCBdCiBodHRwL3Rlc3RzL3Jlc291cmNl TG9hZFN0YXRpc3RpY3Mvbm9uLXByZXZhbGVudC1yZXNvdXJjZXMtY2FuLWFjY2Vzcy1jb29raWVz LWluLWEtdGhpcmQtcGFydHktY29udGV4dC5odG1sIFsgU2tpcCBdCiBodHRwL3Rlc3RzL3Jlc291 cmNlTG9hZFN0YXRpc3RpY3MvY2FwLWNhY2hlLW1heC1hZ2UtZm9yLXByZXZhbGVudC1yZXNvdXJj ZS5odG1sIFsgU2tpcCBdCiAKLSMgUHJvY2VzcyBzd2FwcGluZyBpcyBvbmx5IGltcGxlbWVudGVk IG9uIFdlYktpdDIuCi1odHRwL3Rlc3RzL25hdmlnYXRpb24vcHJvY2Vzcy1zd2FwLXdpbmRvdy1v cGVuLmh0bWwgWyBQYXNzIF0KKyMgVGhpcyBmZWF0dXJlIGlzIGN1cnJlbnRseSBkaXNhYmxlZCBi eSBkZWZhdWx0IGFuZCB1bmZpbmlzaGVkIDxyZGFyOi8vcHJvYmxlbS8zODkyNTA3Nz4uCitodHRw L3Rlc3RzL25hdmlnYXRpb24vcHJvY2Vzcy1zd2FwLXdpbmRvdy1vcGVuLmh0bWwgWyBTa2lwIF0K IAogIyBDcm9zcy1PcmlnaW4tUmVzb3VyY2UtUG9saWN5IHJlc3BvbnNlIGhlYWRlciBpcyBvbmx5 IGltcGxlbWVudGVkIGluIFdlYktpdDIuCiBodHRwL3dwdC9jcm9zcy1vcmlnaW4tcmVzb3VyY2Ut cG9saWN5LyBbIFBhc3MgXQo= 359163 2019-01-15 08:45:27 -0800 2019-01-15 09:15:35 -0800 Patch bug-193361-20190115084526.patch text/plain 102289 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5ODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Y4YjllNWYwMzU1YTQ0 MzU0Yjc4OTdlMTRhNjE0MDQwYzVmNWY0MC4uZDU5NjJjYzJhMTgwMTQ0OGFhY2YzNWVkZGIxMDNk NjMwYWZmNDM2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAxLTE1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBW aWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAg ICAgIFdoZW4gcmVzdG9yaW5nIGZyb20gUGFnZUNhY2hlLCBtYWtlIHN1cmUgd2Ugbm90aWZ5IHRo ZSBjbGllbnQgdGhhdCB0aGUgbG9hZCB3YXMgY29tbWl0dGVkCisgICAgICAgICpiZWZvcmUqIHdl IHRlbGwgaXQgdGhhdCB0aGUgbmF2aWdhdGlvbiBpcyBjb21wbGV0ZS4gVGhpcyB3b3VsZCBjb25m dXNlIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eQorICAgICAgICBsb2dpYyBpbiB0aGUgVUlQcm9j ZXNzLgorCiAyMDE5LTAxLTEwICBKdXN0aW4gRmFuICA8anVzdGluX2ZhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW1dlYkdQVV0gQWRkIEJpbmRHcm91cEJpbmRpbmcsIEJpbmRHcm91cERlc2NyaXB0 b3IsIGFuZCBCdWZmZXJCaW5kaW5nIGRpY3Rpb25hcmllcyBmcm9tIEFQSQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAw ZjAwYWJjZDhkYzUyZGViNmE3ZWViMTc2NmU4YjAxNjIxMDY1OGU2Li5hYmM1Y2Q3MDVmNTBkMDU2 YTFiYzA0MTllZThjNWUzZGU4YWY4NWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwMCBAQAorMjAx OS0wMS0xNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFJlZ3Jl c3Npb24oUFNPTikgVmlldyBiZWNvbWVzIGJsYW5rIGFmdGVyIGNsaWNrIGEgY3Jvc3Mtc2l0ZSBk b3dubG9hZCBsaW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTMzNjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBpc3N1ZSB0cmFja2Vk IGJ5IHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczIGlzIHRoYXQgYSBwcm92aXNpb25hbCBsb2FkIG1h eSBnZXQKKyAgICAgICAgY2FuY2VsZWQgKG9yIGNvbnZlcnRlZCBpbnRvIGEgZG93bmxvYWQpICph ZnRlciogd2UndmUgZGVjaWRlZCB0byBwcm9jZXNzLXN3YXAuCisgICAgICAgIEluIHN1Y2ggY2Fz ZXMsIHRoZSB2aWV3IHNob3VsZCBrZWVwIGRpc3BsYXlpbmcgdGhlIGN1cnJlbnQgc2l0ZSBhbmQg aXQgc2hvdWxkCisgICAgICAgIHN0aWxsIGJlIGludGVyYWN0aXZlLiBIb3dldmVyLCB3aXRoIHRo ZSBwcmV2aW91cyBQU09OIG1vZGVsLCB0aGUgdmlldyAocGFnZVByb3h5KQorICAgICAgICB3b3Vs ZCBoYXZlIGFscmVhZHkgc3dhcHBlZCB0byB0aGUgbmV3IHByb2Nlc3MgYW5kIHdvdWxkIGVuZCB1 cCBkaXNwbGF5aW5nIHRoZQorICAgICAgICBpbml0aWFsbHkgZW1wdHkgZG9jdW1lbnQuCisKKyAg ICAgICAgVG8gYWRkcmVzcyB0aGUgaXNzdWUsIHRoaXMgcGF0Y2ggaW50cm9kdWNlcyB0aGUgY29u Y2VwdCBvZiBhIHByb3Zpc2lvbmFsIGxvYWQKKyAgICAgICAgaW4gdGhlIFVJUHJvY2VzcywgaGFu ZGxlZCBieSBhIFByb3Zpc2lvbmFsUGFnZVByb3h5IHdoaWNoIGhhcyBpdHMgb3duIHByaXZpc2lv bmFsCisgICAgICAgIHByb2Nlc3MuIFRoZSBXZWJQYWdlUHJveHkgb3ducyB0aGUgUHJvdmlzaW9u YWxQYWdlUHJveHkgYnV0IHdlIGRvIG5vdCBjb21taXQgdGhlCisgICAgICAgIHByb3Zpc2lvbmFs IHBhZ2UgdW50aWwgYWZ0ZXIgdGhlIGxvYWQgd2FzIGNvbW1pdHRlZCBpbiB0aGUgbmV3IHByb2Nl c3MuIFRoaXMgbWVhbnMKKyAgICAgICAgdGhhdCB0aGUgdmlldyAvIFdlYlBhZ2VQcm94eSBrZWVw cyB1c2luZyB0aGUgb2xkIHByb2Nlc3MgYW5kIGRpc3BsYXlzIHRoZSBjdXJyZW50CisgICAgICAg IGNvbnRlbnQgdW50aWwgYSBsb2FkIGhhcyBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHBh Z2UuIElmIG5vIGxvYWQgY29tbWl0cworICAgICAgICBpbiB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vz cyAoZS5nLiBiZWNhdXNlIHRoZSBsb2FkIGlzIGNhbmNlbGxlZCBvciBjb252ZXJ0ZWQgaW50bwor ICAgICAgICBhIGRvd25sb2FkKSwgdGhlbiB3ZSBtZXJlbHkgZGVzdHJveSB0aGUgUHJvdmlzaW9u YWxQYWdlUHJveHkgYW5kIHRlcm1pbmF0ZSBpdHMKKyAgICAgICAgcHJvY2Vzcywgd2l0aG91dCBp bXBhY3RpbmcgdGhlIFdlYlBhZ2VQcm94eS4KKworICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVyczo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVycy5oOgorICAgICAgICBSZW5hbWUgaXNTd2FwRnJvbVN1c3BlbmRlZCB0byBpc1Byb2Nl c3NTd2FwIGZvciBjbGFyaXR5IGFzIHdlIGFsd2F5cyB3YW50IHRvCisgICAgICAgIGRlbGF5IGF0 dGFjaGluZyB0aGUgZHJhd2luZyBhcmVhIGluIGNhc2Ugb2YgYSBwcm9jZXNzLXN3YXAsIG5vIG1h dHRlciB3aGF0CisgICAgICAgIG5vdyB0aGF0IHRoZSBwcmV2aW91cyBwcm9jZXNzIGlzIGtlcHQg YWxpdmUgdW50aWwgdGhlIHByb3Zpc2lvbmFsIGxvYWQgaXMKKyAgICAgICAgY29tbWl0dGVkIGlu IHRoZSBuZXcgcHJvY2Vzcy4KKworICAgICAgICAqIFNoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaDoK KyAgICAgICAgRHJvcCBTdXNwZW5kIHBvbGljeSBhY3Rpb24uIEF0IGRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb24gdGltZSwgaW4gY2FzZSBvZgorICAgICAgICBwcm9jZXNzLXN3YXAsIHdl IG5vdyB0ZWxsIHRoZSBwcmV2aW91cyBwcm9jZXNzIHRvIHNpbXBseSBpZ25vcmUgdGhlIGxvYWQs IHdoaWxlCisgICAgICAgIHdlIGNyZWF0ZSBhIFByb3Zpc2lvbmFsUGFnZVByb3h5IHRvIGRvIHRo ZSBuZXcgbG9hZCBpbiBhIG5ldyBwcm9jZXNzLgorICAgICAgICBTdXNwZW5zaW9uIG9mIHRoZSBw cmV2aW91cyBwYWdlIGluIHRoZSBvbGQgcHJvY2VzcywgaGFwcGVucyBsYXRlciwgd2hlbiBhIGxv YWQKKyAgICAgICAgaXMgYWN0dWFsbHkgY29tbWl0dGVkIGluIHRoZSBuZXcgcHJvY2Vzcy4KKwor ICAgICAgICAqIFNvdXJjZXMudHh0OgorICAgICAgICBBZGQgbmV3IFByb3Zpc2lvbmFsUGFnZVBy b3h5IGZpbGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToK KyAgICAgICAgKC1bV0tXZWJWaWV3IF9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0YXRl XSk6CisgICAgICAgIFdoZW4gY2FsbGluZyBfa2lsbFdlYkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRT dGF0ZSBvbiBhIFdLV2ViVmlldywga2lsbCBib3RoIHRoZSBjdXJyZW50CisgICAgICAgIHByb2Nl c3MgYW5kIHRoZSBwcm92aXNpb25hbCBvbmUsIHRvIG1haW50YWluIHByZXZpb3VzIGJlaGF2aW9y IGluIG91ciBBUEkgdGVzdHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUNsaWVudC5oOgor ICAgICAgICBUaW55IGJ1aWxkIGZpeC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Qcm92aXNpb25h bFBhZ2VQcm94eS5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQ cm94eTo6UHJvdmlzaW9uYWxQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25h bFBhZ2VQcm94eTo6flByb3Zpc2lvbmFsUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OnRha2VEcmF3aW5nQXJlYSk6CisgICAgICAgIChXZWJLaXQ6OlBy b3Zpc2lvbmFsUGFnZVByb3h5OjpjYW5jZWwpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25h bFBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6bG9hZERhdGFXaXRoTmF2aWdhdGlvbik6CisgICAgICAgIChXZWJLaXQ6 OlByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKToKKyAgICAg ICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0pOgor ICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1l KToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlz aW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94 eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJL aXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2FnZSk6CisgICAgICAgIChX ZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlU3luY01lc3NhZ2UpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oOiBBZGRlZC4KKyAgICAgICAg KFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OnBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpQ cm92aXNpb25hbFBhZ2VQcm94eTo6bWFpbkZyYW1lIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6 UHJvdmlzaW9uYWxQYWdlUHJveHk6OnByb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBjb25zdCk6CisgICAg ICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpuYXZpZ2F0aW9uSUQgY29uc3QpOgor ICAgICAgICBBZGQgbmV3IFByb3Zpc2lvbmFsUGFnZVByb3h5IGNsYXNzIHRvIHdyYXAgdGhlIHBy b3Zpc2lvbmFsIGxvYWQgaW4gdGhlIG5ldyBwcm9jZXNzCisgICAgICAgIGFmdGVyIGEgc3dhcC4g VGhlIHByb3Zpc2lvbmFsIHBhZ2UgaXMgb3duZWQgYnkgdGhlIFdlYlBhZ2VQcm94eSBhbmQgd2Ug b25seSBjb21taXQKKyAgICAgICAgdGhlIHByb3Zpc2lvbmFsIHBhZ2Ugd2hlbiB0aGUgbG9hZCBp cyBjb21taXR0ZWQuIFVudGlsIHRoZW4sIHRoZSBXZWJQYWdlUHJveHkga2VlcHMKKyAgICAgICAg dXNpbmcgdGhlIG9sZCBwcm9jZXNzIGFuZCBkaXNwbGF5aW5nIHRoZSBjdXJyZW50IGNvbnRlbnQu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5Ojp+U3VzcGVuZGVkUGFnZVByb3h5KToKKyAgICAg ICAgKFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5Ojp1bnN1c3BlbmQpOgorICAgICAgICAoV2Vi S2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6OmRpZFByb2Nlc3NSZXF1ZXN0VG9TdXNwZW5kKToKKyAg ICAgICAgVW5yZWdpc3RlciB0aGUgU3VzcGVuZGVkUGFnZVByb3h5IGFzIGFuIElQQyBtZXNzYWdl IHJlY2VpdmVyIGEgbGl0dGxlIGJpdCBlYXJsaWVyCisgICAgICAgIHdoZW4gd2UncmUgZ29pbmcg dG8gdW5zdXNwZW5kIGl0LiBUaGlzIGF2b2lkcyBjb25mbGljdGluZyB3aXRoIHRoZSBQcm92aXNp b25hbFBhZ2VQcm94eQorICAgICAgICB3aGljaCB0cmllcyB0byByZWdpc3RlciBpdHNlbGYgYXMg YW4gSVBDIG1lc3NhZ2UgcmVjZWl2ZXIgZm9yIHRoZSBzYW1lIHBhZ2VJRCB3aGVuCisgICAgICAg IGEgcHJvY2Vzcy1zd2FwIG9jY3VycyBhbmQgd2UncmUgc3dpdGNoaW5nIHRvIGEgc3VzcGVuZGVk IHBhZ2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkZyYW1lUHJveHk6OmlzTWFpbkZyYW1lIGNvbnN0KToKKyAgICAgICAgV2Vi RnJhbWVQcm94eTo6aXNNYWluRnJhbWUoKSByZWxpZXMgb24gY2hlY2tpbmcgdGhhdCB0aGUgZnJh bWUgaXMgdGhlIFdlYlBhZ2VQcm94eSdzIG1fbWFpbkZyYW1lLgorICAgICAgICBOb3cgdGhhdCB0 aGUgV2ViUGFnZVByb3h5IGNhbiBoYXZlIGEgUHJvdmlzaW9uYWxQYWdlUHJveHksIGFsc28gY2hl Y2sgaWYgaXQgaXMgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5J3MKKyAgICAgICAgbV9tYWluRnJh bWUgdG8gbWFpbnRhaW4gcHJldmlvdXMgYmVoYXZpb3IuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpzd2FwVG9X ZWJQcm9jZXNzKToKKyAgICAgICAgc3dhcFRvV2ViUHJvY2VzcygpIG5vIGxvbmdlciB0YWtlcyBj YXJlIG9mIHVuc3VzcGVuZGluZyB0aGUgU3VzcGVuZGVkUGFnZSBiZWNhdXNlIHdlIG5vdyBjYWxs IHN3YXBUb1dlYlByb2Nlc3MoKQorICAgICAgICBsYXRlciwgd2hlbiBhIGxvYWQgaXMgYWN0dWFs bHkgY29tbWl0dGVkIGluIHRoZSBwcm92aXNpb25hbCBwYWdlIC8gcHJvY2Vzcy4gc3dhcFRvV2Vi UHJvY2VzcygpIG5vdyBhbHNvIG5lZWRzCisgICAgICAgIHRvIGluaXRpYWxpemUgc29tZSBkYXRh IG1lbWJlcnMgc3VjaCBhcyB0aGUgZHJhd2luZyBhcmVhIGFuZCB0aGUgbWFpbiBmcmFtZSBhcyBp dCBpcyB0cmFuc2ZlcnJpbmcgdGhlbSBvdmVyIGZyb20KKyAgICAgICAgdGhlIFByb3Zpc2lvbmFs UGFnZVByb3h5IHdoaWNoIHN0YXJ0ZWQgdGhlIHByb3Zpc2lvbmFsIGxvYWQuCisKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MpOgorICAg ICAgICBXZSBubyBsb25nZXIgbmVlZCBJc1N3YXBGcm9tU3VzcGVuZGVkIHBhcmFtZXRlciBhcyB0 aGlzIGlzIGNhbGxlZCBsYXRlciBub3csIGFmdGVyIGEgbG9hZCBoYXMgYWN0dWFsbHkgYmVlbgor ICAgICAgICBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHByb2Nlc3MuCisKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSk6CisgICAgICAgIC0gV2Ug bm8gbG9uZ2VyIG5lZWQgSXNTd2FwRnJvbVN1c3BlbmRlZCBwYXJhbWV0ZXIgYXMgdGhpcyBpcyBj YWxsZWQgbGF0ZXIgbm93LCBhZnRlciBhIGxvYWQgaGFzIGFjdHVhbGx5IGJlZW4KKyAgICAgICAg ICBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHByb2Nlc3MuCisgICAgICAgIC0gRmFjdG9y IHNvbWUgY29kZSBvdXQgdG8gV2ViUGFnZVByb3h5OjpzZXREcmF3aW5nQXJlYSgpIHNvIHRoYXQg aXQgY2FuIGJlIHNoYXJlZCB3aXRoIHN3YXBUb1dlYlByb2Nlc3MoKS4KKworICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24pOgorICAgICAgICBP bmx5IGNhbGwgc2V0UGVuZGluZ0FQSVJlcXVlc3RVUkwoKSBpbiBsb2FkUmVxdWVzdFdpdGhOYXZp Z2F0aW9uKCkgb25seSBpZiBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQgaXMgbm90CisgICAg ICAgIFllcy4gVGhpcyBhdm9pZHMgaGl0dGluZyBzb21lIGFzc2VydGlvbnMgYXMgdGhpcyB3YXMg YWxyZWFkeSBjYWxsZWQgZHVyaW5nIHRoZSBmaXJzdCBBUEkgY2FsbCBpZiBuZWVkZWQuCisKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZWNlaXZlZE5hdmlnYXRpb25Qb2xpY3lEZWNp c2lvbik6CisgICAgICAgIEluIGNhc2Ugb2YgcHJvY2VzcyBzd2FwLCB0ZWxsIHRoZSBwcmV2aW91 cyBwcm9jZXNzIHRvIGlnbm9yZSB0aGUgbG9hZCBpbnN0ZWFkIG9mIHN1c3BlbmRpbmcgaXQgcmln aHQgYXdheS4KKyAgICAgICAgU3VzcGVuc2lvbiBub3cgaGFwcGVucyBsYXRlciwgb25seSBpZiB3 ZSBlbmQgdXAgY29tbWl0dGluZyB0aGUgcHJvdmlzaW9uYWwgbG9hZCBpbiB0aGUgbmV3IHByb2Nl c3MuCisgICAgICAgIEFsc28gZGlzY2FyZCB0aGUgU3VzcGVuZGVkUGFnZSBpZiBpdCBmYWlsZWQg dG8gc3VzcGVuZCAod2Ugb25seSByZXVzZSBpdHMgcHJvY2VzcyBpbiB0aGlzIGNhc2UpLiBUaGlz IHVzZWQKKyAgICAgICAgdG8gaGFwcGVuIGEgYml0IGxhdGVyIGJ1dCBpdCBpcyBjbGVhcmVyIGlm IHdlIGRvIHRoaXMgYXMgZWFybHkgYXMgcG9zc2libGUgSSB0aGluay4KKworICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmNvbW1pdFByb3Zpc2lvbmFsUGFnZSk6CisgICAgICAgIFdoZW4g dGhlIGxvYWQgaXMgY29tbWl0dGVkIGluIHRoZSBuZXcgcHJvY2Vzcywgd2UgY2FsbCBXZWJQYWdl UHJveHk6OmNvbW1pdFByb3Zpc2lvbmFsUGFnZSgpLiBJdCB0YWtlcyBjYXJlIG9mOgorICAgICAg ICAtIEFjdHVhbGx5IHN3YXBwaW5nIHRoZSBXZWJQYWdlUHJveHkgdG8gdGhlIG5ldyBwcm9jZXNz IGJ5IGNhbGxpbmcgcHJvY2Vzc0RpZFRlcm1pbmF0ZSgpIC8gc3dhcFRvV2ViUHJvY2VzcygpLgor ICAgICAgICAtIFN1c3BlbmRpbmcgdGhlIGN1cnJlbnQgcGFnZS4KKyAgICAgICAgLSBMZXR0aW5n IHRoZSBjbGllbnQga25vdyB0aGUgbG9hZCBpcyBjb21pdHRlZAorICAgICAgICAtIERlc3Ryb3kg dGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5LgorICAgICAgICBUaGlzIHdvcmsgdXNlZCB0byBoYXBw ZW4gZWFybGllciBpbiBjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MoKS4KKworICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2Vzcyk6 CisgICAgICAgIE1vdmVkIHNvbWUgb2YgdGhlIGxvZ2ljIHRvIGNvbW1pdFByb3Zpc2lvbmFsUGFn ZSgpLiBXZSBub3cgbWVyZWx5IHN0YXJ0IHRoZSBsb2FkIGluIGEgbmV3IFByb3Zpc2lvbmFsUGFn ZVByb3h5LAorICAgICAgICB3aXRob3V0IGFjdHVhbGx5IGhhdmluZyB0aGUgV2ViUGFnZVByb3h5 IHN3aXRjaCB0byB0aGUgbmV3IHByb2Nlc3MgeWV0LgorCisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpkaWRDcmVhdGVXaW5kb3cpOgorICAgICAgICBEcm9wIHNvbWUgY29kZSB0aGF0IGlzIG5v IGxvbmdlciBuZWVkZWQsIG5vdyB0aGF0IHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eSB0YWtlcyBj YXJlIG9mIHRoaXMuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWREZXN0cm95 TmF2aWdhdGlvbik6CisgICAgICAgIE9uIHByb2Nlc3Mtc3dhcCwgd2hlbiB0ZWxsaW5nIHRoZSBw cmV2aW91cyBwcm9jZXNzIHRvIGlnbm9yZSB0aGUgbG9hZCBhbmQgc3RhcnRpbmcgdGhlIG5ldyBs b2FkIGluIGEgbmV3CisgICAgICAgIFByb3Zpc2lvbmFsUGFnZVByb3h5LCB0aGUgcHJldmlvdXMg V2ViUGFnZSBhdHRlbXB0cyB0byBkZXN0cm95IHRoZSBuYXZpZ2F0aW9uLiBJbiB0aGlzIGNhc2Us IHdlIGlnbm9yZQorICAgICAgICB0aGUgY2FsbCBzaW5jZSB0aGUgbmF2aWdhdGlvbiBpcyBtZXJl bHkgdGFrZW4gb3ZlciBieSB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkuCisKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKToKKyAg ICAgICAgTW92ZWQgc29tZSBQU09OIGxvZ2ljIHRvIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eSBp bnN0ZWFkLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lv bmFsTG9hZEZvckZyYW1lKToKKyAgICAgICAgV2hlbiBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUoKSBpcyBjYWxsZWQgZm9yIGEgUHJvdmlzaW9uYWxQYWdlUHJveHksIGRlc3Ryb3kgaXQu CisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0 aW9uQWN0aW9uQXN5bmMpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBv bGljeUZvclJlc3BvbnNlKToKKyAgICAgICAgQ2FwdHVyZSB0aGUgcHJvY2VzcyBpbiB0aGUgbGFt YmRhLCB0byBtYWtlIHN1cmUgd2Ugc2VuZCB0aGUgcG9saWN5IGRlY2lzaW9uIHRvIHRoZSBzYW1l IHByb2Nlc3MgdGhhdAorICAgICAgICBhc2tlZCBmb3IgaXQsIHNvIGFzIHRvIG5vdCBnZXQgY29u ZnVzZWQgYnkgcHJvY2VzcyBzd2Fwcy4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnJlc2V0U3RhdGUpOgorICAgICAgICBEcm9wIHNvbWUgY29kZSB0aGF0IGlzIG5vIGxvbmdlciBu ZWVkZWQuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjcmVhdGlvblBhcmFtZXRl cnMpOgorICAgICAgICBNb3ZlIHRoZSBoYXNSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMgZmxhZyBp bml0aWFsaXphdGlvbiBmcm9tIHRoZSBjYWxsIHNpdGUgdG8gaGVyZSBub3cgdGhhdCB3ZSBoYXZl CisgICAgICAgIG1vcmUgdGhhbiBvbmUgY2FsbCBzaXRlLiBUaGlzIHdhcyBqdXN0IHNvbWUgYmFk IGZhY3RvcmluZy4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OlBhZ2VQcm9jZXNz T3ZlcnJpZGU6OlBhZ2VQcm9jZXNzT3ZlcnJpZGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OlBhZ2VQcm9jZXNzT3ZlcnJpZGU6On5QYWdlUHJvY2Vzc092ZXJyaWRlKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6dGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MpOgorICAgICAgICBBZGQgdXRpbGl0eSBj bGFzcyB0byB0ZW1wb3JhcmlseSBvdmVycmlkZSB0aGUgV2ViUGFnZVByb3h5J3MgbV9wcm9jZXNz IHdpdGggdGhlIHByb3Zpc2lvbmFsIG9uZSB3aGVuCisgICAgICAgIHRoZSBQcm92aXNpb25hbFBh Z2VQcm94eSBpbnRlcmFjdHMgd2l0aCB0aGUgV2ViUGFnZVByb3h5LgorCisgICAgICAgICogVUlQ cm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQ cm94eTo6aGFzUHJvdmlzaW9uYWxQYWdlV2l0aElEIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6 V2ViUHJvY2Vzc1Byb3h5Ojp1cGRhdGVCYWNrRm9yd2FyZEl0ZW0pOgorICAgICAgICBCZWZvcmUg dXBkYXRpbmcgYSBCYWNrRm9yd2FyZExpc3RJdGVtLCB3ZSBub3JtYWxseSBtYWtlIHN1cmUgdGhl IHByb2Nlc3MgaGFzIGEgV2ViUGFnZVByb3h5IHdpdGggdGhlCisgICAgICAgIGl0ZW0ncyBwYWdl SUQuIFdlIGhhdmUgdG8gdHdlYWsgdGhlIGxvZ2ljIGJlY2F1c2UgdGhlcmUgbWF5IG5vdyBiZSBu byBXZWJQYWdlUHJveHkgd2l0aCB0aGlzIHBhZ2VJRAorICAgICAgICBhc3NvY2lhdGVkIHdpdGgg dGhpcyBwcm9jZXNzIHlldCwgYmVjYXVzZSBpdCBpcyBzdGlsbCBhIFByb3Zpc2lvbmFsUGFnZVBy b3h5LgorCisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6Y2FuVGVybWluYXRlQ2hp bGRQcm9jZXNzKToKKyAgICAgICAgRG8gbm90IHRlcm1pbmF0ZSB0aGUgV2ViUHJvY2VzcyBpZiB0 aGVyZSBhcmUgUHJvdmlzaW9uYWxQYWdlUHJveHkgb2JqZWN0cyB1c2luZyBpdC4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzc1Byb3h5OjphZGRQcm92aXNpb25hbFBhZ2VQcm94eSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlByb2Nlc3NQcm94eTo6cmVtb3ZlUHJvdmlzaW9uYWxQYWdlUHJveHkpOgorCisgICAgICAgICog V2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvV2ViRnJhbWUuY3BwOgorICAgICAgICAoV2ViS2l0Ojp0b1BvbGljeUFjdGlvbik6 CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24pOgor ICAgICAgICBTdG9wIGRlYWxpbmcgd2l0aCBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQgYXMgaXQg bm8gbG9uZ2VyIGV4aXN0cy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cmVpbml0aWFsaXplV2ViUGFnZSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbik6CisKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0SXNTdXNwZW5kZWQpOgorICAgICAgICBTdXNwZW5k IHRoZSBQYWdlIHdoZW4gc2V0SXNTdXNwZW5kZWQodHJ1ZSkgaXMgY2FsbGVkLCBub3cgdGhhdCB0 aGVyZSBpcyBubyBsb25nZXIgYSBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQuCisgICAgICAgIHNl dElzU3VzcGVuZGVkKHRydWUpIElQQyBpcyBzZW50IHdoZW4gd2UgYWN0dWFsbHkgY29tbWl0IHRo ZSBwcm92aXNpb25hbCBwYWdlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9U aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhKToK KwogMjAxOS0wMS0xMCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3Jn PgogCiAgICAgICAgIFJFR1JFU1NJT04ocjIzOTgxNSkgaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZp Y2Uvc2VydmljZXdvcmtlci1wcml2YXRlLWJyb3dzaW5nLmh0dHBzLmh0bWwgdGVzdCB0aW1lcyBv dXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDRjMjZhNjk4MWI0NjRk YTU5MTZmMDVlYjczNTk2NjkxNTdlZTlmZmUuLmViZjk1MGJhNmMyZWQ5MWY2MjMyYmQyYjVlZmI5 Zjc5NTU3YWI1OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMjAz MiwxMSArMjAzMiwxMSBAQCB2b2lkIEZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQo KQogCiAgICAgICAgIE9wdGlvbmFsPEhhc0luc2VjdXJlQ29udGVudD4gaGFzSW5zZWN1cmVDb250 ZW50ID0gY2FjaGVkUGFnZS0+Y2FjaGVkTWFpbkZyYW1lKCktPmhhc0luc2VjdXJlQ29udGVudCgp OwogCisgICAgICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOwor CiAgICAgICAgIC8vIEZJWE1FOiBUaGlzIEFQSSBzaG91bGQgYmUgdHVybmVkIGFyb3VuZCBzbyB0 aGF0IHdlIGdyb3VuZCBDYWNoZWRQYWdlIGludG8gdGhlIFBhZ2UuCiAgICAgICAgIGNhY2hlZFBh Z2UtPnJlc3RvcmUoKm1fZnJhbWUucGFnZSgpKTsKIAotICAgICAgICBkaXNwYXRjaERpZENvbW1p dExvYWQoaGFzSW5zZWN1cmVDb250ZW50KTsKLQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAg ICAgICAgIG1fZnJhbWUucGFnZSgpLT5jaHJvbWUoKS5zZXREaXNwYXRjaFZpZXdwb3J0RGF0YURp ZENoYW5nZVN1cHByZXNzZWQoZmFsc2UpOwogICAgICAgICBtX2ZyYW1lLnBhZ2UoKS0+Y2hyb21l KCkuZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UobV9mcmFtZS5wYWdlKCktPnZp ZXdwb3J0QXJndW1lbnRzKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzLmNwcAppbmRleCBjYTJkZjQwZWUxZGQyY2EzNmYzYTQ4YTA0NzU3 Zjk3YmRiYjYzNjQ3Li42ZDA3YzAzYWQ4YzkyN2U1NDUzYzVmZGE5NTk2NzA5YTc3MjYxZTJiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz LmNwcApAQCAtNzMsNyArNzMsNyBAQCB2b2lkIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVu Y29kZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2Rlci5lbmNvZGVFbnVt KGxheWVySG9zdGluZ01vZGUpOwogICAgIGVuY29kZXIgPDwgbWltZVR5cGVzV2l0aEN1c3RvbUNv bnRlbnRQcm92aWRlcnM7CiAgICAgZW5jb2RlciA8PCBjb250cm9sbGVkQnlBdXRvbWF0aW9uOwot ICAgIGVuY29kZXIgPDwgaXNTd2FwRnJvbVN1c3BlbmRlZDsKKyAgICBlbmNvZGVyIDw8IGlzUHJv Y2Vzc1N3YXA7CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgZW5jb2RlciA8PCBjb2xvclNwYWNl OwpAQCAtMjI3LDcgKzIyNyw3IEBAIE9wdGlvbmFsPFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM+ IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkRlY29kCiAgICAgICAgIHJl dHVybiBXVEY6Om51bGxvcHQ7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmNv bnRyb2xsZWRCeUF1dG9tYXRpb24pKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotICAg IGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKSkKKyAg ICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkpCiAgICAgICAg IHJldHVybiBXVEY6Om51bGxvcHQ7CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmggYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgKaW5kZXggYWU0MzI1Y2Jk NWYxZTU2NzYxNjU4NmY1ZTlmYTczZWU1YjM1YjkzNy4uYjM4MmNlZWRkNDQ5YThkOWEwZjg2OTQ3 MzVmMjZjMDU5NWRkZWNkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VD cmVhdGlvblBhcmFtZXRlcnMuaApAQCAtMTI5LDcgKzEyOSw3IEBAIHN0cnVjdCBXZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzIHsKICAgICBWZWN0b3I8U3RyaW5nPiBtaW1lVHlwZXNXaXRoQ3VzdG9t Q29udGVudFByb3ZpZGVyczsKIAogICAgIGJvb2wgY29udHJvbGxlZEJ5QXV0b21hdGlvbjsKLSAg ICBib29sIGlzU3dhcEZyb21TdXNwZW5kZWQgeyBmYWxzZSB9OworICAgIGJvb2wgaXNQcm9jZXNz U3dhcCB7IGZhbHNlIH07CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgQ29sb3JTcGFjZURhdGEg Y29sb3JTcGFjZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBvbGljeUFj dGlvbi5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKaW5kZXggMTQy YTUxOGRmMDk3ZTVlZjJmYTE4MDQ4NGUwOWQwMzMzYzEwNWI4MS4uMzk3MTc5NWM0NmE1MWIzODgx OGM1NWI3NmQ2NTNhMzRiNTI4OWU5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQv V2ViUG9saWN5QWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0 aW9uLmgKQEAgLTI5LDExICsyOSwxMSBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorLy8gRklY TUU6IFJlbW92ZSB0aGlzIHR5cGUgYW5kIHVzZSBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gaW5zdGVh ZC4KIGVudW0gY2xhc3MgV2ViUG9saWN5QWN0aW9uIDogdWludDhfdCB7CiAgICAgVXNlLAogICAg IERvd25sb2FkLAotICAgIElnbm9yZSwKLSAgICBTdXNwZW5kCisgICAgSWdub3JlCiB9OwogCiB9 CkBAIC00NSw4ICs0NSw3IEBAIHRlbXBsYXRlPD4gc3RydWN0IEVudW1UcmFpdHM8V2ViS2l0OjpX ZWJQb2xpY3lBY3Rpb24+IHsKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb24sCiAgICAg ICAgIFdlYktpdDo6V2ViUG9saWN5QWN0aW9uOjpVc2UsCiAgICAgICAgIFdlYktpdDo6V2ViUG9s aWN5QWN0aW9uOjpEb3dubG9hZCwKLSAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246Okln bm9yZSwKLSAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQKKyAgICAgICAg V2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246Oklnbm9yZQogICAgID47CiB9OwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMudHh0IGIvU291cmNlL1dlYktpdC9Tb3VyY2VzLnR4dApp bmRleCBhMGI2ZjcyODQ2MDQxYzI2M2E1NDc2NzEwZWFjOTg3ZmVkMWQxNjA0Li44YWVjYjg2NDcy NTAyZDAyN2EzNGFmMzcxOWRkODI4YjAwN2RiMTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1NvdXJjZXMudHh0CisrKyBiL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQKQEAgLTIzMCw2ICsy MzAsNyBAQCBVSVByb2Nlc3MvSW5zcGVjdG9yVGFyZ2V0UHJveHkuY3BwCiBVSVByb2Nlc3MvUGFn ZUxvYWRTdGF0ZS5jcHAKIFVJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcAogVUlQcm9jZXNz L1Byb2Nlc3NUaHJvdHRsZXIuY3BwCitVSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3Bw CiBVSVByb2Nlc3MvUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkuY3BwCiBVSVByb2Nlc3MvUmVzcG9u c2l2ZW5lc3NUaW1lci5jcHAKIFVJUHJvY2Vzcy9TZXJ2aWNlV29ya2VyUHJvY2Vzc1Byb3h5LmNw cApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll dy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5k ZXggY2YxOTE5YzkzYTczODUzMDc1OWUzN2YzM2RiYjEwYjRjZDA0NTg3OC4uYzc5ZmNiMjEwYjUx NTU1MDg4ZTFkZjg2ZmNhOTY1NTFjNjMyYThkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC00NCw2ICs0NCw3IEBACiAjaW1wb3J0ICJO YXZpZ2F0aW9uU3RhdGUuaCIKICNpbXBvcnQgIk9iakNPYmplY3RHcmFwaC5oIgogI2ltcG9ydCAi UGFnZUNsaWVudC5oIgorI2ltcG9ydCAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbXBvcnQg IlJlbW90ZUxheWVyVHJlZVNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YS5oIgogI2ltcG9ydCAiUmVt b3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24uaCIKICNpbXBvcnQgIlJlbW90ZU9iamVjdFJlZ2lzdHJ5 LmgiCkBAIC00NjY0LDYgKzQ2NjUsMTEgQEAgLSAodm9pZClfa2lsbFdlYkNvbnRlbnRQcm9jZXNz QW5kUmVzZXRTdGF0ZQogewogICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nlc3NQcm94eT4gcHJvdGVj dGVkUHJvY2Vzc1Byb3h5KF9wYWdlLT5wcm9jZXNzKCkpOwogICAgIHByb3RlY3RlZFByb2Nlc3NQ cm94eS0+cmVxdWVzdFRlcm1pbmF0aW9uKFdlYktpdDo6UHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29u OjpSZXF1ZXN0ZWRCeUNsaWVudCk7CisKKyAgICBpZiAoYXV0byogcHJvdmlzaW9uYWxQYWdlUHJv eHkgPSBfcGFnZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKSkgeworICAgICAgICBSZWY8V2ViS2l0 OjpXZWJQcm9jZXNzUHJveHk+IHByb3RlY3RlZFByb2Nlc3NQcm94eShwcm92aXNpb25hbFBhZ2VQ cm94eS0+cHJvY2VzcygpKTsKKyAgICAgICAgcHJvdGVjdGVkUHJvY2Vzc1Byb3h5LT5yZXF1ZXN0 VGVybWluYXRpb24oV2ViS2l0OjpQcm9jZXNzVGVybWluYXRpb25SZWFzb246OlJlcXVlc3RlZEJ5 Q2xpZW50KTsKKyAgICB9CiB9CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9QYWdlQ2xpZW50LmgKaW5kZXggMGI4NThjNDZlZTQ3NGQ2OTZkZGMzZDQzNWJkNTRjMTMyMzAw M2MyZC4uNmYzZGY4NDUyYjMxZTM0ZWI3ZmFmNGFjZDBmZDdlMDQ3ZWU5ZjA3NiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaApAQCAtNDgsNiArNDgsNyBAQAogCiBPQkpDX0NMQVNT IENBTGF5ZXI7CiBPQkpDX0NMQVNTIE5TRmlsZVdyYXBwZXI7CitPQkpDX0NMQVNTIE5TTWVudTsK IE9CSkNfQ0xBU1MgTlNTZXQ7CiBPQkpDX0NMQVNTIFdLRHJhd2luZ1ZpZXc7CiBPQkpDX0NMQVNT IF9XS1JlbW90ZU9iamVjdFJlZ2lzdHJ5OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv UHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjc5ZjUyMzY2NTY0NmVhYjQxODYy MjY2OTc2OGU4ZWQzODZkMmIzOTMKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAKQEAgLTAsMCArMSwzMDUgQEAKKy8qCisg KiBDb3B5cmlnaHQgKEMpIDIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoK KyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmli dXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAq ICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJv ZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVu dGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0 aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQg SVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVE IFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJ RUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElD VUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUg SU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElO RElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5U SUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBP RgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9S IFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFO RCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNU UklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lT RSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4K KyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJv eHkuaCIKKworI2luY2x1ZGUgIkFQSU5hdmlnYXRpb24uaCIKKyNpbmNsdWRlICJEcmF3aW5nQXJl YVByb3h5LmgiCisjaW5jbHVkZSAiTG9nZ2luZy5oIgorI2luY2x1ZGUgIlBhZ2VDbGllbnQuaCIK KyNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3QuaCIKKyNpbmNsdWRlICJXZWJCYWNrRm9yd2Fy ZExpc3RJdGVtLmgiCisjaW5jbHVkZSAiV2ViRXJyb3JzLmgiCisjaW5jbHVkZSAiV2ViTmF2aWdh dGlvblN0YXRlLmgiCisjaW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2VzLmgiCisjaW5jbHVkZSAiV2Vi UGFnZVByb3h5LmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5TWVzc2FnZXMuaCIKKyNpbmNsdWRl ICJXZWJQcm9jZXNzTWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNzUHJveHkuaCIKKyNp bmNsdWRlIDxXZWJDb3JlL1Nob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZC5oPgorCituYW1lc3Bh Y2UgV2ViS2l0IHsKKworI2RlZmluZSBSRUxFQVNFX0xPR19JRl9BTExPV0VEKGNoYW5uZWwsIGZt dCwgLi4uKSBSRUxFQVNFX0xPR19JRihtX3BhZ2UuaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCks IGNoYW5uZWwsICIlcCAtIFByb3Zpc2lvbmFsUGFnZVByb3h5OjoiIGZtdCwgdGhpcywgIyNfX1ZB X0FSR1NfXykKKworUHJvdmlzaW9uYWxQYWdlUHJveHk6OlByb3Zpc2lvbmFsUGFnZVByb3h5KFdl YlBhZ2VQcm94eSYgcGFnZSwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVu aXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiBzdXNwZW5kZWRQYWdlLCB1aW50NjRfdCBuYXZp Z2F0aW9uSUQsIGJvb2wgaXNTZXJ2ZXJSZWRpcmVjdCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0JiByZXF1ZXN0LCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2Fw UmVxdWVzdGVkQnlDbGllbnQpCisgICAgOiBtX3BhZ2UocGFnZSkKKyAgICAsIG1fcHJvY2VzcyhX VEZNb3ZlKHByb2Nlc3MpKQorICAgICwgbV9uYXZpZ2F0aW9uSUQobmF2aWdhdGlvbklEKQorICAg ICwgbV9pc1NlcnZlclJlZGlyZWN0KGlzU2VydmVyUmVkaXJlY3QpCisgICAgLCBtX3JlcXVlc3Qo cmVxdWVzdCkKKyAgICAsIG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudChwcm9jZXNzU3dh cFJlcXVlc3RlZEJ5Q2xpZW50KQorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgLCBtX3N1 c3BlbnNpb25Ub2tlbihtX3Byb2Nlc3MtPnRocm90dGxlcigpLmJhY2tncm91bmRBY3Rpdml0eVRv a2VuKCkpCisjZW5kaWYKK3sKKyAgICBtX3Byb2Nlc3MtPmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNz YWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQo KSwgKnRoaXMpOworICAgIG1fcHJvY2Vzcy0+YWRkUHJvdmlzaW9uYWxQYWdlUHJveHkoKnRoaXMp OworCisgICAgLy8gSWYgd2UgYXJlIHJlYXR0YWNoaW5nIHRvIGEgU3VzcGVuZGVkUGFnZSwgdGhl biB0aGUgV2ViUHJvY2VzcycgV2ViUGFnZSBhbHJlYWR5IGV4aXN0cyBhbmQKKyAgICAvLyBXZWJQ YWdlUHJveHk6OmRpZENyZWF0ZU1haW5GcmFtZSgpIHdpbGwgbm90IGJlIGNhbGxlZCB0byBpbml0 aWFsaXplIG1fbWFpbkZyYW1lLiBJbiBzdWNoCisgICAgLy8gY2FzZSwgd2UgbmVlZCB0byBpbml0 aWFsaXplIG1fbWFpbkZyYW1lIHRvIHJlZmxlY3QgdGhlIGZhY3QgdGhlIHRoZSBXZWJQcm9jZXNz JyBXZWJQYWdlCisgICAgLy8gYWxyZWFkeSBleGlzdHMgYW5kIGFscmVhZHkgaGFzIGEgbWFpbiBm cmFtZS4KKyAgICBpZiAoc3VzcGVuZGVkUGFnZSkgeworICAgICAgICBBU1NFUlQoJnN1c3BlbmRl ZFBhZ2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpOworICAgICAgICBzdXNwZW5kZWRQ YWdlLT51bnN1c3BlbmQoKTsKKyAgICAgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5Ojpj cmVhdGUobV9wYWdlLCBzdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpKTsKKyAgICAgICAgbV9w cm9jZXNzLT5mcmFtZUNyZWF0ZWQoc3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSwgKm1fbWFp bkZyYW1lKTsKKyAgICB9CisKKyAgICBpbml0aWFsaXplV2ViUGFnZSgpOworfQorCitQcm92aXNp b25hbFBhZ2VQcm94eTo6flByb3Zpc2lvbmFsUGFnZVByb3h5KCkKK3sKKyAgICBtX3Byb2Nlc3Mt PnJlbW92ZVByb3Zpc2lvbmFsUGFnZVByb3h5KCp0aGlzKTsKKworICAgIGlmIChtX3dhc0NvbW1p dHRlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVj ZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3Bh Z2UucGFnZUlEKCkpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xv c2UoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKworICAgIGlmIChtX2RyYXdpbmdBcmVhKSB7CisgICAg ICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRl UHJvY2VzcyhtX3Byb2Nlc3MpOworICAgICAgICBtX2RyYXdpbmdBcmVhID0gbnVsbHB0cjsKKyAg ICB9CisKKyAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3Byb2Nlc3MgPSBtX3Byb2Nlc3Mu Y29weVJlZigpXSB7CisgICAgICAgIHByb2Nlc3MtPm1heWJlU2h1dERvd24oKTsKKyAgICB9KTsK K30KKworc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IFByb3Zpc2lvbmFsUGFnZVBy b3h5Ojp0YWtlRHJhd2luZ0FyZWEoKQoreworICAgIHJldHVybiBXVEZNb3ZlKG1fZHJhd2luZ0Fy ZWEpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpjYW5jZWwoKQoreworICAgIC8v IElmIHRoZSBwcm92aXNpb25hbCBsb2FkIHN0YXJ0ZWQsIHRoZW4gaW5kaWNhdGUgdGhhdCBpdCBm YWlsZWQgZHVlIHRvIGNhbmNlbGxhdGlvbiBieSBjYWxsaW5nIGRpZEZhaWxQcm92aXNpb25hbExv YWRGb3JGcmFtZSgpLgorICAgIGlmIChtX3Byb3Zpc2lvbmFsTG9hZFVSTC5pc0VtcHR5KCkpCisg ICAgICAgIHJldHVybjsKKworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBw aW5nLCAiY2FuY2VsOiBTaW11bGF0aW5nIGEgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1l IGZvciBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgQVNTRVJUKG1f bWFpbkZyYW1lKTsKKyAgICBhdXRvIGVycm9yID0gV2ViS2l0OjpjYW5jZWxsZWRFcnJvcihtX3Jl cXVlc3QpOworICAgIGVycm9yLnNldFR5cGUoV2ViQ29yZTo6UmVzb3VyY2VFcnJvcjo6VHlwZTo6 Q2FuY2VsbGF0aW9uKTsKKyAgICBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUobV9tYWlu RnJhbWUtPmZyYW1lSUQoKSwgeyB9LCBtX25hdmlnYXRpb25JRCwgbV9wcm92aXNpb25hbExvYWRV UkwsIGVycm9yLCBVc2VyRGF0YSB7IH0pOyAvLyBXaWxsIGRlbGV0ZSB8dGhpc3wuCit9CisKK3Zv aWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OnByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmcoKQorewor ICAgIGZpbmlzaEluaXRpYWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2goKTsKK30KKwor dm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVy UHJvY2Vzc0xhdW5jaCgpCit7CisgICAgQVNTRVJUKG1fcHJvY2Vzcy0+c3RhdGUoKSA9PSBXZWJQ cm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKTsKKworICAgIC8vIEZJWE1FOiBUaGUgV2ViUGFn ZVByb3h5IGRlbGF5cyBhZGRpbmcgdGhlIHZpc2l0ZWQgbGluayBzdG9yZSB1bnRpbCBhZnRlciB0 aGUgcHJvY2VzcyBoYXMgbGF1bmNoZWQKKyAgICAvLyBzbyB0aGUgUHJvdmlzaW9uYWxQYWdlUHJv eHkgZG9lcyB0aGUgc2FtZS4gSG93ZXZlciwgZG8gd2UgcmVhbGx5IG5lZWQgdG8/CisgICAgbV9w cm9jZXNzLT5hZGRWaXNpdGVkTGlua1N0b3JlKG1fcGFnZS52aXNpdGVkTGlua1N0b3JlKCkpOwor fQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSgpCit7Cisg ICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQ cm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgbV9kcmF3aW5nQXJlYSA9IG1fcGFnZS5wYWdlQ2xpZW50 KCkuY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpOworCisgICAgYXV0byBwYXJhbWV0ZXJzID0gbV9w YWdlLmNyZWF0aW9uUGFyYW1ldGVycygpOworICAgIHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCA9 IHRydWU7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpDcmVhdGVX ZWJQYWdlKG1fcGFnZS5wYWdlSUQoKSwgcGFyYW1ldGVycyksIDApOworCisgICAgaWYgKG1fcHJv Y2Vzcy0+c3RhdGUoKSA9PSBXZWJQcm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKQorICAgICAg ICBmaW5pc2hJbml0aWFsaXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNoKCk7Cit9CisKK3Zv aWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZp Z2F0aW9uJiBuYXZpZ2F0aW9uLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEsIGNvbnN0 IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYg YmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNE YXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUg PSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBtX3Bh Z2UubG9hZERhdGFXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCBkYXRhLCBNSU1FVHlwZSwgZW5j b2RpbmcsIGJhc2VVUkwsIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWlu Z0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKK30KKwordm9pZCBQcm92aXNp b25hbFBhZ2VQcm94eTo6bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24m IG5hdmlnYXRpb24sIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFdlYkNvcmU6 OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3kgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGlj eSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYm IHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3Bh Z2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBtX3BhZ2UubG9h ZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCBXVEZNb3ZlKHJlcXVlc3QpLCBzaG91 bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRB c0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Cit9CisKK3Zv aWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0oQVBJOjpOYXZpZ2F0 aW9uJiBuYXZpZ2F0aW9uLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtJiBpdGVtLCBPcHRpb25hbDxX ZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBhdXRvIGl0ZW1T dGF0ZXMgPSBtX3BhZ2UuYmFja0ZvcndhcmRMaXN0KCkuZmlsdGVyZWRJdGVtU3RhdGVzKFt0aGlz LCB0YXJnZXRJdGVtID0gJml0ZW1dKGF1dG8mIGl0ZW0pIHsKKyAgICAgICAgaWYgKGF1dG8qIHBh Z2UgPSBpdGVtLnN1c3BlbmRlZFBhZ2UoKSkgeworICAgICAgICAgICAgaWYgKCZwYWdlLT5wcm9j ZXNzKCkgPT0gbV9wcm9jZXNzLnB0cigpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICAgICAgfQorICAgICAgICByZXR1cm4gJml0ZW0gIT0gdGFyZ2V0SXRlbTsKKyAgICB9KTsK KyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlVwZGF0ZUJhY2tGb3J3YXJk TGlzdEZvclJlYXR0YWNoKFdURk1vdmUoaXRlbVN0YXRlcykpLCBtX3BhZ2UucGFnZUlEKCkpOwor ICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRl bShuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBpdGVtLml0ZW1JRCgpLCAqbmF2aWdhdGlvbi5i YWNrRm9yd2FyZEZyYW1lTG9hZFR5cGUoKSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVp bmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSksIG1fcGFnZS5wYWdlSUQoKSk7 CisgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKK30KKwordm9p ZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKHVpbnQ2NF90IGZyYW1l SUQpCit7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJkaWRD cmVhdGVNYWluRnJhbWU6IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0 LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQpOworICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOwor CisgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5OjpjcmVhdGUobV9wYWdlLCBmcmFtZUlE KTsKKworICAgIC8vIEFkZCB0aGUgZnJhbWUgdG8gdGhlIHByb2Nlc3Mgd2lkZSBtYXAuCisgICAg bV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoZnJhbWVJRCwgKm1fbWFpbkZyYW1lKTsKKworICAgIC8v IFRoaXMgbmF2aWdhdGlvbiB3YXMgZGVzdHJveWVkIHNvIG5vIG5lZWQgdG8gbm90aWZ5IG9mIHJl ZGlyZWN0LgorICAgIGlmICghbV9wYWdlLm5hdmlnYXRpb25TdGF0ZSgpLmhhc05hdmlnYXRpb24o bV9uYXZpZ2F0aW9uSUQpKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBSZXN0b3JlIHRoZSBt YWluIGZyYW1lJ3MgY29tbWl0dGVkIFVSTCBhcyBzb21lIGNsaWVudHMgbWF5IHJlbHkgb24gaXQg dW50aWwgdGhlIG5leHQgbG9hZCBpcyBjb21taXR0ZWQuCisgICAgaWYgKGF1dG8qIG1haW5GcmFt ZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAgICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0 YXRlKCkuc2V0VVJMKG1haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS51cmwoKSk7CisKKyAgICAv LyBOb3JtYWxseSwgbm90aWZpY2F0aW9uIG9mIGEgc2VydmVyIHJlZGlyZWN0IGNvbWVzIGZyb20g dGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KKyAgICAvLyBJZiB3ZSBhcmUgcHJvY2VzcyBzd2FwcGlu ZyBpbiByZXNwb25zZSB0byBhIHNlcnZlciByZWRpcmVjdCB0aGVuIHRoYXQgbm90aWZpY2F0aW9u IHdpbGwgbm90IGNvbWUgZnJvbSB0aGUgbmV3IFdlYkNvbnRlbnQgcHJvY2Vzcy4KKyAgICAvLyBJ biB0aGlzIGNhc2Ugd2UgaGF2ZSB0aGUgVUlQcm9jZXNzIHN5bnRoZXNpemUgdGhlIHJlZGlyZWN0 IG5vdGlmaWNhdGlvbiBhdCB0aGUgYXBwcm9wcmlhdGUgdGltZS4KKyAgICBpZiAobV9pc1NlcnZl clJlZGlyZWN0KSB7CisgICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLmRpZFN0 YXJ0UHJvdmlzaW9uYWxMb2FkKG1fcmVxdWVzdC51cmwoKSk7CisKKyAgICAgICAgYXV0byBwYWdl UHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJv Y2Vzcyk7CisgICAgICAgIG1fcGFnZS5kaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNp b25hbExvYWRGb3JGcmFtZShtX21haW5GcmFtZS0+ZnJhbWVJRCgpLCBtX25hdmlnYXRpb25JRCwg V1RGTW92ZShtX3JlcXVlc3QpLCB7IH0pOworICAgIH0KK30KKwordm9pZCBQcm92aXNpb25hbFBh Z2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlE LCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmIHVybCwgVVJMJiYgdW5yZWFjaGFibGVVUkws IGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICAvLyBJZiB0aGUgcHJldmlvdXMgcHJv dmlzaW9uYWwgbG9hZCB1c2VkIHRoZSBzYW1lIHByb2Nlc3MsIHdlIG1heSByZWNlaXZlIElQQyBm b3IgdGhpcyBwcmV2aW91cyBwcm92aXNpb25hbCdzIG1haW4gZnJhbWUgdGhhdCB3ZSBuZWVkIHRv IGlnbm9yZS4KKyAgICBpZiAoIW1fbWFpbkZyYW1lIHx8IG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkg IT0gZnJhbWVJRCkKKyAgICAgICAgcmV0dXJuOworCisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RChQcm9jZXNzU3dhcHBpbmcsICJkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOiBwYWdl SUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgPSAl IiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSwgZnJhbWVJRCwgbmF2aWdhdGlvbklEKTsKKyAgICBB U1NFUlQobV9wcm92aXNpb25hbExvYWRVUkwuaXNOdWxsKCkpOworICAgIG1fcHJvdmlzaW9uYWxM b2FkVVJMID0gdXJsOworCisgICAgLy8gTWVyZWx5IGZvbGxvd2luZyBhIHNlcnZlciBzaWRlIHJl ZGlyZWN0IHNvIHRoZXJlIGlzIG5vIG5lZWQgdG8gc2VuZCBhIGRpZFN0YXJ0UHJvdmlzaW9uYWxM b2FkIGFnYWluLgorICAgIGlmIChtX2lzU2VydmVyUmVkaXJlY3QpCisgICAgICAgIHJldHVybjsK KworICAgIC8vIENsaWVudHMgZXhwZWN0IHRoZSBQYWdlJ3MgbWFpbiBmcmFtZSdzIGV4cGVjdGVk VVJMIHRvIGJlIHRoZSBwcm92aXNpb25hbCBvbmUgd2hlbiBhIHByb3Zpc2lvbmFsIGxvYWQgaXMg c3RhcnRlZC4KKyAgICBpZiAoYXV0byogcGFnZU1haW5GcmFtZSA9IG1fcGFnZS5tYWluRnJhbWUo KSkKKyAgICAgICAgcGFnZU1haW5GcmFtZS0+ZGlkU3RhcnRQcm92aXNpb25hbExvYWQodXJsKTsK KworICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJy aWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgIG1fcGFnZS5kaWRTdGFydFByb3Zpc2lvbmFsTG9h ZEZvckZyYW1lKGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgV1RGTW92ZSh1cmwpLCBXVEZNb3ZlKHVu cmVhY2hhYmxlVVJMKSwgdXNlckRhdGEpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5 OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3Qg V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRf dCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNv cmU6OlJlc291cmNlRXJyb3ImIGVycm9yLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCit7Cisg ICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQ cm9jZXNzKG1fcHJvY2Vzcyk7CisKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NT d2FwcGluZywgImRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZTogcGFnZUlEID0gJSIgUFJJ dTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEID0gJSIgUFJJdTY0LCBt X3BhZ2UucGFnZUlEKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCk7CisgICAgbV9wcm92aXNpb25h bExvYWRVUkwgPSB7IH07CisKKyAgICAvLyBNYWtlIHN1cmUgdGhlIFBhZ2UncyBtYWluIGZyYW1l J3MgZXhwZWN0ZWRVUkwgZ2V0cyBjbGVhcmVkIHNpbmNlIHdlIHVwZGF0ZWQgaXQgaW4gZGlkU3Rh cnRQcm92aXNpb25hbExvYWQuCisgICAgaWYgKGF1dG8qIHBhZ2VNYWluRnJhbWUgPSBtX3BhZ2Uu bWFpbkZyYW1lKCkpCisgICAgICAgIHBhZ2VNYWluRnJhbWUtPmRpZEZhaWxQcm92aXNpb25hbExv YWQoKTsKKworICAgIG1fcGFnZS5kaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoZnJhbWVJ RCwgZnJhbWVTZWN1cml0eU9yaWdpbiwgbmF2aWdhdGlvbklELCBwcm92aXNpb25hbFVSTCwgZXJy b3IsIHVzZXJEYXRhKTsgLy8gV2lsbCBkZWxldGUgfHRoaXN8LgorfQorCit2b2lkIFByb3Zpc2lv bmFsUGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWlu dDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFz Q3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJD b3JlOjpDZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5mbywgYm9vbCBjb250YWluc1BsdWdp bkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhh c0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAgIC8vIElm IHRoZSBwcmV2aW91cyBwcm92aXNpb25hbCBsb2FkIHVzZWQgdGhlIHNhbWUgcHJvY2Vzcywgd2Ug bWF5IHJlY2VpdmUgSVBDIGZvciB0aGlzIHByZXZpb3VzIHByb3Zpc2lvbmFsJ3MgbWFpbiBmcmFt ZSB0aGF0IHdlIG5lZWQgdG8gaWdub3JlLgorICAgIGlmICghbV9tYWluRnJhbWUgfHwgbV9tYWlu RnJhbWUtPmZyYW1lSUQoKSAhPSBmcmFtZUlEKQorICAgICAgICByZXR1cm47CisKKyAgICBSRUxF QVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZENvbW1pdExvYWRGb3JGcmFt ZTogcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgbmF2aWdhdGlv bklEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCk7 CisgICAgbV9wcm92aXNpb25hbExvYWRVUkwgPSB7IH07CisgICAgbV9wcm9jZXNzLT5yZW1vdmVN ZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFt ZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAgbV93YXNDb21taXR0ZWQgPSB0cnVlOworICAg IG1fcGFnZS5jb21taXRQcm92aXNpb25hbFBhZ2UoZnJhbWVJRCwgbmF2aWdhdGlvbklELCBtaW1l VHlwZSwgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIGZyYW1lTG9hZFR5cGUsIGNlcnRp ZmljYXRlSW5mbywgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgZm9yY2VkSGFzSW5zZWN1cmVDb250 ZW50LCB1c2VyRGF0YSk7IC8vIFdpbGwgZGVsZXRlIHx0aGlzfC4KK30KKwordm9pZCBQcm92aXNp b25hbFBhZ2VQcm94eTo6ZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0 aW9uLCBJUEM6OkRlY29kZXImIGRlY29kZXIpCit7CisgICAgQVNTRVJUKGRlY29kZXIubWVzc2Fn ZVJlY2VpdmVyTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZl ck5hbWUoKSk7CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OkRpZFN0YXJ0UHJvZ3Jlc3M6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVy Lm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ2hhbmdlUHJvZ3Jl c3M6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6QmFja0ZvcndhcmRBZGRJdGVtOjpuYW1lKCkKKyAgICAgICAgfHwgZGVj b2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkxvZ0RpYWdub3N0 aWNNZXNzYWdlOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OkxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aEVuaGFuY2VkUHJp dmFjeTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpTZXROZXR3b3JrUmVxdWVzdHNJblByb2dyZXNzOjpuYW1lKCkKKyNp ZiBQTEFURk9STShDT0NPQSkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OlJlZ2lzdGVyV2ViUHJvY2Vzc0FjY2Vzc2liaWxpdHlUb2tl bjo6bmFtZSgpCisjZW5kaWYKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3lu Yzo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpTdGFydFVSTFNjaGVtZVRhc2s6Om5hbWUoKQorICAgICAgICB8fCBkZWNv ZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGVjaWRlUG9saWN5 Rm9yUmVzcG9uc2U6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0g TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0OjpuYW1lKCkK KyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6OkRpZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWU6Om5hbWUoKQorICAgICAgICB8fCBk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkTmF2aWdh dGVXaXRoTmF2aWdhdGlvbkRhdGE6Om5hbWUoKSkKKyAgICB7CisgICAgICAgIGF1dG8gcGFnZVBy b2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nl c3MpOworICAgICAgICBtX3BhZ2UuZGlkUmVjZWl2ZU1lc3NhZ2UoY29ubmVjdGlvbiwgZGVjb2Rl cik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFt ZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENyZWF0ZU1haW5GcmFtZTo6bmFtZSgp KSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpE aWRDcmVhdGVNYWluRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6 ZGlkQ3JlYXRlTWFpbkZyYW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU3RhcnRQ cm92aXNpb25hbExvYWRGb3JGcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVz c2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lPihkZWNvZGVyLCB0aGlzLCAmUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlz aW9uYWxMb2FkRm9yRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGRl Y29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRGYWlsUHJv dmlzaW9uYWxMb2FkRm9yRnJhbWU6Om5hbWUoKSkgeworICAgICAgICBJUEM6OmhhbmRsZU1lc3Nh Z2U8TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1l PihkZWNvZGVyLCB0aGlzLCAmUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25h bExvYWRGb3JGcmFtZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rl ci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENvbW1pdExvYWRG b3JGcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpEaWRDb21taXRMb2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92 aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKworICAgIExPRyhQcm9jZXNzU3dhcHBpbmcsICJVbmhhbmRsZWQgbWVzc2FnZSAl czo6JXMgZnJvbSBwcm92aXNpb25hbCBwcm9jZXNzIiwgZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJO YW1lKCkudG9TdHJpbmcoKS5kYXRhKCksIGRlY29kZXIubWVzc2FnZU5hbWUoKS50b1N0cmluZygp LmRhdGEoKSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVTeW5j TWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIElQQzo6RGVjb2RlciYgZGVjb2Rl ciwgc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mIGVuY29kZXIpCit7CisgICAgaWYgKGRl Y29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpCYWNrRm9yd2Fy ZEl0ZW1BdEluZGV4OjpuYW1lKCkgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OkJhY2tGb3J3YXJkR29Ub0l0ZW06Om5hbWUoKSkgeworICAgICAgICBh dXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nl c3MobV9wcm9jZXNzKTsKKyAgICAgICAgbV9wYWdlLmRpZFJlY2VpdmVTeW5jTWVzc2FnZShjb25u ZWN0aW9uLCBkZWNvZGVyLCBlbmNvZGVyKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAg IExPRyhQcm9jZXNzU3dhcHBpbmcsICJVbmhhbmRsZWQgc3luYyBtZXNzYWdlICVzOjolcyBmcm9t IHByb3Zpc2lvbmFsIHByb2Nlc3MiLCBkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKS50b1N0 cmluZygpLmRhdGEoKSwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgpKTsK K30KKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv UHJvdmlzaW9uYWxQYWdlUHJveHkuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45MDIwZDgxZjZmNWY1ZGYwZTQ5YTBi YTZiMmIwMzEwZDRiMzBmZDg3Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuaApAQCAtMCwwICsxLDkzIEBACisvKgorICogQ29w eXJpZ2h0IChDKSAyMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9u cyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBu b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt ZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2Ug dGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlv biBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4K KyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBD T05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJS QU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdB UlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIK KyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4g T1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVD VCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBE QU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAq IFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9G SVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04g QU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1Qg TElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisg KiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZF TiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8K KworI3ByYWdtYSBvbmNlCisKKyNpbmNsdWRlICJNZXNzYWdlUmVjZWl2ZXIuaCIKKworbmFtZXNw YWNlIFdlYkNvcmUgeworY2xhc3MgUmVzb3VyY2VSZXF1ZXN0OworfQorCituYW1lc3BhY2UgV2Vi S2l0IHsKKworY2xhc3MgRHJhd2luZ0FyZWFQcm94eTsKK2NsYXNzIFN1c3BlbmRlZFBhZ2VQcm94 eTsKK2NsYXNzIFdlYkZyYW1lUHJveHk7CitjbGFzcyBXZWJQYWdlUHJveHk7CitjbGFzcyBXZWJQ cm9jZXNzUHJveHk7CisKK2NsYXNzIFByb3Zpc2lvbmFsUGFnZVByb3h5IDogcHVibGljIElQQzo6 TWVzc2FnZVJlY2VpdmVyIHsKKyAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKK3B1YmxpYzoK KyAgICBQcm92aXNpb25hbFBhZ2VQcm94eShXZWJQYWdlUHJveHkmLCBSZWY8V2ViUHJvY2Vzc1By b3h5PiYmLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiwgdWludDY0X3QgbmF2 aWdhdGlvbklELCBib29sIGlzU2VydmVyUmVkaXJlY3QsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNl UmVxdWVzdCYsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpOworICAgIH5Qcm92aXNpb25h bFBhZ2VQcm94eSgpOworCisgICAgV2ViUGFnZVByb3h5JiBwYWdlKCkgeyByZXR1cm4gbV9wYWdl OyB9CisgICAgV2ViRnJhbWVQcm94eSogbWFpbkZyYW1lKCkgY29uc3QgeyByZXR1cm4gbV9tYWlu RnJhbWUuZ2V0KCk7IH0KKyAgICBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MoKSB7IHJldHVybiBt X3Byb2Nlc3MuZ2V0KCk7IH0KKyAgICBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQoKSBjb25zdCB7IHJldHVybiBtX3Byb2Nlc3NTd2FwUmVx dWVzdGVkQnlDbGllbnQ7IH0KKyAgICB1aW50NjRfdCBuYXZpZ2F0aW9uSUQoKSBjb25zdCB7IHJl dHVybiBtX25hdmlnYXRpb25JRDsgfQorCisgICAgRHJhd2luZ0FyZWFQcm94eSogZHJhd2luZ0Fy ZWEoKSBjb25zdCB7IHJldHVybiBtX2RyYXdpbmdBcmVhLmdldCgpOyB9CisgICAgc3RkOjp1bmlx dWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IHRha2VEcmF3aW5nQXJlYSgpOworCisgICAgdm9pZCBs b2FkRGF0YVdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYsIGNvbnN0IElQQzo6RGF0YVJl ZmVyZW5jZSYsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2Rpbmcs IGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxX ZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKKyAgICB2b2lkIGxvYWRSZXF1 ZXN0V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0JiYsIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0 KiB1c2VyRGF0YSwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9w dCk7CisgICAgdm9pZCBnb1RvQmFja0ZvcndhcmRJdGVtKEFQSTo6TmF2aWdhdGlvbiYsIFdlYkJh Y2tGb3J3YXJkTGlzdEl0ZW0mLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmKTsKKyAg ICB2b2lkIGNhbmNlbCgpOworCisgICAgdm9pZCBwcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5nKCk7 CisKK3ByaXZhdGU6CisgICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKKyAgICB2b2lkIGRpZFJl Y2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIGZpbmFsOworICAg IHZvaWQgZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2Rl ciYsIHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+JikgZmluYWw7CisKKyAgICB2b2lkIGRp ZENyZWF0ZU1haW5GcmFtZSh1aW50NjRfdCBmcmFtZUlEKTsKKyAgICB2b2lkIGRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlv bklELCBVUkwmJiwgVVJMJiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJEYXRhJik7CisgICAg dm9pZCBkaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2 aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29u dGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0 aWZpY2F0ZUluZm8mLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNv cmU6Okhhc0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBV c2VyRGF0YSYpOworICAgIHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2 NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1 cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIHByb3Zpc2lv bmFsVVJMLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgY29uc3QgVXNlckRhdGEmKTsK KworICAgIHZvaWQgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsKKyAgICB2b2lkIGZpbmlzaEluaXRpYWxp emluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2goKTsKKworICAgIFdlYlBhZ2VQcm94eSYgbV9w YWdlOworICAgIFJlZjxXZWJQcm9jZXNzUHJveHk+IG1fcHJvY2VzczsKKyAgICBzdGQ6OnVuaXF1 ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gbV9kcmF3aW5nQXJlYTsKKyAgICBSZWZQdHI8V2ViRnJh bWVQcm94eT4gbV9tYWluRnJhbWU7CisgICAgdWludDY0X3QgbV9uYXZpZ2F0aW9uSUQ7CisgICAg Ym9vbCBtX2lzU2VydmVyUmVkaXJlY3Q7CisgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IG1f cmVxdWVzdDsKKyAgICBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IG1fcHJvY2Vzc1N3YXBS ZXF1ZXN0ZWRCeUNsaWVudDsKKyAgICBib29sIG1fd2FzQ29tbWl0dGVkIHsgZmFsc2UgfTsKKyAg ICBVUkwgbV9wcm92aXNpb25hbExvYWRVUkw7CisKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQor ICAgIFByb2Nlc3NUaHJvdHRsZXI6OkJhY2tncm91bmRBY3Rpdml0eVRva2VuIG1fc3VzcGVuc2lv blRva2VuOworI2VuZGlmCit9OworCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwCmluZGV4IGYxOThhODE1MzNm NzZiMmU4ZTJiZjcxZDRhM2I5ZDI3NDBjOTUwNzguLmZmNzZkOWY3Zjk3YWM2ZmE0ZmJiMzAyZjY0 NjY2MWQxNjc4YWUyNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3Bl bmRlZFBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVk UGFnZVByb3h5LmNwcApAQCAtMTAwLDcgKzEwMCw5IEBAIFN1c3BlbmRlZFBhZ2VQcm94eTo6flN1 c3BlbmRlZFBhZ2VQcm94eSgpCiAgICAgLy8gSWYgdGhlIHN1c3BlbmRlZCBwYWdlIHdhcyBub3Qg Y29uc3VtZWQgYmVmb3JlIGdldHRpbmcgZGVzdHJveWVkLCB0aGVuIGNsb3NlIHRoZSBjb3JyZXNw b25kaW5nIHBhZ2UKICAgICAvLyBvbiB0aGUgV2ViUHJvY2VzcyBzaWRlLgogICAgIG1fcHJvY2Vz cy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKLSAg ICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisKKyAgICBpZiAobV9z dXNwZW5zaW9uU3RhdGUgPT0gU3VzcGVuc2lvblN0YXRlOjpTdXNwZW5kaW5nKQorICAgICAgICBt X3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5Ojpt ZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CiAKICAgICAvLyBXZSBjYWxs IG1heWJlU2h1dERvd24oKSBhc3luY2hyb25vdXNseSBzaW5jZSB0aGUgU3VzcGVuZGVkUGFnZSBp cyBjdXJyZW50bHkgYmVpbmcgcmVtb3ZlZCBmcm9tIHRoZSBXZWJQcm9jZXNzUG9vbAogICAgIC8v IGFuZCB3ZSB3YW50IHRvIGF2b2lkIHJlLWVudGVyaW5nIFdlYlByb2Nlc3NQb29sIG1ldGhvZHMu CkBAIC0xMzQsNyArMTM2LDYgQEAgdm9pZCBTdXNwZW5kZWRQYWdlUHJveHk6OnVuc3VzcGVuZCgp CiAgICAgQVNTRVJUKG1fc3VzcGVuc2lvblN0YXRlID09IFN1c3BlbnNpb25TdGF0ZTo6U3VzcGVu ZGVkKTsKIAogICAgIG1fc3VzcGVuc2lvblN0YXRlID0gU3VzcGVuc2lvblN0YXRlOjpSZXN1bWVk OwotICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKICAgICBtX3By b2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldElzU3VzcGVuZGVkKGZhbHNlKSwgbV9w YWdlLnBhZ2VJRCgpKTsKIH0KIApAQCAtMTUxLDYgKzE1Miw4IEBAIHZvaWQgU3VzcGVuZGVkUGFn ZVByb3h5OjpkaWRQcm9jZXNzUmVxdWVzdFRvU3VzcGVuZChTdXNwZW5zaW9uU3RhdGUgbmV3U3Vz cGVuc2lvCiAgICAgbV9zdXNwZW5zaW9uVG9rZW4gPSBudWxscHRyOwogI2VuZGlmCiAKKyAgICBt X3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5Ojpt ZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisKICAgICBpZiAobV9yZWFk eVRvVW5zdXNwZW5kSGFuZGxlcikKICAgICAgICAgbV9yZWFkeVRvVW5zdXNwZW5kSGFuZGxlcih0 aGlzKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJv eHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKaW5kZXgg Yzc3YTI2Yjc0MjdjMzFjODI4ZTJlYWEyMjFmODA3MGI3N2FkZDI2Mi4uNTNjNzE5NmMyYWEwYTMz ZDIyMDc1ODE5MGNkNGJkOTVhNWNkMDI1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi RnJhbWVQcm94eS5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJXZWJGcmFtZVByb3h5 LmgiCiAKICNpbmNsdWRlICJBUElOYXZpZ2F0aW9uLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQ YWdlUHJveHkuaCIKICNpbmNsdWRlICJXZWJDZXJ0aWZpY2F0ZUluZm8uaCIKICNpbmNsdWRlICJX ZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkuaCIKICNpbmNsdWRlICJXZWJQYWdlTWVzc2FnZXMu aCIKQEAgLTc0LDcgKzc1LDcgQEAgYm9vbCBXZWJGcmFtZVByb3h5Ojppc01haW5GcmFtZSgpIGNv bnN0CiAgICAgaWYgKCFtX3BhZ2UpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHJldHVy biB0aGlzID09IG1fcGFnZS0+bWFpbkZyYW1lKCk7CisgICAgcmV0dXJuIHRoaXMgPT0gbV9wYWdl LT5tYWluRnJhbWUoKSB8fCAobV9wYWdlLT5wcm92aXNpb25hbFBhZ2VQcm94eSgpICYmIHRoaXMg PT0gbV9wYWdlLT5wcm92aXNpb25hbFBhZ2VQcm94eSgpLT5tYWluRnJhbWUoKSk7CiB9CiAKIHZv aWQgV2ViRnJhbWVQcm94eTo6bG9hZFVSTChjb25zdCBVUkwmIHVybCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDM5Mjc0M2JkNTY3OWNiZDIyNjdhMmMxMGVj Y2UxOTVhNjFjMzNkMjkuLjc3NmNlZGM1NTYyZjY3Y2E0ODE2MWQxOGM3OWMyZTAxYjk5ODNkZjQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNzcsNiArNzcs NyBAQAogI2luY2x1ZGUgIlBsdWdpbkluZm9ybWF0aW9uLmgiCiAjaW5jbHVkZSAiUGx1Z2luUHJv Y2Vzc01hbmFnZXIuaCIKICNpbmNsdWRlICJQcmludEluZm8uaCIKKyNpbmNsdWRlICJQcm92aXNp b25hbFBhZ2VQcm94eS5oIgogI2luY2x1ZGUgIlNhZmVCcm93c2luZ1dhcm5pbmcuaCIKICNpbmNs dWRlICJTaGFyZVNoZWV0Q2FsbGJhY2tJRC5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlckRhdGFS ZWZlcmVuY2UuaCIKQEAgLTU0NSw2ICs1NDYsMTMgQEAgUEFMOjpTZXNzaW9uSUQgV2ViUGFnZVBy b3h5OjpzZXNzaW9uSUQoKSBjb25zdAogICAgIHJldHVybiBtX3dlYnNpdGVEYXRhU3RvcmUtPnNl c3Npb25JRCgpOwogfQogCitEcmF3aW5nQXJlYVByb3h5KiBXZWJQYWdlUHJveHk6OmRyYXdpbmdB cmVhKCkgY29uc3QKK3sKKyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UgJiYgbV9wcm9jZXNzLnB0 cigpID09ICZtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2VzcygpICYmIG1fcHJvdmlzaW9uYWxQYWdl LT5kcmF3aW5nQXJlYSgpKQorICAgICAgICByZXR1cm4gbV9wcm92aXNpb25hbFBhZ2UtPmRyYXdp bmdBcmVhKCk7CisgICAgcmV0dXJuIG1fZHJhd2luZ0FyZWEuZ2V0KCk7Cit9CisKIHZvaWQgV2Vi UGFnZVByb3h5OjpjaGFuZ2VXZWJzaXRlRGF0YVN0b3JlKFdlYnNpdGVEYXRhU3RvcmUmIHdlYnNp dGVEYXRhU3RvcmUpCiB7CiAgICAgbV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgpLnBhZ2VFbmRVc2lu Z1dlYnNpdGVEYXRhU3RvcmUoKnRoaXMpOwpAQCAtNzY4LDM4ICs3NzYsMjYgQEAgYm9vbCBXZWJQ YWdlUHJveHk6OnN1c3BlbmRDdXJyZW50UGFnZUlmUG9zc2libGUoQVBJOjpOYXZpZ2F0aW9uJiBu YXZpZ2F0aW9uLCBPcHQKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6 OnN3YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVu aXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSwg SXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9pZCBXZWJQYWdlUHJv eHk6OnN3YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6 OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4mJiBkcmF3aW5nQXJlYSwgUmVmUHRyPFdlYkZy YW1lUHJveHk+JiYgbWFpbkZyYW1lKQogewogICAgIEFTU0VSVCghbV9pc0Nsb3NlZCk7CiAgICAg UkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAic3dhcFRvV2ViUHJvY2Vzczogd2ViUElE ID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigp LCBtX3BhZ2VJRCk7CiAKICAgICBtX3Byb2Nlc3MgPSBXVEZNb3ZlKHByb2Nlc3MpOworICAgIEFT U0VSVCghbV9kcmF3aW5nQXJlYSk7CisgICAgc2V0RHJhd2luZ0FyZWEoV1RGTW92ZShkcmF3aW5n QXJlYSkpOworICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOworICAgIG1fbWFpbkZyYW1lID0gV1RG TW92ZShtYWluRnJhbWUpOwogICAgIG1faXNWYWxpZCA9IHRydWU7CiAKLSAgICAvLyBJZiB3ZSBh cmUgcmVhdHRhY2hpbmcgdG8gYSBTdXNwZW5kZWRQYWdlLCB0aGVuIHRoZSBXZWJQcm9jZXNzJyBX ZWJQYWdlIGFscmVhZHkgZXhpc3RzIGFuZAotICAgIC8vIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRl TWFpbkZyYW1lKCkgd2lsbCBub3QgYmUgY2FsbGVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUu IEluIHN1Y2gKLSAgICAvLyBjYXNlLCB3ZSBuZWVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUg dG8gcmVmbGVjdCB0aGUgZmFjdCB0aGUgdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UKLSAgICAvLyBh bHJlYWR5IGV4aXN0cyBhbmQgYWxyZWFkeSBoYXMgYSBtYWluIGZyYW1lLgotICAgIGlmIChkZXN0 aW5hdGlvblN1c3BlbmRlZFBhZ2UpIHsKLSAgICAgICAgaWYgKCFkZXN0aW5hdGlvblN1c3BlbmRl ZFBhZ2UtPmZhaWxlZFRvU3VzcGVuZCgpKSB7Ci0gICAgICAgICAgICBBU1NFUlQoIW1fbWFpbkZy YW1lKTsKLSAgICAgICAgICAgIEFTU0VSVCgmZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5wcm9j ZXNzKCkgPT0gbV9wcm9jZXNzLnB0cigpKTsKLSAgICAgICAgICAgIGRlc3RpbmF0aW9uU3VzcGVu ZGVkUGFnZS0+dW5zdXNwZW5kKCk7Ci0gICAgICAgICAgICBtX21haW5GcmFtZSA9IFdlYkZyYW1l UHJveHk6OmNyZWF0ZSgqdGhpcywgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJ RCgpKTsKLSAgICAgICAgICAgIG1fcHJvY2Vzcy0+ZnJhbWVDcmVhdGVkKGRlc3RpbmF0aW9uU3Vz cGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSwgKm1fbWFpbkZyYW1lKTsKLSAgICAgICAgfSBlbHNl IHsKLSAgICAgICAgICAgIC8vIFdlIGZhaWxlZCB0byBzdXNwZW5kIHRoZSBwYWdlIHNvIGRlc3Ry b3kgaXQgbm93IGFuZCBtZXJlbHkgcmV1c2UgaXRzIFdlYkNvbnRlbnQgcHJvY2Vzcy4KLSAgICAg ICAgICAgIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSA9IG51bGxwdHI7Ci0gICAgICAgIH0KLSAg ICB9Ci0KICAgICBtX3Byb2Nlc3MtPmFkZEV4aXN0aW5nV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQs IFdlYlByb2Nlc3NQcm94eTo6QmVnaW5zVXNpbmdEYXRhU3RvcmU6Ok5vKTsKICAgICBtX3Byb2Nl c3MtPmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVj ZWl2ZXJOYW1lKCksIG1fcGFnZUlELCAqdGhpcyk7CiAKLSAgICBmaW5pc2hBdHRhY2hpbmdUb1dl YlByb2Nlc3MoaXNTd2FwRnJvbVN1c3BlbmRlZCk7CisgICAgLy8gTm8gbmVlZCB0byBpbml0aWFs aXplIHRoZSBXZWJQYWdlIHNpbmNlIGl0IHdhcyBjcmVhdGVkIHdoZW4gd2UgY3JlYXRlZCB0aGUg UHJvdmlzaW9uYWxQYWdlUHJveHkuCisgICAgZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKFNo b3VsZEluaXRpYWxpemVXZWJQYWdlOjpObyk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpmaW5p c2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3Vz cGVuZGVkKQordm9pZCBXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhT aG91bGRJbml0aWFsaXplV2ViUGFnZSBzaG91bGRJbml0aWFsaXplUGFnZSkKIHsKICAgICBBU1NF UlQobV9wcm9jZXNzLT5zdGF0ZSgpICE9IENoaWxkUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6VGVybWlu YXRlZCk7CiAKQEAgLTgzNSw3ICs4MzEsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0 YWNoaW5nVG9XZWJQcm9jZXNzKElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1cwogICAg IG1fZWRpdGFibGVJbWFnZUNvbnRyb2xsZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEVkaXRhYmxlSW1h Z2VDb250cm9sbGVyPigqdGhpcyk7CiAjZW5kaWYKIAotICAgIGluaXRpYWxpemVXZWJQYWdlKGlz U3dhcEZyb21TdXNwZW5kZWQpOworICAgIGlmIChzaG91bGRJbml0aWFsaXplUGFnZSA9PSBTaG91 bGRJbml0aWFsaXplV2ViUGFnZTo6WWVzKQorICAgICAgICBpbml0aWFsaXplV2ViUGFnZSgpOwog CiAgICAgbV9pbnNwZWN0b3ItPnVwZGF0ZUZvck5ld1BhZ2VQcm9jZXNzKHRoaXMpOwogCkBAIC05 MDAsMTIgKzg5NywxMSBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OnJl YXR0YWNoVG9XZWJQcm9jZXNzV2l0aEl0ZW0oV2ViQmFja0ZvcndhcgogICAgIHJldHVybiBXVEZN b3ZlKG5hdmlnYXRpb24pOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBh Z2UoSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9pZCBXZWJQYWdl UHJveHk6OnNldERyYXdpbmdBcmVhKHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYm IGRyYXdpbmdBcmVhKQogewotICAgIEFTU0VSVChpc1ZhbGlkKCkpOwotCi0gICAgbV9kcmF3aW5n QXJlYSA9IHBhZ2VDbGllbnQoKS5jcmVhdGVEcmF3aW5nQXJlYVByb3h5KCk7Ci0gICAgQVNTRVJU KG1fZHJhd2luZ0FyZWEpOworICAgIG1fZHJhd2luZ0FyZWEgPSBXVEZNb3ZlKGRyYXdpbmdBcmVh KTsKKyAgICBpZiAoIW1fZHJhd2luZ0FyZWEpCisgICAgICAgIHJldHVybjsKIAogI2lmIEVOQUJM RShBU1lOQ19TQ1JPTExJTkcpICYmIFBMQVRGT1JNKENPQ09BKQogICAgIGlmIChtX2RyYXdpbmdB cmVhLT50eXBlKCkgPT0gRHJhd2luZ0FyZWFUeXBlUmVtb3RlTGF5ZXJUcmVlKSB7CkBAIC05MTYs MTUgKzkxMiwxNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoSXNTd2Fw RnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQogI2VuZGlmCiAgICAgfQogI2VuZGlm Cit9CiAKLSAgICBhdXRvIHBhcmFtZXRlcnMgPSBjcmVhdGlvblBhcmFtZXRlcnMoKTsKLSAgICBw YXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQgPSBpc1N3YXBGcm9tU3VzcGVuZGVkID09IElz U3dhcEZyb21TdXNwZW5kZWQ6OlllczsKK3ZvaWQgV2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2Vi UGFnZSgpCit7CisgICAgQVNTRVJUKGlzVmFsaWQoKSk7CiAKLSNpZiBFTkFCTEUoU0VSVklDRV9X T1JLRVIpCi0gICAgcGFyYW1ldGVycy5oYXNSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMgPSBwcm9j ZXNzKCkucHJvY2Vzc1Bvb2woKS5tYXlIYXZlUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXJzKG1fd2Vi c2l0ZURhdGFTdG9yZSk7Ci0jZW5kaWYKKyAgICBzZXREcmF3aW5nQXJlYShwYWdlQ2xpZW50KCku Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpKTsKKyAgICBBU1NFUlQobV9kcmF3aW5nQXJlYSk7CiAK LSAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6Q3JlYXRlV2ViUGFnZSht X3BhZ2VJRCwgcGFyYW1ldGVycyksIDApOworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpX ZWJQcm9jZXNzOjpDcmVhdGVXZWJQYWdlKG1fcGFnZUlELCBjcmVhdGlvblBhcmFtZXRlcnMoKSks IDApOwogCiAgICAgbV9uZWVkc1RvRmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vz c0xhdW5jaCA9IHRydWU7CiAgICAgZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vz c0xhdW5jaCgpOwpAQCAtMTA3Niw3ICsxMDczLDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRS ZXF1ZXN0V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBSZXNvdXIK ICAgICBhdXRvIHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CiAK ICAgICBhdXRvIHVybCA9IHJlcXVlc3QudXJsKCk7Ci0gICAgbV9wYWdlTG9hZFN0YXRlLnNldFBl bmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCB1cmwpOworICAgIGlmIChzaG91bGRUcmVh dEFzQ29udGludWluZ0xvYWQgIT0gU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMpCisg ICAgICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFuc2FjdGlv biwgdXJsKTsKIAogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICByZWF0dGFjaFRvV2ViUHJv Y2VzcygpOwpAQCAtMTI5NCw2ICsxMjkyLDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzdG9wTG9h ZGluZygpCiAgICAgfQogCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpT dG9wTG9hZGluZygpLCBtX3BhZ2VJRCk7CisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlKSB7Cisg ICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5jYW5jZWwoKTsKKyAgICAgICAgbV9wcm92aXNpb25h bFBhZ2UgPSBudWxscHRyOworICAgIH0KICAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGlt ZXIoKS5zdGFydCgpOwogfQogCkBAIC0yNjk3LDcgKzI2OTksNyBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6cmVjZWl2ZWROYXZpZ2F0aW9uUG9saWN5RGVjaXNpb24oV2ViUG9saWN5QWN0aW9uIHBvbGlj eUFjdGlvbgogICAgICAgICB9CiAKICAgICAgICAgaWYgKHByb2Nlc3NGb3JOYXZpZ2F0aW9uLnB0 cigpICE9ICZwcm9jZXNzKCkpIHsKLSAgICAgICAgICAgIHBvbGljeUFjdGlvbiA9IGlzUGFnZU9w ZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgPyBXZWJQb2xpY3lBY3Rpb246 Oklnbm9yZSA6IFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZDsKKyAgICAgICAgICAgIHBvbGljeUFj dGlvbiA9IFdlYlBvbGljeUFjdGlvbjo6SWdub3JlOwogICAgICAgICAgICAgUkVMRUFTRV9MT0df SUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uLCBzd2FwcGluZyBwcm9jZXNzICVpIHdpdGggcHJvY2VzcyAlaSBmb3IgbmF2aWdhdGlvbiwg cmVhc29uOiAle3B1YmxpY31zIiwgcHJvY2Vzc0lkZW50aWZpZXIoKSwgcHJvY2Vzc0Zvck5hdmln YXRpb24tPnByb2Nlc3NJZGVudGlmaWVyKCksIHJlYXNvbi51dGY4KCkuZGF0YSgpKTsKICAgICAg ICAgICAgIExPRyhQcm9jZXNzU3dhcHBpbmcsICIoUHJvY2Vzc1N3YXBwaW5nKSBTd2l0Y2hpbmcg ZnJvbSBwcm9jZXNzICVpIHRvIG5ldyBwcm9jZXNzICglaSkgZm9yIG5hdmlnYXRpb24gJSIgUFJJ dTY0ICIgJyVzJyIsIHByb2Nlc3NJZGVudGlmaWVyKCksIHByb2Nlc3NGb3JOYXZpZ2F0aW9uLT5w cm9jZXNzSWRlbnRpZmllcigpLCBuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlv bi0+bG9nZ2luZ1N0cmluZygpKTsKICAgICAgICAgfSBlbHNlCkBAIC0yNzA2LDggKzI3MDgsMTQg QEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uKFdl YlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24KICAgICAgICAgYm9vbCBzaG91bGRQcm9jZXNzU3dh cCA9IHByb2Nlc3NGb3JOYXZpZ2F0aW9uLnB0cigpICE9ICZwcm9jZXNzKCk7CiAgICAgICAgIHJl Y2VpdmVkUG9saWN5RGVjaXNpb24ocG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uLnB0cigpLCBzaG91 bGRQcm9jZXNzU3dhcCA/IFdURjo6bnVsbG9wdCA6IFdURk1vdmUoZGF0YSksIFdURk1vdmUoc2Vu ZGVyKSk7CiAKLSAgICAgICAgaWYgKHNob3VsZFByb2Nlc3NTd2FwKQotICAgICAgICAgICAgY29u dGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKG5hdmlnYXRpb24sIGRlc3RpbmF0aW9uU3VzcGVu ZGVkUGFnZSA/IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLnRha2VTdXNwZW5kZWRQYWdlKCpkZXN0 aW5hdGlvblN1c3BlbmRlZFBhZ2UpIDogbnVsbHB0ciwgV1RGTW92ZShwcm9jZXNzRm9yTmF2aWdh dGlvbiksIHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFdURk1vdmUoZGF0YSkpOworICAg ICAgICBpZiAoIXNob3VsZFByb2Nlc3NTd2FwKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAg ICAgIGF1dG8gc3VzcGVuZGVkUGFnZSA9IGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSA/IHByb2Nl c3MoKS5wcm9jZXNzUG9vbCgpLnRha2VTdXNwZW5kZWRQYWdlKCpkZXN0aW5hdGlvblN1c3BlbmRl ZFBhZ2UpIDogbnVsbHB0cjsKKyAgICAgICAgaWYgKHN1c3BlbmRlZFBhZ2UgJiYgc3VzcGVuZGVk UGFnZS0+ZmFpbGVkVG9TdXNwZW5kKCkpCisgICAgICAgICAgICBzdXNwZW5kZWRQYWdlID0gbnVs bHB0cjsKKworICAgICAgICBjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MobmF2aWdhdGlv biwgV1RGTW92ZShzdXNwZW5kZWRQYWdlKSwgV1RGTW92ZShwcm9jZXNzRm9yTmF2aWdhdGlvbiks IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFdURk1vdmUoZGF0YSkpOwogICAgIH0pOwog fQogCkBAIC0yNzQzLDI0ICsyNzUxLDQ1IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZFBv bGljeURlY2lzaW9uKFdlYlBvbGljeUFjdGlvbiBhY3Rpb24sIEFQSTo6TmF2aWdhdGlvCiAgICAg c2VuZGVyLT5zZW5kKGFjdGlvbiwgbmF2aWdhdGlvbiA/IG5hdmlnYXRpb24tPm5hdmlnYXRpb25J RCgpIDogMCwgZG93bmxvYWRJRCwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKIH0KIAotdm9p ZCBXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhBUEk6Ok5hdmln YXRpb24mIG5hdmlnYXRpb24sIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYg c3VzcGVuZGVkUGFnZVByb3h5LCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIFByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgT3B0 aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit2b2lkIFdlYlBh Z2VQcm94eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90 IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3Rv bUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6 Q2VydGlmaWNhdGVJbmZvJiBjZXJ0aWZpY2F0ZUluZm8sIGJvb2wgY29udGFpbnNQbHVnaW5Eb2N1 bWVudCwgT3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJbnNl Y3VyZUNvbnRlbnQsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKIHsKLSAgICBSRUxFQVNFX0xP R19JRl9BTExPV0VEKExvYWRpbmcsICJjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3M6IHdl YlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZp ZXIoKSwgbV9wYWdlSUQpOwotICAgIExPRyhMb2FkaW5nLCAiQ29udGludWluZyBuYXZpZ2F0aW9u ICUiIFBSSXU2NCAiICclcycgaW4gYSBuZXcgd2ViIHByb2Nlc3MiLCBuYXZpZ2F0aW9uLm5hdmln YXRpb25JRCgpLCBuYXZpZ2F0aW9uLmxvZ2dpbmdTdHJpbmcoKSk7CisgICAgQVNTRVJUKG1fcHJv dmlzaW9uYWxQYWdlKTsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJjb21t aXRQcm92aXNpb25hbFBhZ2U6IHByZXZpb3VzUElEID0gJWksIG5ld1BJRCA9ICVpLCBwYWdlSUQg PSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wcm92aXNpb25h bFBhZ2UtPnByb2Nlc3MoKS5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCk7CiAKLSAgICBS ZWY8V2ViUHJvY2Vzc1Byb3h5PiBwcmV2aW91c1Byb2Nlc3MgPSBtX3Byb2Nlc3MuY29weVJlZigp OwogICAgIE9wdGlvbmFsPHVpbnQ2NF90PiBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzID0g bV9tYWluRnJhbWUgPyBtYWtlT3B0aW9uYWwobV9tYWluRnJhbWUtPmZyYW1lSUQoKSkgOiBXVEY6 Om51bGxvcHQ7Ci0gICAgYXV0byBtYWluRnJhbWVVUkwgPSBtX21haW5GcmFtZSA/IG1fbWFpbkZy YW1lLT51cmwoKSA6IFVSTCgpOwogCi0gICAgQVNTRVJUKG1fcHJvY2Vzcy5wdHIoKSAhPSBwcm9j ZXNzLnB0cigpKTsKKyAgICBBU1NFUlQobV9wcm9jZXNzLnB0cigpICE9ICZtX3Byb3Zpc2lvbmFs UGFnZS0+cHJvY2VzcygpKTsKIAogICAgIHByb2Nlc3NEaWRUZXJtaW5hdGUoUHJvY2Vzc1Rlcm1p bmF0aW9uUmVhc29uOjpOYXZpZ2F0aW9uU3dhcCk7CiAKICAgICBtX3Byb2Nlc3MtPnJlbW92ZU1l c3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1l KCksIG1fcGFnZUlEKTsKLSAgICBib29sIGRpZFN1c3BlbmRQcmV2aW91c1BhZ2UgPSBzdXNwZW5k Q3VycmVudFBhZ2VJZlBvc3NpYmxlKG5hdmlnYXRpb24sIG1haW5GcmFtZUlESW5QcmV2aW91c1By b2Nlc3MsIHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpOworICAgIGF1dG8qIG5hdmlnYXRp b24gPSBuYXZpZ2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZp Z2F0aW9uSUQoKSk7CisgICAgYm9vbCBkaWRTdXNwZW5kUHJldmlvdXNQYWdlID0gbmF2aWdhdGlv biA/IHN1c3BlbmRDdXJyZW50UGFnZUlmUG9zc2libGUoKm5hdmlnYXRpb24sIG1haW5GcmFtZUlE SW5QcmV2aW91c1Byb2Nlc3MsIG1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50KCkpIDogZmFsc2U7CiAgICAgbV9wcm9jZXNzLT5yZW1vdmVXZWJQYWdlKCp0aGlz LCBtX3BhZ2VJRCwgV2ViUHJvY2Vzc1Byb3h5OjpFbmRzVXNpbmdEYXRhU3RvcmU6Ok5vKTsKIAot ICAgIHN3YXBUb1dlYlByb2Nlc3MoV1RGTW92ZShwcm9jZXNzKSwgV1RGTW92ZShzdXNwZW5kZWRQ YWdlUHJveHkpLCBkaWRTdXNwZW5kUHJldmlvdXNQYWdlID8gSXNTd2FwRnJvbVN1c3BlbmRlZDo6 WWVzIDogSXNTd2FwRnJvbVN1c3BlbmRlZDo6Tm8pOworICAgIC8vIFRoZXJlIGlzIG5vIHdheSB3 ZSdsbCBiZSBhYmxlIHRvIHJldHVybiB0byB0aGUgcGFnZSBpbiB0aGUgcHJldmlvdXMgcGFnZSBz byBjbG9zZSBpdC4KKyAgICBpZiAoIWRpZFN1c3BlbmRQcmV2aW91c1BhZ2UpCisgICAgICAgIG1f cHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgcGFnZUlEKCkpOworCisg ICAgc3dhcFRvV2ViUHJvY2VzcyhtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2VzcygpLCBtX3Byb3Zp c2lvbmFsUGFnZS0+dGFrZURyYXdpbmdBcmVhKCksIG1fcHJvdmlzaW9uYWxQYWdlLT5tYWluRnJh bWUoKSk7CisKKyAgICBkaWRDb21taXRMb2FkRm9yRnJhbWUoZnJhbWVJRCwgbmF2aWdhdGlvbklE LCBtaW1lVHlwZSwgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIGZyYW1lTG9hZFR5cGUs IGNlcnRpZmljYXRlSW5mbywgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgZm9yY2VkSGFzSW5zZWN1 cmVDb250ZW50LCB1c2VyRGF0YSk7CisKKyAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7 Cit9CisKK3ZvaWQgV2ViUGFnZVByb3h5Ojpjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3Mo QVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFn ZVByb3h5PiYmIHN1c3BlbmRlZFBhZ2VQcm94eSwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBuZXdQ cm9jZXNzLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVk QnlDbGllbnQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVz KQoreworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImNvbnRpbnVlTmF2aWdh dGlvbkluTmV3UHJvY2Vzczogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9j ZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCk7CisgICAgTE9HKExvYWRpbmcsICJD b250aW51aW5nIG5hdmlnYXRpb24gJSIgUFJJdTY0ICIgJyVzJyBpbiBhIG5ldyB3ZWIgcHJvY2Vz cyIsIG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24ubG9nZ2luZ1N0cmluZygp KTsKKworICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZSkgeworICAgICAgICBpZiAobV9wcm92aXNp b25hbFBhZ2UtPm5hdmlnYXRpb25JRCgpICE9IG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCkpCisg ICAgICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZS0+Y2FuY2VsKCk7CisgICAgICAgIG1fcHJvdmlz aW9uYWxQYWdlID0gbnVsbHB0cjsKKyAgICB9CisKKyAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IHN0 ZDo6bWFrZV91bmlxdWU8UHJvdmlzaW9uYWxQYWdlUHJveHk+KCp0aGlzLCBuZXdQcm9jZXNzLmNv cHlSZWYoKSwgV1RGTW92ZShzdXNwZW5kZWRQYWdlUHJveHkpLCBuYXZpZ2F0aW9uLm5hdmlnYXRp b25JRCgpLCBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0SXNSZWRpcmVjdCgpLCBuYXZpZ2F0aW9u LmN1cnJlbnRSZXF1ZXN0KCksIHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpOwogCiAgICAg aWYgKGF1dG8qIGl0ZW0gPSBuYXZpZ2F0aW9uLnRhcmdldEl0ZW0oKSkgewogICAgICAgICBMT0co TG9hZGluZywgIldlYlBhZ2VQcm94eSAlcCBjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3Mg dG8gYmFjayBpdGVtIFVSTCAlcyIsIHRoaXMsIGl0ZW0tPnVybCgpLnV0ZjgoKS5kYXRhKCkpOwpA QCAtMjc2OCw2NyArMjc5NywyMiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Y29udGludWVOYXZpZ2F0 aW9uSW5OZXdQcm9jZXNzKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgcwogICAgICAgICBh dXRvIHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CiAgICAgICAg IG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFuc2FjdGlvbiwgaXRl bS0+dXJsKCkpOwogCi0gICAgICAgIGF1dG8gaXRlbVN0YXRlcyA9IG1fYmFja0ZvcndhcmRMaXN0 LT5maWx0ZXJlZEl0ZW1TdGF0ZXMoW3RoaXMsIHRhcmdldEl0ZW0gPSBpdGVtXShXZWJCYWNrRm9y d2FyZExpc3RJdGVtJiBpdGVtKSB7Ci0gICAgICAgICAgICBpZiAoYXV0byogcGFnZSA9IGl0ZW0u c3VzcGVuZGVkUGFnZSgpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKCZwYWdlLT5wcm9jZXNzKCkg PT0gbV9wcm9jZXNzLnB0cigpKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0g ICAgICAgICAgICB9Ci0gICAgICAgICAgICByZXR1cm4gJml0ZW0gIT0gdGFyZ2V0SXRlbTsKLSAg ICAgICAgfSk7Ci0gICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6VXBk YXRlQmFja0ZvcndhcmRMaXN0Rm9yUmVhdHRhY2goV1RGTW92ZShpdGVtU3RhdGVzKSksIG1fcGFn ZUlEKTsKLSAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHb1RvQmFj a0ZvcndhcmRJdGVtKG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIGl0ZW0tPml0ZW1JRCgpLCAq bmF2aWdhdGlvbi5iYWNrRm9yd2FyZEZyYW1lTG9hZFR5cGUoKSwgU2hvdWxkVHJlYXRBc0NvbnRp bnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSksIG1fcGFnZUlEKTsKLSAg ICAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKLQorICAgICAg ICBtX3Byb3Zpc2lvbmFsUGFnZS0+Z29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uLCAqaXRl bSwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAog ICAgIGlmIChtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKSAmJiAobmF2aWdhdGlvbi5s b2NrQmFja0ZvcndhcmRMaXN0KCkgPT0gTG9ja0JhY2tGb3J3YXJkTGlzdDo6WWVzIHx8IG5hdmln YXRpb24ubG9ja0hpc3RvcnkoKSA9PSBMb2NrSGlzdG9yeTo6WWVzKSkgewogICAgICAgICAvLyBJ ZiBXZWJDb3JlIGlzIHN1cHBvc2VkIHRvIGxvY2sgdGhlIGhpc3RvcnkgZm9yIHRoaXMgbG9hZCwg dGhlbiB0aGUgbmV3IHByb2Nlc3MgbmVlZHMgdG8ga25vdyBhYm91dCB0aGUgY3VycmVudCBoaXN0 b3J5IGl0ZW0gc28gaXQgY2FuIHVwZGF0ZQogICAgICAgICAvLyBpdCBpbnN0ZWFkIG9mIGNyZWF0 aW5nIGEgbmV3IG9uZS4KLSAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdl OjpTZXRDdXJyZW50SGlzdG9yeUl0ZW1Gb3JSZWF0dGFjaChtX2JhY2tGb3J3YXJkTGlzdC0+Y3Vy cmVudEl0ZW0oKS0+aXRlbVN0YXRlKCkpLCBtX3BhZ2VJRCk7CisgICAgICAgIG5ld1Byb2Nlc3Mt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldEN1cnJlbnRIaXN0b3J5SXRlbUZvclJlYXR0YWNo KG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50SXRlbSgpLT5pdGVtU3RhdGUoKSksIG1fcGFnZUlE KTsKICAgICB9CiAKICAgICAvLyBGSVhNRTogV29yayBvdXQgdGltaW5nIG9mIHJlc3BvbmRpbmcg d2l0aCB0aGUgbGFzdCBwb2xpY3kgZGVsZWdhdGUsIGV0YwogICAgIEFTU0VSVCghbmF2aWdhdGlv bi5jdXJyZW50UmVxdWVzdCgpLmlzRW1wdHkoKSk7CiAgICAgaWYgKGF1dG8mIHN1YnN0aXR1dGVE YXRhID0gbmF2aWdhdGlvbi5zdWJzdGl0dXRlRGF0YSgpKQotICAgICAgICBsb2FkRGF0YVdpdGhO YXZpZ2F0aW9uKG5hdmlnYXRpb24sIHsgc3Vic3RpdHV0ZURhdGEtPmNvbnRlbnQuZGF0YSgpLCBz dWJzdGl0dXRlRGF0YS0+Y29udGVudC5zaXplKCkgfSwgc3Vic3RpdHV0ZURhdGEtPk1JTUVUeXBl LCBzdWJzdGl0dXRlRGF0YS0+ZW5jb2RpbmcsIHN1YnN0aXR1dGVEYXRhLT5iYXNlVVJMLCBzdWJz dGl0dXRlRGF0YS0+dXNlckRhdGEuZ2V0KCksIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6 WWVzLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFn ZS0+bG9hZERhdGFXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCB7IHN1YnN0aXR1dGVEYXRhLT5j b250ZW50LmRhdGEoKSwgc3Vic3RpdHV0ZURhdGEtPmNvbnRlbnQuc2l6ZSgpIH0sIHN1YnN0aXR1 dGVEYXRhLT5NSU1FVHlwZSwgc3Vic3RpdHV0ZURhdGEtPmVuY29kaW5nLCBzdWJzdGl0dXRlRGF0 YS0+YmFzZVVSTCwgc3Vic3RpdHV0ZURhdGEtPnVzZXJEYXRhLmdldCgpLCBXVEZNb3ZlKHdlYnNp dGVQb2xpY2llcykpOwogICAgIGVsc2UKLSAgICAgICAgbG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlv bihuYXZpZ2F0aW9uLCBSZXNvdXJjZVJlcXVlc3QgeyBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0 KCkgfSwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkQWxsb3dF eHRlcm5hbFNjaGVtZXMsIG51bGxwdHIsIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVz LCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOwotCi0gICAgQVNTRVJUKCFtX21haW5GcmFtZSk7 Ci0gICAgbV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIgPSBbdGhpcywgd2Vha1RoaXMgPSBtYWtl V2Vha1B0cigqdGhpcyksIG5hdmlnYXRpb25JRCA9IG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCks IHJlcXVlc3QgPSAgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpLCBtYWluRnJhbWVVUkwsIGlz U2VydmVyUmVkaXJlY3QgPSBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0SXNSZWRpcmVjdCgpXSgp IG11dGFibGUgewotICAgICAgICBpZiAoIXdlYWtUaGlzKQotICAgICAgICAgICAgcmV0dXJuOwot Ci0gICAgICAgIEFTU0VSVChtX21haW5GcmFtZSk7Ci0gICAgICAgIC8vIFRoaXMgbmF2aWdhdGlv biB3YXMgZGVzdHJveWVkIHNvIG5vIG5lZWQgdG8gbm90aWZ5IG9mIHJlZGlyZWN0LgotICAgICAg ICBpZiAoIW5hdmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRpb24obmF2aWdhdGlvbklEKSkKLSAgICAg ICAgICAgIHJldHVybjsKLQotICAgICAgICAvLyBSZXN0b3JlIHRoZSBtYWluIGZyYW1lJ3MgY29t bWl0dGVkIFVSTCBhcyBzb21lIGNsaWVudHMgbWF5IHJlbHkgb24gaXQgdW50aWwgdGhlIG5leHQg bG9hZCBpcyBjb21taXR0ZWQuCi0gICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgp LnNldFVSTChtYWluRnJhbWVVUkwpOwotCi0gICAgICAgIC8vIE5vcm1hbGx5LCBub3RpZmljYXRp b24gb2YgYSBzZXJ2ZXIgcmVkaXJlY3QgY29tZXMgZnJvbSB0aGUgV2ViQ29udGVudCBwcm9jZXNz LgotICAgICAgICAvLyBJZiB3ZSBhcmUgcHJvY2VzcyBzd2FwcGluZyBpbiByZXNwb25zZSB0byBh IHNlcnZlciByZWRpcmVjdCB0aGVuIHRoYXQgbm90aWZpY2F0aW9uIHdpbGwgbm90IGNvbWUgZnJv bSB0aGUgbmV3IFdlYkNvbnRlbnQgcHJvY2Vzcy4KLSAgICAgICAgLy8gSW4gdGhpcyBjYXNlIHdl IGhhdmUgdGhlIFVJUHJvY2VzcyBzeW50aGVzaXplIHRoZSByZWRpcmVjdCBub3RpZmljYXRpb24g YXQgdGhlIGFwcHJvcHJpYXRlIHRpbWUuCi0gICAgICAgIGlmIChpc1NlcnZlclJlZGlyZWN0KSB7 Ci0gICAgICAgICAgICBtX21haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5kaWRTdGFydFByb3Zp c2lvbmFsTG9hZChyZXF1ZXN0LnVybCgpKTsKLSAgICAgICAgICAgIGRpZFJlY2VpdmVTZXJ2ZXJS ZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKG1fbWFpbkZyYW1lLT5mcmFtZUlEKCks IG5hdmlnYXRpb25JRCwgV1RGTW92ZShyZXF1ZXN0KSwgeyB9KTsKLSAgICAgICAgfQotICAgIH07 Ci0KLSAgICBpZiAoIW1fcHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKS5jb25maWd1cmF0aW9uKCkucHJv Y2Vzc1N3YXBzT25XaW5kb3dPcGVuV2l0aE9wZW5lcigpIHx8ICFpc1BhZ2VPcGVuZWRCeURPTVNo b3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpIHx8ICFtYWluRnJhbWVJREluUHJldmlvdXNQcm9j ZXNzKSB7Ci0gICAgICAgIC8vIFRoZXJlIGlzIG5vIHdheSB3ZSdsbCBiZSBhYmxlIHRvIHJldHVy biB0byB0aGUgcGFnZSBpbiB0aGUgcHJldmlvdXMgcGFnZSBzbyBjbG9zZSBpdC4KLSAgICAgICAg aWYgKCFkaWRTdXNwZW5kUHJldmlvdXNQYWdlKQotICAgICAgICAgICAgcHJldmlvdXNQcm9jZXNz LT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpDbG9zZSgpLCBtX3BhZ2VJRCk7Ci0gICAgICAgIHJl dHVybjsKLSAgICB9Ci0KLSAgICBtX21haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlciA9IFt0 aGlzLCBwcmV2aW91c1Byb2Nlc3MgPSBXVEZNb3ZlKHByZXZpb3VzUHJvY2VzcyksIG1haW5GcmFt ZUlESW5QcmV2aW91c1Byb2Nlc3MgPSAqbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2Vzc10oY29u c3QgR2xvYmFsV2luZG93SWRlbnRpZmllciYgd2luZG93SWRlbnRpZmllcikgewotICAgICAgICBB U1NFUlQobV9tYWluRnJhbWUpOwotICAgICAgICBHbG9iYWxGcmFtZUlkZW50aWZpZXIgbmF2aWdh dGVkRnJhbWVJZGVudGlmaWVySW5OZXdQcm9jZXNzIHsgcGFnZUlEKCksIG1fbWFpbkZyYW1lLT5m cmFtZUlEKCkgfTsKLSAgICAgICAgcHJldmlvdXNQcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQ YWdlOjpGcmFtZUJlY2FtZVJlbW90ZShtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzLCBuYXZp Z2F0ZWRGcmFtZUlkZW50aWZpZXJJbk5ld1Byb2Nlc3MsIHdpbmRvd0lkZW50aWZpZXIpLCBwYWdl SUQoKSk7Ci0gICAgfTsKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UtPmxvYWRSZXF1ZXN0V2l0 aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgUmVzb3VyY2VSZXF1ZXN0IHsgbmF2aWdhdGlvbi5jdXJy ZW50UmVxdWVzdCgpIH0sIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNo b3VsZEFsbG93RXh0ZXJuYWxTY2hlbWVzLCBudWxscHRyLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2ll cykpOwogfQogCiBib29sIFdlYlBhZ2VQcm94eTo6aXNQYWdlT3BlbmVkQnlET01TaG93aW5nSW5p dGlhbEVtcHR5RG9jdW1lbnQoKSBjb25zdApAQCAtMzY5MywxMSArMzY3Nyw2IEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUodWludDY0X3QgZnJhbWVJRCkKIAogICAgIC8v IEFkZCB0aGUgZnJhbWUgdG8gdGhlIHByb2Nlc3Mgd2lkZSBtYXAuCiAgICAgbV9wcm9jZXNzLT5m cmFtZUNyZWF0ZWQoZnJhbWVJRCwgKm1fbWFpbkZyYW1lKTsKLQotICAgIGlmIChtX21haW5GcmFt ZUNyZWF0aW9uSGFuZGxlcikgewotICAgICAgICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlcigp OwotICAgICAgICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlciA9IG51bGxwdHI7Ci0gICAgfQog fQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlU3ViZnJhbWUodWludDY0X3QgZnJhbWVJ RCkKQEAgLTM3MjIsMTAgKzM3MDEsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlU3Vi ZnJhbWUodWludDY0X3QgZnJhbWVJRCkKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVdp bmRvdyh1aW50NjRfdCBmcmFtZUlELCBHbG9iYWxXaW5kb3dJZGVudGlmaWVyJiYgd2luZG93SWRl bnRpZmllcikKIHsKLSAgICBpZiAobV9tYWluRnJhbWUgJiYgbV9tYWluRnJhbWUtPmZyYW1lSUQo KSA9PSBmcmFtZUlEKSB7Ci0gICAgICAgIGlmIChhdXRvIG1haW5GcmFtZVdpbmRvd0NyZWF0aW9u SGFuZGxlciA9IFdURk1vdmUobV9tYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIpKQotICAg ICAgICAgICAgbWFpbkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyKHdpbmRvd0lkZW50aWZpZXIp OwotICAgIH0KIH0KIAogZG91YmxlIFdlYlBhZ2VQcm94eTo6ZXN0aW1hdGVkUHJvZ3Jlc3MoKSBj b25zdApAQCAtMzc3OCw2ICszNzUzLDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWREZXN0cm95 TmF2aWdhdGlvbih1aW50NjRfdCBuYXZpZ2F0aW9uSUQpCiB7CiAgICAgUGFnZUNsaWVudFByb3Rl Y3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAorICAgIC8vIE9uIHByb2Nlc3Mtc3dhcCwg dGhlIHByZXZpb3VzIHByb2Nlc3MgdHJpZXMgdG8gZGVzdHJveSB0aGUgbmF2aWdhdGlvbiBidXQg dGhlIHByb3Zpc2lvbmFsIHByb2Nlc3MgaXMgYWN0dWFsbHkgdGFraW5nIG92ZXIgdGhlIG5hdmln YXRpb24uCisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlICYmIG1fcHJvdmlzaW9uYWxQYWdlLT5u YXZpZ2F0aW9uSUQoKSA9PSBuYXZpZ2F0aW9uSUQpCisgICAgICAgIHJldHVybjsKKwogICAgIC8v IEZJWE1FOiBNZXNzYWdlIGNoZWNrIHRoZSBuYXZpZ2F0aW9uSUQuCiAgICAgbV9uYXZpZ2F0aW9u U3RhdGUtPmRpZERlc3Ryb3lOYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCk7CiB9CkBAIC0zNzk1LDE0 ICszNzc0LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmEKICAgICBpZiAoZnJhbWUtPmlzTWFp bkZyYW1lKCkgJiYgbmF2aWdhdGlvbklEKQogICAgICAgICBuYXZpZ2F0aW9uID0gbmF2aWdhdGlv blN0YXRlKCkubmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpOwogCi0gICAgLy8gSWYgdGhpcyBzZWVt aW5nbHkgbmV3IGxvYWQgaXMgYWN0dWFsbHkgY29udGludWluZyBhIHNlcnZlciByZWRpcmVjdCBm b3IgYSBwcmV2aW91cyBuYXZpZ2F0aW9uIGluIGEgbmV3IHByb2Nlc3MsCi0gICAgLy8gdGhlbiB3 ZSBpZ25vcmUgdGhpcyBub3RpZmljYXRpb24uCi0gICAgaWYgKG5hdmlnYXRpb24gJiYgbmF2aWdh dGlvbi0+Y3VycmVudFJlcXVlc3RJc1JlZGlyZWN0KCkpIHsKLSAgICAgICAgYXV0byBuYXZpZ2F0 aW9uUHJvY2Vzc0lkZW50aWZpZXIgPSBuYXZpZ2F0aW9uLT5jdXJyZW50UmVxdWVzdFByb2Nlc3NJ ZGVudGlmaWVyKCk7Ci0gICAgICAgIGlmIChuYXZpZ2F0aW9uUHJvY2Vzc0lkZW50aWZpZXIgJiYg Km5hdmlnYXRpb25Qcm9jZXNzSWRlbnRpZmllciAhPSBtX3Byb2Nlc3MtPmNvcmVQcm9jZXNzSWRl bnRpZmllcigpKQotICAgICAgICAgICAgcmV0dXJuOwotICAgIH0KLQogICAgIExPRyhMb2FkaW5n LCAiV2ViUGFnZVByb3h5ICUiIFBSSXU2NCAiIGluIHByb2Nlc3MgcGlkICVpIGRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUgdG8gZnJhbWVJRCAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklE ICUiIFBSSXU2NCAiLCB1cmwgJXMiLCBtX3BhZ2VJRCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRp ZmllcigpLCBmcmFtZUlELCBuYXZpZ2F0aW9uSUQsIHVybC5zdHJpbmcoKS51dGY4KCkuZGF0YSgp KTsKICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJkaWRTdGFydFByb3Zpc2lv bmFsTG9hZEZvckZyYW1lOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1l SUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQs IGZyYW1lSUQpOwogCkBAIC0zOTEwLDYgKzM4ODEsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRp ZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1 cmkKIAogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAK KyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UgJiYgbV9wcm92aXNpb25hbFBhZ2UtPm5hdmlnYXRp b25JRCgpID09IG5hdmlnYXRpb25JRCAmJiAmbV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3MoKSAh PSBtX3Byb2Nlc3MucHRyKCkpIHsKKyAgICAgICAgLy8gVGhlIGxvYWQgZGlkIG5vdCBmYWlsLCBp dCBtZXJlbHkgaGFwcGVuaW5nIGluIGEgbmV3IHByb3Zpc2lvbmFsIHByb2Nlc3MuCisgICAgICAg IHJldHVybjsKKyAgICB9CisKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+ d2ViRnJhbWUoZnJhbWVJRCk7CiAgICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CiAKQEAgLTM5NDgs NiArMzkyNCwxMCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaQogICAgIH0KIAogICAgIG1fZmFp bGluZ1Byb3Zpc2lvbmFsTG9hZFVSTCA9IHsgfTsKKworICAgIC8vIElmIHRoZSBwcm92aXNpb25h bCBwYWdlJ3MgbG9hZCBmYWlscyB0aGVuIHdlIGRlc3Ryb3kgdGhlIHByb3Zpc2lvbmFsIHBhZ2Uu CisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlICYmIG1fcHJvdmlzaW9uYWxQYWdlLT5tYWluRnJh bWUoKSA9PSBmcmFtZSkKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBudWxscHRyOwogfQog CiB2b2lkIFdlYlBhZ2VQcm94eTo6Y2xlYXJMb2FkRGVwZW5kZW50Q2FsbGJhY2tzKCkKQEAgLTQz MzksOCArNDMxOSw4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0 aW9uQWN0aW9uQXN5bmModWludDY0X3QgZnJhbWVJRCwgV2ViQ29yCiAgICAgYXV0byogZnJhbWUg PSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwogICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUp OwogCi0gICAgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbigqZnJhbWUsIFdURk1vdmUo ZnJhbWVTZWN1cml0eU9yaWdpbiksIG5hdmlnYXRpb25JRCwgV1RGTW92ZShuYXZpZ2F0aW9uQWN0 aW9uRGF0YSksIFdURk1vdmUoZnJhbWVJbmZvRGF0YSksIG9yaWdpbmF0aW5nUGFnZUlELCBvcmln aW5hbFJlcXVlc3QsIFdURk1vdmUocmVxdWVzdCksIFdURk1vdmUocmVxdWVzdEJvZHkpLCBXVEZN b3ZlKHJlZGlyZWN0UmVzcG9uc2UpLCB1c2VyRGF0YSwgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNy ZWF0ZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBmcmFtZUlELCBsaXN0 ZW5lcklEXSAoYXV0by4uLiBhcmdzKSB7Ci0gICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdl czo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQs IGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CisgICAgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlv bigqZnJhbWUsIFdURk1vdmUoZnJhbWVTZWN1cml0eU9yaWdpbiksIG5hdmlnYXRpb25JRCwgV1RG TW92ZShuYXZpZ2F0aW9uQWN0aW9uRGF0YSksIFdURk1vdmUoZnJhbWVJbmZvRGF0YSksIG9yaWdp bmF0aW5nUGFnZUlELCBvcmlnaW5hbFJlcXVlc3QsIFdURk1vdmUocmVxdWVzdCksIFdURk1vdmUo cmVxdWVzdEJvZHkpLCBXVEZNb3ZlKHJlZGlyZWN0UmVzcG9uc2UpLCB1c2VyRGF0YSwgUG9saWN5 RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRo aXMpLCBmcmFtZUlELCBsaXN0ZW5lcklELCBwcm9jZXNzID0gbV9wcm9jZXNzLmNvcHlSZWYoKV0g KGF1dG8uLi4gYXJncykgeworICAgICAgICBwcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdl OjpEaWRSZWNlaXZlUG9saWN5RGVjaXNpb24oZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJncy4uLiks IG1fcGFnZUlEKTsKICAgICB9KSk7CiB9CiAKQEAgLTQ1NzQsMTIgKzQ1NTQsMTIgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlKHVpbnQ2NF90IGZyYW1lSUQsIGNv bnN0IFNlY3VyaXR5T3JpZ2kKICAgICBNRVNTQUdFX0NIRUNLX1VSTChyZXNwb25zZS51cmwoKSk7 CiAKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvbklE ID8gbV9uYXZpZ2F0aW9uU3RhdGUtPm5hdmlnYXRpb24obmF2aWdhdGlvbklEKSA6IG51bGxwdHI7 Ci0gICAgYXV0byBsaXN0ZW5lciA9IG1ha2VSZWYoZnJhbWUtPnNldFVwUG9saWN5TGlzdGVuZXJQ cm94eShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBmcmFtZUlELCBsaXN0 ZW5lcklELCBuYXZpZ2F0aW9uID0gV1RGTW92ZShuYXZpZ2F0aW9uKV0gKFdlYlBvbGljeUFjdGlv biBwb2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwgUHJvY2Vzc1N3YXBSZXF1ZXN0 ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBSZWZQdHI8U2FmZUJyb3dz aW5nV2FybmluZz4mJiBzYWZlQnJvd3NpbmdXYXJuaW5nKSBtdXRhYmxlIHsKKyAgICBhdXRvIGxp c3RlbmVyID0gbWFrZVJlZihmcmFtZS0+c2V0VXBQb2xpY3lMaXN0ZW5lclByb3h5KFt0aGlzLCBw cm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIG5hdmln YXRpb24gPSBXVEZNb3ZlKG5hdmlnYXRpb24pLCBwcm9jZXNzID0gbV9wcm9jZXNzLmNvcHlSZWYo KV0gKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwg UHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50 LCBSZWZQdHI8U2FmZUJyb3dzaW5nV2FybmluZz4mJiBzYWZlQnJvd3NpbmdXYXJuaW5nKSBtdXRh YmxlIHsKICAgICAgICAgLy8gRklYTUU6IEFzc2VydCB0aGUgQVBJOjpXZWJzaXRlUG9saWNpZXMq IGlzIG51bGxwdHIgaGVyZSBvbmNlIGNsaWVudHMgb2YgV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNl V2l0aFBvbGljaWVzIGdvIGF3YXkuCiAgICAgICAgIFJFTEVBU0VfQVNTRVJUKHByb2Nlc3NTd2Fw UmVxdWVzdGVkQnlDbGllbnQgPT0gUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDo6Tm8pOwog ICAgICAgICBBU1NFUlRfVU5VU0VEKHNhZmVCcm93c2luZ1dhcm5pbmcsICFzYWZlQnJvd3NpbmdX YXJuaW5nKTsKLSAgICAgICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24sIG5h dmlnYXRpb24uZ2V0KCksIFdURjo6bnVsbG9wdCwgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0 ZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGZyYW1lSUQs IGxpc3RlbmVySURdIChhdXRvLi4uIGFyZ3MpIHsKLSAgICAgICAgICAgIG1fcHJvY2Vzcy0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxp c3RlbmVySUQsIGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CisgICAgICAgIHJlY2VpdmVkUG9saWN5RGVj aXNpb24ocG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uLmdldCgpLCBXVEY6Om51bGxvcHQsIFBvbGlj eURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHBy b3RlY3RlZFRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklELCBwcm9jZXNzID0gV1RGTW92ZShwcm9j ZXNzKV0gKGF1dG8uLi4gYXJncykgeworICAgICAgICAgICAgcHJvY2Vzcy0+c2VuZChNZXNzYWdl czo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQs IGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CiAgICAgICAgIH0pKTsKICAgICB9LCBTaG91bGRFeHBlY3RT YWZlQnJvd3NpbmdSZXN1bHQ6Ok5vKSk7CiAKQEAgLTY0ODYsOCArNjQ2Niw2IEBAIHZvaWQgV2Vi UGFnZVByb3h5Ojpwcm9jZXNzV2lsbEJlY29tZUZvcmVncm91bmQoKQogdm9pZCBXZWJQYWdlUHJv eHk6OnJlc2V0U3RhdGUoUmVzZXRTdGF0ZVJlYXNvbiByZXNldFN0YXRlUmVhc29uKQogewogICAg IG1fbWFpbkZyYW1lID0gbnVsbHB0cjsKLSAgICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlciA9 IG51bGxwdHI7Ci0gICAgbV9tYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIgPSBudWxscHRy OwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgbV9zY3JvbGxpbmdQZXJmb3JtYW5jZURhdGEg PSBudWxscHRyOwpAQCAtNjc3OCw2ICs2NzU2LDEwIEBAIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnMgV2ViUGFnZVByb3h5OjpjcmVhdGlvblBhcmFtZXRlcnMoKQogICAgIHBhcmFtZXRlcnMuYXBw bGljYXRpb25NYW5pZmVzdCA9IG1fY29uZmlndXJhdGlvbi0+YXBwbGljYXRpb25NYW5pZmVzdCgp ID8gT3B0aW9uYWw8V2ViQ29yZTo6QXBwbGljYXRpb25NYW5pZmVzdD4obV9jb25maWd1cmF0aW9u LT5hcHBsaWNhdGlvbk1hbmlmZXN0KCktPmFwcGxpY2F0aW9uTWFuaWZlc3QoKSkgOiBXVEY6Om51 bGxvcHQ7CiAjZW5kaWYKIAorI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikKKyAgICBwYXJhbWV0 ZXJzLmhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyA9IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgp Lm1heUhhdmVSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMobV93ZWJzaXRlRGF0YVN0b3JlKTsKKyNl bmRpZgorCiAgICAgcGFyYW1ldGVycy5uZWVkc0ZvbnRBdHRyaWJ1dGVzID0gbV9uZWVkc0ZvbnRB dHRyaWJ1dGVzOwogCiAgICAgbV9wcm9jZXNzLT5hZGRXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQ cm94eShtX3VzZXJDb250ZW50Q29udHJvbGxlciwgcGFyYW1ldGVycyk7CkBAIC04NTM5LDYgKzg1 MjEsMjEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNpbXVsYXRlRGV2aWNlT3JpZW50YXRpb25DaGFu Z2UoZG91YmxlIGFscGhhLCBkb3VibGUgYmV0YSwgZG8KICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OlNpbXVsYXRlRGV2aWNlT3JpZW50YXRpb25DaGFuZ2UoYWxwaGEsIGJl dGEsIGdhbW1hKSwgbV9wYWdlSUQpOwogfQogCitXZWJQYWdlUHJveHk6OlBhZ2VQcm9jZXNzT3Zl cnJpZGU6OlBhZ2VQcm9jZXNzT3ZlcnJpZGUoV2ViUGFnZVByb3h5JiBwYWdlLCBXZWJQcm9jZXNz UHJveHkmIG5ld1Byb2Nlc3MpCisgICAgOiBtX3BhZ2UoJnBhZ2UpCisgICAgLCBtX3ByZXZpb3Vz UHJvY2VzcyhwYWdlLnByb2Nlc3MoKSkKK3sKKyAgICBwYWdlLm1fcHJvY2VzcyA9IG5ld1Byb2Nl c3M7Cit9CisKK1dlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6UGFnZVByb2Nlc3NP dmVycmlkZShQYWdlUHJvY2Vzc092ZXJyaWRlJiYpID0gZGVmYXVsdDsKKworV2ViUGFnZVByb3h5 OjpQYWdlUHJvY2Vzc092ZXJyaWRlOjp+UGFnZVByb2Nlc3NPdmVycmlkZSgpCit7CisgICAgaWYg KG1fcGFnZSkKKyAgICAgICAgbV9wYWdlLT5tX3Byb2Nlc3MgPSBXVEZNb3ZlKG1fcHJldmlvdXNQ cm9jZXNzKTsKK30KKwogI2lmIEVOQUJMRShEQVRBX0RFVEVDVElPTikKIAogdm9pZCBXZWJQYWdl UHJveHk6OmRldGVjdERhdGFJbkFsbEZyYW1lcyhXZWJDb3JlOjpEYXRhRGV0ZWN0b3JUeXBlcyB0 eXBlcywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBEYXRhRGV0ZWN0aW9uUmVzdWx0Jik+ JiYgY29tcGxldGlvbkhhbmRsZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o CmluZGV4IGNkODAxYjgwOGM0NmU0NTBkOGNkYWQ0OTcwOGY0N2Y4ZjAxMzcwMjkuLmI3ZWYxZDRj MmRkZDgwOTgwOWVlYzQ3OGFjYzM0ZmY4OWFmNzQzNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCkBAIC0yMjUsNiArMjI1LDcgQEAgY2xhc3MgTmF0aXZlV2ViS2V5Ym9h cmRFdmVudDsKIGNsYXNzIE5hdGl2ZVdlYk1vdXNlRXZlbnQ7CiBjbGFzcyBOYXRpdmVXZWJXaGVl bEV2ZW50OwogY2xhc3MgUGFnZUNsaWVudDsKK2NsYXNzIFByb3Zpc2lvbmFsUGFnZVByb3h5Owog Y2xhc3MgUmVtb3RlTGF5ZXJUcmVlSG9zdDsKIGNsYXNzIFJlbW90ZUxheWVyVHJlZVNjcm9sbGlu Z1BlcmZvcm1hbmNlRGF0YTsKIGNsYXNzIFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOwpAQCAt MzU2LDcgKzM1Nyw3IEBAIHB1YmxpYzoKICAgICBXZWJGcmFtZVByb3h5KiBmb2N1c2VkRnJhbWUo KSBjb25zdCB7IHJldHVybiBtX2ZvY3VzZWRGcmFtZS5nZXQoKTsgfQogICAgIFdlYkZyYW1lUHJv eHkqIGZyYW1lU2V0TGFyZ2VzdEZyYW1lKCkgY29uc3QgeyByZXR1cm4gbV9mcmFtZVNldExhcmdl c3RGcmFtZS5nZXQoKTsgfQogCi0gICAgRHJhd2luZ0FyZWFQcm94eSogZHJhd2luZ0FyZWEoKSBj b25zdCB7IHJldHVybiBtX2RyYXdpbmdBcmVhLmdldCgpOyB9CisgICAgRHJhd2luZ0FyZWFQcm94 eSogZHJhd2luZ0FyZWEoKSBjb25zdDsKIAogICAgIFdlYk5hdmlnYXRpb25TdGF0ZSYgbmF2aWdh dGlvblN0YXRlKCkgeyByZXR1cm4gKm1fbmF2aWdhdGlvblN0YXRlLmdldCgpOyB9CiAKQEAgLTM3 OSw2ICszODAsNyBAQCBwdWJsaWM6CiAKICAgICBib29sIGFkZHNWaXNpdGVkTGlua3MoKSBjb25z dCB7IHJldHVybiBtX2FkZHNWaXNpdGVkTGlua3M7IH0KICAgICB2b2lkIHNldEFkZHNWaXNpdGVk TGlua3MoYm9vbCBhZGRzVmlzaXRlZExpbmtzKSB7IG1fYWRkc1Zpc2l0ZWRMaW5rcyA9IGFkZHNW aXNpdGVkTGlua3M7IH0KKyAgICBWaXNpdGVkTGlua1N0b3JlJiB2aXNpdGVkTGlua1N0b3JlKCkg eyByZXR1cm4gbV92aXNpdGVkTGlua1N0b3JlOyB9CiAKICAgICB2b2lkIGV4aXRGdWxsc2NyZWVu SW1tZWRpYXRlbHkoKTsKICAgICB2b2lkIGZ1bGxzY3JlZW5NYXlSZXR1cm5Ub0lubGluZSgpOwpA QCAtNDU4LDggKzQ2MCw4IEBAIHB1YmxpYzoKICAgICBBUEk6Okljb25Mb2FkaW5nQ2xpZW50JiBp Y29uTG9hZGluZ0NsaWVudCgpIHsgcmV0dXJuICptX2ljb25Mb2FkaW5nQ2xpZW50OyB9CiAgICAg dm9pZCBzZXRJY29uTG9hZGluZ0NsaWVudChzdGQ6OnVuaXF1ZV9wdHI8QVBJOjpJY29uTG9hZGlu Z0NsaWVudD4mJik7CiAKLSAgICBlbnVtIGNsYXNzIElzU3dhcEZyb21TdXNwZW5kZWQgeyBObywg WWVzIH07Ci0gICAgdm9pZCBpbml0aWFsaXplV2ViUGFnZShJc1N3YXBGcm9tU3VzcGVuZGVkID0g SXNTd2FwRnJvbVN1c3BlbmRlZDo6Tm8pOworICAgIHZvaWQgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsK KyAgICB2b2lkIHNldERyYXdpbmdBcmVhKHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5 PiYmKTsKIAogICAgIFdlYWtQdHI8U2VjS2V5UHJveHlTdG9yZT4gc2VjS2V5UHJveHlTdG9yZShj b25zdCBXZWJDb3JlOjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSYpOwogICAgICAgICAKQEAgLTEw MjUsNiArMTAyNywxOSBAQCBwdWJsaWM6CiAgICAgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKCkg eyByZXR1cm4gbV9wcm9jZXNzOyB9CiAgICAgUHJvY2Vzc0lEIHByb2Nlc3NJZGVudGlmaWVyKCkg Y29uc3Q7CiAKKyAgICBjbGFzcyBQYWdlUHJvY2Vzc092ZXJyaWRlIHsKKyAgICBwdWJsaWM6Cisg ICAgICAgIFBhZ2VQcm9jZXNzT3ZlcnJpZGUoV2ViUGFnZVByb3h5JiwgV2ViUHJvY2Vzc1Byb3h5 JiBuZXdQcm9jZXNzKTsKKyAgICAgICAgUGFnZVByb2Nlc3NPdmVycmlkZShQYWdlUHJvY2Vzc092 ZXJyaWRlJiYpOworICAgICAgICB+UGFnZVByb2Nlc3NPdmVycmlkZSgpOworCisgICAgcHJpdmF0 ZToKKyAgICAgICAgUmVmUHRyPFdlYlBhZ2VQcm94eT4gbV9wYWdlOworICAgICAgICBSZWY8V2Vi UHJvY2Vzc1Byb3h5PiBtX3ByZXZpb3VzUHJvY2VzczsKKyAgICB9OworCisgICAgUGFnZVByb2Nl c3NPdmVycmlkZSB0ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhXZWJQcm9jZXNzUHJveHkmIG5l d1Byb2Nlc3MpIHsgcmV0dXJuIFBhZ2VQcm9jZXNzT3ZlcnJpZGUoKnRoaXMsIG5ld1Byb2Nlc3Mp OyB9CisKICAgICBXZWJQcmVmZXJlbmNlcyYgcHJlZmVyZW5jZXMoKSB7IHJldHVybiBtX3ByZWZl cmVuY2VzOyB9CiAgICAgdm9pZCBzZXRQcmVmZXJlbmNlcyhXZWJQcmVmZXJlbmNlcyYpOwogCkBA IC0xNDE0LDYgKzE0MjksMjEgQEAgcHVibGljOgogICAgIEVkaXRhYmxlSW1hZ2VDb250cm9sbGVy JiBlZGl0YWJsZUltYWdlQ29udHJvbGxlcigpIHsgcmV0dXJuICptX2VkaXRhYmxlSW1hZ2VDb250 cm9sbGVyOyB9CiAjZW5kaWYKIAorICAgIFByb3Zpc2lvbmFsUGFnZVByb3h5KiBwcm92aXNpb25h bFBhZ2VQcm94eSgpIGNvbnN0IHsgcmV0dXJuIG1fcHJvdmlzaW9uYWxQYWdlLmdldCgpOyB9Cisg ICAgdm9pZCBjb21taXRQcm92aXNpb25hbFBhZ2UodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3Qg bmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9t Q29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpD ZXJ0aWZpY2F0ZUluZm8mLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdl YkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25z dCBVc2VyRGF0YSYpOworCisgICAgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1l KHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYsIFVSTCYmIHVu cmVhY2hhYmxlVVJMLCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkRmFpbFByb3Zpc2lv bmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5 T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBj b25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJMLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9y JiwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2b2lkIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZv clByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmln YXRpb25JRCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIGNvbnN0IFVzZXJEYXRhJik7CisK KyAgICB2b2lkIGxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgY29uc3Qg SVBDOjpEYXRhUmVmZXJlbmNlJiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5n JiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEs IFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBv bGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7CisgICAgdm9pZCBsb2FkUmVxdWVzdFdpdGhO YXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBX ZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRh dGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0 ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7CisKKyAgICAvLyBJUEM6Ok1lc3NhZ2VS ZWNlaXZlcgorICAgIC8vIEltcGxlbWVudGVkIGluIGdlbmVyYXRlZCBXZWJQYWdlUHJveHlNZXNz YWdlUmVjZWl2ZXIuY3BwCisgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rp b24mLCBJUEM6OkRlY29kZXImKSBvdmVycmlkZTsKKyAgICB2b2lkIGRpZFJlY2VpdmVTeW5jTWVz c2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImLCBzdGQ6OnVuaXF1ZV9wdHI8SVBD OjpFbmNvZGVyPiYpIG92ZXJyaWRlOworCiBwcml2YXRlOgogICAgIFdlYlBhZ2VQcm94eShQYWdl Q2xpZW50JiwgV2ViUHJvY2Vzc1Byb3h5JiwgdWludDY0X3QgcGFnZUlELCBSZWY8QVBJOjpQYWdl Q29uZmlndXJhdGlvbj4mJik7CiAgICAgdm9pZCBwbGF0Zm9ybUluaXRpYWxpemUoKTsKQEAgLTE0 MzgsMTIgKzE0NjgsNiBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBzZXRVc2VyQWdlbnQoU3RyaW5n JiYpOwogCi0gICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKLSAgICAvLyBJbXBsZW1lbnRlZCBp biBnZW5lcmF0ZWQgV2ViUGFnZVByb3h5TWVzc2FnZVJlY2VpdmVyLmNwcAotICAgIHZvaWQgZGlk UmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgb3ZlcnJpZGU7 Ci0gICAgdm9pZCBkaWRSZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpE ZWNvZGVyJiwgc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mKSBvdmVycmlkZTsKLQotCiAg ICAgLy8gSVBDOjpNZXNzYWdlU2VuZGVyCiAgICAgYm9vbCBzZW5kTWVzc2FnZShzdGQ6OnVuaXF1 ZV9wdHI8SVBDOjpFbmNvZGVyPiwgT3B0aW9uU2V0PElQQzo6U2VuZE9wdGlvbj4pIG92ZXJyaWRl OwogICAgIElQQzo6Q29ubmVjdGlvbiogbWVzc2FnZVNlbmRlckNvbm5lY3Rpb24oKSBvdmVycmlk ZTsKQEAgLTE0NjUsMTIgKzE0ODksOSBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlkQ3JlYXRlU3Vi ZnJhbWUodWludDY0X3QgZnJhbWVJRCk7CiAgICAgdm9pZCBkaWRDcmVhdGVXaW5kb3codWludDY0 X3QgZnJhbWVJRCwgV2ViQ29yZTo6R2xvYmFsV2luZG93SWRlbnRpZmllciYmKTsKIAotICAgIHZv aWQgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50 NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNl ckRhdGEmKTsKLSAgICB2b2lkIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFs TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIGNvbnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCB3aWxs UGVyZm9ybUNsaWVudFJlZGlyZWN0Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU3Ry aW5nJiB1cmwsIGRvdWJsZSBkZWxheSwgV2ViQ29yZTo6TG9ja0JhY2tGb3J3YXJkTGlzdCk7CiAg ICAgdm9pZCBkaWRDYW5jZWxDbGllbnRSZWRpcmVjdEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQp OwogICAgIHZvaWQgZGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZSh1aW50NjRfdCBmcmFt ZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmKTsKLSAgICB2b2lkIGRpZEZhaWxQcm92 aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1 cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25J RCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VF cnJvciYsIGNvbnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCBkaWRDb21taXRMb2FkRm9yRnJhbWUo dWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1p bWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFt ZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mLCBib29sIGNvbnRhaW5z UGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4gZm9y Y2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkRmlu aXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdh dGlvbklELCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkRmluaXNoTG9hZEZvckZyYW1l KHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgVXNlckRhdGEm KTsKQEAgLTE1NzQsMTggKzE1OTUsMTYgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldENhblNob3J0 Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50cyhib29sIGNhblNob3J0Q2lyY3VpdEhvcml6b250 YWxXaGVlbEV2ZW50cykgeyBtX2NhblNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50cyA9 IGNhblNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50czsgfQogCiAgICAgdm9pZCByZWF0 dGFjaFRvV2ViUHJvY2VzcygpOwotICAgIHZvaWQgc3dhcFRvV2ViUHJvY2VzcyhSZWY8V2ViUHJv Y2Vzc1Byb3h5PiYmLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmLCBJc1N3 YXBGcm9tU3VzcGVuZGVkKTsKKyAgICB2b2lkIHN3YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nl c3NQcm94eT4mJiwgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+JiYsIFJlZlB0cjxX ZWJGcmFtZVByb3h5PiYmIG1haW5GcmFtZSk7CiAgICAgdm9pZCBkaWRGYWlsVG9TdXNwZW5kQWZ0 ZXJQcm9jZXNzU3dhcCgpOwogICAgIHZvaWQgZGlkU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAoKTsK IAotICAgIHZvaWQgZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKElzU3dhcEZyb21TdXNwZW5k ZWQgPSBJc1N3YXBGcm9tU3VzcGVuZGVkOjpObyk7CisgICAgZW51bSBjbGFzcyBTaG91bGRJbml0 aWFsaXplV2ViUGFnZSB7IE5vLCBZZXMgfTsKKyAgICB2b2lkIGZpbmlzaEF0dGFjaGluZ1RvV2Vi UHJvY2VzcyhTaG91bGRJbml0aWFsaXplV2ViUGFnZSA9IFNob3VsZEluaXRpYWxpemVXZWJQYWdl OjpZZXMpOwogCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVhdHRhY2hUb1dlYlByb2Nl c3NGb3JSZWxvYWQoKTsKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiByZWF0dGFjaFRvV2Vi UHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKTsKIAotICAgIHZvaWQgbG9h ZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBjb25zdCBJUEM6OkRhdGFSZWZl cmVuY2UmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBj b25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hv dWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYm ID0gV1RGOjpudWxsb3B0KTsKLSAgICB2b2lkIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oQVBJ OjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlNob3Vs ZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6 U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRh PiYmID0gV1RGOjpudWxsb3B0KTsKLQogICAgIHZvaWQgcmVxdWVzdE5vdGlmaWNhdGlvblBlcm1p c3Npb24odWludDY0X3Qgbm90aWZpY2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5n KTsKICAgICB2b2lkIHNob3dOb3RpZmljYXRpb24oY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3Qg U3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcmIGljb25VUkwsIGNvbnN0IFN0cmluZyYgdGFnLCBj b25zdCBTdHJpbmcmIGxhbmcsIFdlYkNvcmU6Ok5vdGlmaWNhdGlvbkRpcmVjdGlvbiwgY29uc3Qg U3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsKICAgICB2b2lk IGNhbmNlbE5vdGlmaWNhdGlvbih1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CkBAIC0xOTUxLDgg KzE5NzAsNiBAQCBwcml2YXRlOgogICAgIFJlZjxXZWJzaXRlRGF0YVN0b3JlPiBtX3dlYnNpdGVE YXRhU3RvcmU7CiAKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9tYWluRnJhbWU7Ci0gICAg RnVuY3Rpb248dm9pZCgpPiBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlcjsKLSAgICBGdW5jdGlv bjx2b2lkKGNvbnN0IFdlYkNvcmU6Okdsb2JhbFdpbmRvd0lkZW50aWZpZXImKT4gbV9tYWluRnJh bWVXaW5kb3dDcmVhdGlvbkhhbmRsZXI7CiAKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9m b2N1c2VkRnJhbWU7CiAgICAgUmVmUHRyPFdlYkZyYW1lUHJveHk+IG1fZnJhbWVTZXRMYXJnZXN0 RnJhbWU7CkBAIC0yMzIyLDYgKzIzMzksOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9uZWVkc0Zv bnRBdHRyaWJ1dGVzIHsgZmFsc2UgfTsKICAgICBib29sIG1fbWF5SGF2ZVVuaXZlcnNhbEZpbGVS ZWFkU2FuZGJveEV4dGVuc2lvbiB7IGZhbHNlIH07CiAKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJv dmlzaW9uYWxQYWdlUHJveHk+IG1fcHJvdmlzaW9uYWxQYWdlOworCiAjaWYgSEFWRShQRU5DSUxL SVQpCiAgICAgc3RkOjp1bmlxdWVfcHRyPEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyPiBtX2VkaXRh YmxlSW1hZ2VDb250cm9sbGVyOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Byb3h5LmNwcAppbmRleCBkYjFmZDU4YjkzZGZmNTg2NWQxM2ZjNTQxYjZlNWQ4NzQ2 ZWI4ZTBhLi5kYWJlZGJjMGE3NDQxMjZiZGU2OGQ1OTQ2ZDc1MzFmZWY3NWM3NTU5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKQEAgLTM0LDYgKzM0LDcg QEAKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiUGx1Z2luSW5mb1N0b3JlLmgiCiAj aW5jbHVkZSAiUGx1Z2luUHJvY2Vzc01hbmFnZXIuaCIKKyNpbmNsdWRlICJQcm92aXNpb25hbFBh Z2VQcm94eS5oIgogI2luY2x1ZGUgIlRleHRDaGVja2VyLmgiCiAjaW5jbHVkZSAiVGV4dENoZWNr ZXJTdGF0ZS5oIgogI2luY2x1ZGUgIlVJTWVzc2FnZVBvcnRDaGFubmVsUHJvdmlkZXIuaCIKQEAg LTU4NCw2ICs1ODUsMTUgQEAgYm9vbCBXZWJQcm9jZXNzUHJveHk6OmZ1bGxLZXlib2FyZEFjY2Vz c0VuYWJsZWQoKQogfQogI2VuZGlmCiAKK2Jvb2wgV2ViUHJvY2Vzc1Byb3h5OjpoYXNQcm92aXNp b25hbFBhZ2VXaXRoSUQodWludDY0X3QgcGFnZUlEKSBjb25zdAoreworICAgIGZvciAoYXV0byog cHJvdmlzaW9uYWxQYWdlIDogbV9wcm92aXNpb25hbFBhZ2VzKSB7CisgICAgICAgIGlmIChwcm92 aXNpb25hbFBhZ2UtPnBhZ2UoKS5wYWdlSUQoKSA9PSBwYWdlSUQpCisgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorCiB2b2lkIFdlYlByb2Nlc3NQ cm94eTo6dXBkYXRlQmFja0ZvcndhcmRJdGVtKGNvbnN0IEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0 ZSYgaXRlbVN0YXRlKQogewogICAgIGlmIChhdXRvKiBpdGVtID0gV2ViQmFja0ZvcndhcmRMaXN0 SXRlbTo6aXRlbUZvcklEKGl0ZW1TdGF0ZS5pZGVudGlmaWVyKSkgewpAQCAtNTkxLDcgKzYwMSw3 IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojp1cGRhdGVCYWNrRm9yd2FyZEl0ZW0oY29uc3QgQmFj a0ZvcndhcmRMaXN0SXRlbVN0YXRlJiBpdGVtCiAgICAgICAgIC8vIHRoZSBiYWNrL2ZvcndhcmQg aXRlbXMgcGFnZS4KICAgICAgICAgLy8gZS5nLiBUaGUgb2xkIHdlYiBwcm9jZXNzIGlzIG5hdmln YXRpbmcgdG8gYWJvdXQ6YmxhbmsgZm9yIHN1c3BlbnNpb24uCiAgICAgICAgIC8vIFdlIGlnbm9y ZSB0aGVzZSB1cGRhdGVzLgotICAgICAgICBpZiAobV9wYWdlTWFwLmNvbnRhaW5zKGl0ZW0tPnBh Z2VJRCgpKSkKKyAgICAgICAgaWYgKG1fcGFnZU1hcC5jb250YWlucyhpdGVtLT5wYWdlSUQoKSkg fHwgaGFzUHJvdmlzaW9uYWxQYWdlV2l0aElEKGl0ZW0tPnBhZ2VJRCgpKSkKICAgICAgICAgICAg IGl0ZW0tPnNldFBhZ2VTdGF0ZShpdGVtU3RhdGUucGFnZVN0YXRlKTsKICAgICB9CiB9CkBAIC03 ODAsNiArNzkwLDEyIEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVuY2hpbmco UHJvY2Vzc0xhdW5jaGVyKiBsYXVuY2hlciwgSVBDOjpDb25uZWN0CiAgICAgICAgIHBhZ2UtPnBy b2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmcoKTsKICAgICB9CiAKKyAgICBmb3IgKGF1dG8qIHByb3Zp c2lvbmFsUGFnZSA6IG1fcHJvdmlzaW9uYWxQYWdlcykgeworICAgICAgICBBU1NFUlQodGhpcyA9 PSAmcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCkpOworICAgICAgICBwcm92aXNpb25hbFBhZ2Ut PnByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmcoKTsKKyAgICB9CisKKwogICAgIFJFTEVBU0VfQVNT RVJUKCFtX3dlYkNvbm5lY3Rpb24pOwogICAgIG1fd2ViQ29ubmVjdGlvbiA9IFdlYkNvbm5lY3Rp b25Ub1dlYlByb2Nlc3M6OmNyZWF0ZSh0aGlzKTsKIApAQCAtODczLDcgKzg4OSw3IEBAIHZvaWQg V2ViUHJvY2Vzc1Byb3h5OjptYXliZVNodXREb3duKCkKIAogYm9vbCBXZWJQcm9jZXNzUHJveHk6 OmNhblRlcm1pbmF0ZUNoaWxkUHJvY2VzcygpCiB7Ci0gICAgaWYgKCFtX3BhZ2VNYXAuaXNFbXB0 eSgpIHx8IG1fcHJvY2Vzc1Bvb2wtPmhhc1N1c3BlbmRlZFBhZ2VGb3IoKnRoaXMpKQorICAgIGlm ICghbV9wYWdlTWFwLmlzRW1wdHkoKSB8fCBtX3Byb2Nlc3NQb29sLT5oYXNTdXNwZW5kZWRQYWdl Rm9yKCp0aGlzKSB8fCAhbV9wcm92aXNpb25hbFBhZ2VzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCiAgICAgaWYgKCFtX3Byb2Nlc3NQb29sLT5zaG91bGRUZXJtaW5hdGUodGhp cykpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku aCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCmluZGV4IDc1ZjY1 YTdmN2ViMWFjYzgxOTk5MWNlNGY5ZjY5ODZjOTViNjFmZjMuLjUwNDI2MzBkZTM3MWQ4NWE4Mjgz NzQzNDhhYTk2OTE3MzljOWNkNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlByb2Nlc3NQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nl c3NQcm94eS5oCkBAIC03MCw2ICs3MCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgTmV0 d29ya1Byb2Nlc3NQcm94eTsKIGNsYXNzIE9iakNPYmplY3RHcmFwaDsKIGNsYXNzIFBhZ2VDbGll bnQ7CitjbGFzcyBQcm92aXNpb25hbFBhZ2VQcm94eTsKIGNsYXNzIFVzZXJNZWRpYUNhcHR1cmVN YW5hZ2VyUHJveHk7CiBjbGFzcyBWaXNpdGVkTGlua1N0b3JlOwogY2xhc3MgV2ViQmFja0Zvcndh cmRMaXN0SXRlbTsKQEAgLTEyNCw2ICsxMjUsOSBAQCBwdWJsaWM6CiAgICAgZW51bSBjbGFzcyBF bmRzVXNpbmdEYXRhU3RvcmUgOiBib29sIHsgTm8sIFllcyB9OwogICAgIHZvaWQgcmVtb3ZlV2Vi UGFnZShXZWJQYWdlUHJveHkmLCB1aW50NjRfdCBwYWdlSUQsIEVuZHNVc2luZ0RhdGFTdG9yZSk7 CiAKKyAgICB2b2lkIGFkZFByb3Zpc2lvbmFsUGFnZVByb3h5KFByb3Zpc2lvbmFsUGFnZVByb3h5 JiBwcm92aXNpb25hbFBhZ2UpIHsgQVNTRVJUKCFtX3Byb3Zpc2lvbmFsUGFnZXMuY29udGFpbnMo JnByb3Zpc2lvbmFsUGFnZSkpOyBtX3Byb3Zpc2lvbmFsUGFnZXMuYWRkKCZwcm92aXNpb25hbFBh Z2UpOyB9CisgICAgdm9pZCByZW1vdmVQcm92aXNpb25hbFBhZ2VQcm94eShQcm92aXNpb25hbFBh Z2VQcm94eSYgcHJvdmlzaW9uYWxQYWdlKSB7IEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFnZXMuY29u dGFpbnMoJnByb3Zpc2lvbmFsUGFnZSkpOyBtX3Byb3Zpc2lvbmFsUGFnZXMucmVtb3ZlKCZwcm92 aXNpb25hbFBhZ2UpOyB9CisKICAgICB0eXBlbmFtZSBXZWJQYWdlUHJveHlNYXA6OlZhbHVlc0Nv bnN0SXRlcmF0b3JSYW5nZSBwYWdlcygpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZU1hcC52YWx1ZXMo KTsgfQogICAgIHVuc2lnbmVkIHBhZ2VDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZU1hcC5z aXplKCk7IH0KICAgICB1bnNpZ25lZCB2aXNpYmxlUGFnZUNvdW50KCkgY29uc3QgeyByZXR1cm4g bV92aXNpYmxlUGFnZUNvdW50ZXIudmFsdWUoKTsgfQpAQCAtMzMwLDYgKzMzNCw4IEBAIHByaXZh dGU6CiAKICAgICB2b2lkIGxvZ0RpYWdub3N0aWNNZXNzYWdlRm9yUmVzb3VyY2VMaW1pdFRlcm1p bmF0aW9uKGNvbnN0IFN0cmluZyYgbGltaXRLZXkpOwogCisgICAgYm9vbCBoYXNQcm92aXNpb25h bFBhZ2VXaXRoSUQodWludDY0X3QgcGFnZUlEKSBjb25zdDsKKwogICAgIGVudW0gY2xhc3MgSXNX ZWFrIHsgTm8sIFllcyB9OwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGNsYXNzIFdlYWtPclN0 cm9uZ1B0ciB7CiAgICAgcHVibGljOgpAQCAtMzczLDYgKzM3OSw3IEBAIHByaXZhdGU6CiAKICAg ICBXZWJQYWdlUHJveHlNYXAgbV9wYWdlTWFwOwogICAgIFdlYkZyYW1lUHJveHlNYXAgbV9mcmFt ZU1hcDsKKyAgICBIYXNoU2V0PFByb3Zpc2lvbmFsUGFnZVByb3h5Kj4gbV9wcm92aXNpb25hbFBh Z2VzOwogICAgIFVzZXJJbml0aWF0ZWRBY3Rpb25NYXAgbV91c2VySW5pdGlhdGVkQWN0aW9uTWFw OwogCiAgICAgSGFzaFNldDxWaXNpdGVkTGlua1N0b3JlKj4gbV92aXNpdGVkTGlua1N0b3JlczsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2ogYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4 IDUwN2VkYjczZTc0YzNhNTdmNGVmNDcyZjViNTQ2Y2IyZGIwNjdhYTkuLjcwNzliMjY5ODg1ZGY2 N2EwZTgxOTA5MTZmMGJhMDU4NmJhMzEyMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2Vi S2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYktpdC9XZWJLaXQu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMzA5NSw2ICszMDk1LDggQEAKIAkJNDY2QkMw MzgxRkEyNjZDOTAwMkZBOUMxIC8qIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdlYlNXQ29udGV4dE1hbmFnZXJD b25uZWN0aW9uLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDY2QkMwMzkxRkEy NjZDOTAwMkZBOUMxIC8qIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmg7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ2NkJDMDNBMUZBMjY2QzkwMDJGQTlDMSAv KiBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5tZXNzYWdlcy5pbiAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRl eHQ7IHBhdGggPSBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5tZXNzYWdlcy5pbjsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJNDY4MzU2OUEyMUU4MUNDNzAwNkUyN0EzIC8qIFBy b3Zpc2lvbmFsUGFnZVByb3h5LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFBy b3Zpc2lvbmFsUGFnZVByb3h5Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTQ2ODM1 NjlCMjFFODFDQzcwMDZFMjdBMyAvKiBQcm92aXNpb25hbFBhZ2VQcm94eS5jcHAgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBQcm92aXNpb25hbFBhZ2VQcm94eS5jcHA7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ2QTJCNjA2MUU1Njc1QTIwMEMzREVEQSAvKiBC YWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jcHAuY3BwOyBwYXRoID0gQmFja2dyb3VuZFByb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVy LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDZBMkI2MDcxRTU2NzVBMjAwQzNE RURBIC8qIEJhY2tncm91bmRQcm9jZXNzUmVzcG9uc2l2ZW5lc3NUaW1lci5oICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jLmg7IHBhdGggPSBCYWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVuZXNzVGlt ZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDZERjA2MzkxRjM5MDVFNTAwMTk4 MEJCIC8qIE5ldHdvcmtDT1JTUHJlZmxpZ2h0Q2hlY2tlci5jcHAgKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmNwcC5jcHA7IHBhdGggPSBOZXR3b3JrQ09SU1ByZWZsaWdodENoZWNrZXIuY3BwOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNzM1MCw2ICs3MzUyLDggQEAKIAkJCQk4NkU2N0Ey MjE5MEY0MTE4MDAwMDRBQjcgLyogUHJvY2Vzc1Rocm90dGxlci5jcHAgKi8sCiAJCQkJODZFNjdB MjExOTBGNDExODAwMDA0QUI3IC8qIFByb2Nlc3NUaHJvdHRsZXIuaCAqLywKIAkJCQk4MzA0OEFF NTFBQ0E0NURDMDA4MkM4MzIgLyogUHJvY2Vzc1Rocm90dGxlckNsaWVudC5oICovLAorCQkJCTQ2 ODM1NjlCMjFFODFDQzcwMDZFMjdBMyAvKiBQcm92aXNpb25hbFBhZ2VQcm94eS5jcHAgKi8sCisJ CQkJNDY4MzU2OUEyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmggKi8s CiAJCQkJQTU1QkE4MUIxQkEyNUIxRTAwN0NEMzNEIC8qIFJlbW90ZVdlYkluc3BlY3RvclByb3h5 LmNwcCAqLywKIAkJCQlBNTVCQTgxOTFCQTI1QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2ViSW5zcGVj dG9yUHJveHkuaCAqLywKIAkJCQlBNTVCQTgxQTFCQTI1QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2Vi SW5zcGVjdG9yUHJveHkubWVzc2FnZXMuaW4gKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAKaW5kZXggMDA3NDliNDc3YTI0Y2U4Y2NjODI1MDFkOTRl MDhiNjBlZTFhNjI2My4uZmZlZDAwYzgyMDZhOTRmMGU0ZmZjN2ZmM2E4YTlkZmY4NjEzZmFjOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcApAQCAt MjYzLDggKzI2Myw2IEBAIHN0YXRpYyBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gdG9Qb2xpY3lBY3Rp b24oV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbikKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6 OlBvbGljeUFjdGlvbjo6SWdub3JlOwogICAgIGNhc2UgV2ViUG9saWN5QWN0aW9uOjpEb3dubG9h ZDoKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6RG93bmxvYWQ7Ci0gICAg Y2FzZSBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQ6Ci0gICAgICAgIGJyZWFrOwogICAgIH0KICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICByZXR1cm4gV2ViQ29yZTo6UG9saWN5QWN0aW9u OjpJZ25vcmU7CkBAIC0yNzIsMTEgKzI3MCw4IEBAIHN0YXRpYyBXZWJDb3JlOjpQb2xpY3lBY3Rp b24gdG9Qb2xpY3lBY3Rpb24oV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbikKIAogdm9pZCBX ZWJGcmFtZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKHVpbnQ2NF90IGxpc3RlbmVySUQsIFdl YlBvbGljeUFjdGlvbiBhY3Rpb24sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgRG93bmxvYWRJRCBk b3dubG9hZElELCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2ll cykKIHsKLSAgICBpZiAoIW1fY29yZUZyYW1lIHx8ICFtX3BvbGljeUxpc3RlbmVySUQgfHwgbGlz dGVuZXJJRCAhPSBtX3BvbGljeUxpc3RlbmVySUQgfHwgIW1fcG9saWN5RnVuY3Rpb24pIHsKLSAg ICAgICAgaWYgKGFjdGlvbiA9PSBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQpCi0gICAgICAgICAg ICBwYWdlKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkRmFpbFRvU3VzcGVuZEFm dGVyUHJvY2Vzc1N3YXAoKSk7CisgICAgaWYgKCFtX2NvcmVGcmFtZSB8fCAhbV9wb2xpY3lMaXN0 ZW5lcklEIHx8IGxpc3RlbmVySUQgIT0gbV9wb2xpY3lMaXN0ZW5lcklEIHx8ICFtX3BvbGljeUZ1 bmN0aW9uKQogICAgICAgICByZXR1cm47Ci0gICAgfQogCiAgICAgRnJhbWVQb2xpY3lGdW5jdGlv biBmdW5jdGlvbiA9IFdURk1vdmUobV9wb2xpY3lGdW5jdGlvbik7CiAgICAgYm9vbCBmb3JOYXZp Z2F0aW9uQWN0aW9uID0gbV9wb2xpY3lGdW5jdGlvbkZvck5hdmlnYXRpb25BY3Rpb24gPT0gRm9y TmF2aWdhdGlvbkFjdGlvbjo6WWVzOwpAQCAtMjkyLDE2ICsyODcsNyBAQCB2b2lkIFdlYkZyYW1l OjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24odWludDY0X3QgbGlzdGVuZXJJRCwgV2ViUG9saWN5 QWN0aW9uIGFjdAogICAgICAgICAgICAgZG9jdW1lbnRMb2FkZXItPnNldE5hdmlnYXRpb25JRChu YXZpZ2F0aW9uSUQpOwogICAgIH0KIAotICAgIGJvb2wgc2hvdWxkU3VzcGVuZCA9IGZhbHNlOwot ICAgIGlmIChhY3Rpb24gPT0gV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kKSB7Ci0gICAgICAgIHNo b3VsZFN1c3BlbmQgPSB0cnVlOwotICAgICAgICBhY3Rpb24gPSBXZWJQb2xpY3lBY3Rpb246Okln bm9yZTsKLSAgICB9Ci0KICAgICBmdW5jdGlvbih0b1BvbGljeUFjdGlvbihhY3Rpb24pKTsKLQot ICAgIGlmIChzaG91bGRTdXNwZW5kKQotICAgICAgICBwYWdlKCktPnN1c3BlbmRGb3JQcm9jZXNz U3dhcCgpOwogfQogCiB2b2lkIFdlYkZyYW1lOjpzdGFydERvd25sb2FkKGNvbnN0IFdlYkNvcmU6 OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWROYW1lKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCAyNWQ2 ZGZiNzFkMDNhNDk2NjQ0YzYyMzJmNmZiNDIxOGZhOGQyZmJiLi41Mzk2YmFhOGYwZDAxYTgzMjRj MjJkMmIzZTkyYWExZmIyZTE0ZmU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmNwcApAQCAtNDAxLDcgKzQwMSw3IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWlu dDY0X3QgcGFnZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAg ICAsIG1fb3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgeyBwYXJhbWV0ZXJzLm92ZXJyaWRl Q29udGVudFNlY3VyaXR5UG9saWN5IH0KICAgICAsIG1fY3B1TGltaXQocGFyYW1ldGVycy5jcHVM aW1pdCkKICNpZiBQTEFURk9STShNQUMpCi0gICAgLCBtX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVh T25QYWdlVHJhbnNpdGlvbihwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQpCisgICAgLCBt X3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNpdGlvbihwYXJhbWV0ZXJzLmlzUHJv Y2Vzc1N3YXApCiAjZW5kaWYKIHsKICAgICBBU1NFUlQobV9wYWdlSUQpOwpAQCAtNDcxLDggKzQ3 MSw4IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBXZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICBtX2RyYXdpbmdBcmVhLT5zZXRQYWludGluZ0Vu YWJsZWQoZmFsc2UpOwogICAgIG1fZHJhd2luZ0FyZWEtPnNldFNob3VsZFNjYWxlVmlld1RvRml0 RG9jdW1lbnQocGFyYW1ldGVycy5zaG91bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50KTsKIAotICAg IGlmIChwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQpCi0gICAgICAgIGZyZWV6ZUxheWVy VHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlN3YXBGcm9tU3VzcGVuZGVkKTsKKyAgICBpZiAo cGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwKQorICAgICAgICBmcmVlemVMYXllclRyZWUoTGF5ZXJU cmVlRnJlZXplUmVhc29uOjpQcm9jZXNzU3dhcCk7CiAKICNpZiBFTkFCTEUoQVNZTkNfU0NST0xM SU5HKQogICAgIG1fdXNlQXN5bmNTY3JvbGxpbmcgPSBwYXJhbWV0ZXJzLnN0b3JlLmdldEJvb2xW YWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6dGhyZWFkZWRTY3JvbGxpbmdFbmFibGVkS2V5 KCkpOwpAQCAtNjk2LDcgKzY5Niw3IEBAIHZvaWQgV2ViUGFnZTo6cmVpbml0aWFsaXplV2ViUGFn ZShXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICAgICAgbV9kcmF3 aW5nQXJlYS0+dXBkYXRlUHJlZmVyZW5jZXMocGFyYW1ldGVycy5zdG9yZSk7CiAgICAgICAgIG1f ZHJhd2luZ0FyZWEtPnNldFBhaW50aW5nRW5hYmxlZCh0cnVlKTsKICNpZiBQTEFURk9STShNQUMp Ci0gICAgICAgIG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uID0gcGFy YW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkOworICAgICAgICBtX3Nob3VsZEF0dGFjaERyYXdp bmdBcmVhT25QYWdlVHJhbnNpdGlvbiA9IHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcDsKICNlbmRp ZgogICAgICAgICB1bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlBhZ2VT dXNwZW5kZWQpOwogICAgIH0KQEAgLTMwNTMsMTIgKzMwNTMsNiBAQCB2b2lkIFdlYlBhZ2U6OmRp ZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBsaXN0ZW5l cklELCBXZQogICAgIFdlYkZyYW1lKiBmcmFtZSA9IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLndl YkZyYW1lKGZyYW1lSUQpOwogICAgIGlmICghZnJhbWUpCiAgICAgICAgIHJldHVybjsKLSAgICBp ZiAocG9saWN5QWN0aW9uID09IFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZCkgewotICAgICAgICBB U1NFUlQoZnJhbWUgPT0gbV9tYWluRnJhbWUpOwotICAgICAgICBzZXRJc1N1c3BlbmRlZCh0cnVl KTsKLQotICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5zZW5kUHJld2FybUluZm9ybWF0 aW9uKG1haW5XZWJGcmFtZSgpLT51cmwoKSk7Ci0gICAgfQogICAgIGZyYW1lLT5kaWRSZWNlaXZl UG9saWN5RGVjaXNpb24obGlzdGVuZXJJRCwgcG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uSUQsIGRv d25sb2FkSUQsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiB9CiAKQEAgLTMxMDAsNyArMzA5 NCw3IEBAIHZvaWQgV2ViUGFnZTo6ZGlkQ29tcGxldGVQYWdlVHJhbnNpdGlvbigpCiAKICAgICBi b29sIGlzSW5pdGlhbEVtcHR5RG9jdW1lbnQgPSAhbV9tYWluRnJhbWU7CiAgICAgaWYgKCFpc0lu aXRpYWxFbXB0eURvY3VtZW50KQotICAgICAgICB1bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVG cmVlemVSZWFzb246OlN3YXBGcm9tU3VzcGVuZGVkKTsKKyAgICAgICAgdW5mcmVlemVMYXllclRy ZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29uOjpQcm9jZXNzU3dhcCk7CiAKICNpZiBQTEFURk9STShN QUMpCiAgICAgaWYgKG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uICYm ICFpc0luaXRpYWxFbXB0eURvY3VtZW50KSB7CkBAIC02MzEyLDYgKzYzMDYsMTAgQEAgdm9pZCBX ZWJQYWdlOjpzZXRJc1N1c3BlbmRlZChib29sIHN1c3BlbmRlZCkKICAgICBpZiAobV9pc1N1c3Bl bmRlZCkgewogICAgICAgICAvLyBVbmZyb3plbiBvbiBkcmF3aW5nIGFyZWEgcmVzZXQuCiAgICAg ICAgIGZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlBhZ2VTdXNwZW5kZWQp OworCisgICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnNlbmRQcmV3YXJtSW5mb3JtYXRp b24obWFpbldlYkZyYW1lKCktPnVybCgpKTsKKworICAgICAgICBzdXNwZW5kRm9yUHJvY2Vzc1N3 YXAoKTsKICAgICB9IGVsc2UKICAgICAgICAgbV9zaG91bGRSZXNldERyYXdpbmdBcmVhQWZ0ZXJT dXNwZW5kID0gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuaAppbmRleCA3MTVlMTI0NTIwZmYwNzZiOTYwYWVkNzBlOWI5MjA3NWE2NTUyYWVmLi5mM2I5 MzRlMjdkYTlkNWVhNWExYmJmNTVmMTQ5ZjVhODUxMjczNmU0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC02OTYsNyArNjk2LDcgQEAgcHVibGljOgog ICAgICAgICBQcm9jZXNzU3VzcGVuZGVkICAgICAgICA9IDEgPDwgMiwKICAgICAgICAgUGFnZVN1 c3BlbmRlZCAgICAgICAgICAgPSAxIDw8IDMsCiAgICAgICAgIFByaW50aW5nICAgICAgICAgICAg ICAgID0gMSA8PCA0LAotICAgICAgICBTd2FwRnJvbVN1c3BlbmRlZCAgICAgICA9IDEgPDwgNSwK KyAgICAgICAgUHJvY2Vzc1N3YXAgICAgICAgICAgICAgPSAxIDw8IDUsCiAgICAgfTsKICAgICB2 b2lkIGZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb24pOwogICAgIHZvaWQgdW5m cmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29uKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5n QXJlYS5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVB bmltYXRpb25EcmF3aW5nQXJlYS5tbQppbmRleCA5MWFkNzFhZGUxYjdkYjRmOWRjZTY0ZDRmMzMw NDY3YjIyYjgzM2NjLi44M2I2NTk5MjcwYjUxYzdiYjE4ZWZlNzM3YTU5MmUwMjU3MWEyODA2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCkBAIC05Nyw3ICs5Nyw3 IEBAIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpUaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYShXZWJQYWdlJiB3ZWJQYWdlLCBjCiAgICAgdXBkYXRlTGF5ZXJIb3N0aW5nQ29udGV4 dCgpOwogICAgIHNldENvbG9yU3BhY2UocGFyYW1ldGVycy5jb2xvclNwYWNlKTsKIAotICAgIGlm ICghcGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKQorICAgIGlmICghcGFyYW1ldGVycy5p c1Byb2Nlc3NTd2FwKQogICAgICAgICBhdHRhY2goKTsKIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMv Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGNkNWY4ZTlkYTU1ZjBkYjMxMDk1YTMz NzE5NTg0NTc1YWI1ZTNmNWIuLmYwMTY1NGQ2OTZhZWQ0MjAzMzZiMmRiYTY3YmVhY2Q1ZDYxZGE5 NzMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNiBAQAorMjAxOS0wMS0xNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29t PgorCisgICAgICAgIFJlZ3Jlc3Npb24oUFNPTikgVmlldyBiZWNvbWVzIGJsYW5rIGFmdGVyIGNs aWNrIGEgY3Jvc3Mtc2l0ZSBkb3dubG9hZCBsaW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMzNjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3 MDk5NTczPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZCBBUEkgdGVzdCBjb3ZlcmFnZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW06CisgICAgICAgICgtW1BTT05O YXZpZ2F0aW9uRGVsZWdhdGUgd2ViVmlldzpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9u c2U6ZGVjaXNpb25IYW5kbGVyOl0pOgorCiAyMDE5LTAxLTEwICBDb21taXQgUXVldWUgIDxjb21t aXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCBy MjM5ODI1LgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KaW5kZXggZjM1ZDhiYWEzNTNm MDcwMjRmZDQwZTdkNTI3NDUzYTc0MjEwYzNiYS4uZDViZDVlYzc3NmJkNWUxN2IwYmQ5Yzk0MDAy Y2NiNTQ0N2NhNWQwOCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCkBAIC0xLDUg KzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNyBBcHBsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTctMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTcyLDYgKzcy LDcgQEAgc3RhdGljIGJvb2wgc2VydmVyUmVkaXJlY3RlZDsKIHN0YXRpYyBIYXNoU2V0PHBpZF90 PiBzZWVuUElEczsKIHN0YXRpYyBib29sIHdpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3Q7CiBzdGF0 aWMgYm9vbCBkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3Q7CitzdGF0aWMgYm9vbCBzaG91bGRDb252 ZXJ0VG9Eb3dubG9hZDsKIHN0YXRpYyBSZXRhaW5QdHI8TlNVUkw+IGNsaWVudFJlZGlyZWN0U291 cmNlVVJMOwogc3RhdGljIFJldGFpblB0cjxOU1VSTD4gY2xpZW50UmVkaXJlY3REZXN0aW5hdGlv blVSTDsKIApAQCAtMTI4LDYgKzEyOSwxMSBAQCAtICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAq KXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjooV0tOYXZpZ2F0aQogICAg IGRpZFJlcG9uZFRvUG9saWN5RGVjaXNpb25DYWxsID0gdHJ1ZTsKIH0KIAorLSAodm9pZCl3ZWJW aWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25SZXNwb25z ZTooV0tOYXZpZ2F0aW9uUmVzcG9uc2UgKiluYXZpZ2F0aW9uUmVzcG9uc2UgZGVjaXNpb25IYW5k bGVyOih2b2lkICheKShXS05hdmlnYXRpb25SZXNwb25zZVBvbGljeSkpZGVjaXNpb25IYW5kbGVy Cit7CisgICAgZGVjaXNpb25IYW5kbGVyKHNob3VsZENvbnZlcnRUb0Rvd25sb2FkID8gX1dLTmF2 aWdhdGlvblJlc3BvbnNlUG9saWN5QmVjb21lRG93bmxvYWQgOiBXS05hdmlnYXRpb25SZXNwb25z ZVBvbGljeUFsbG93KTsKK30KKwogLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3 IGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTmF2aWdhdGlvbjooV0tOYXZp Z2F0aW9uICopbmF2aWdhdGlvbgogewogICAgIHNlZW5QSURzLmFkZChbd2ViVmlldyBfd2ViUHJv Y2Vzc0lkZW50aWZpZXJdKTsKQEAgLTE0MDUsNyArMTQxMSw3IEBAIFRFU1QoUHJvY2Vzc1N3YXAs IFNlcnZlclJlZGlyZWN0KQogCiAgICAgRVhQRUNUX0ZBTFNFKHNlcnZlclJlZGlyZWN0ZWQpOwog ICAgIEVYUEVDVF9FUSgzLCBudW1iZXJPZkRlY2lkZVBvbGljeUNhbGxzKTsKLSAgICBFWFBFQ1Rf RVEoMnUsIHNlZW5QSURzLnNpemUoKSk7CisgICAgRVhQRUNUX0VRKDN1LCBzZWVuUElEcy5zaXpl KCkpOwogfQogCiBURVNUKFByb2Nlc3NTd2FwLCBTZXJ2ZXJSZWRpcmVjdDIpCkBAIC0xNDY3LDYg KzE0NzMsMTA5IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIFNlcnZlclJlZGlyZWN0MikKICAgICBFWFBF Q1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbjEuaHRtbCIsIFtbd2ViVmll dyBVUkxdIGFic29sdXRlU3RyaW5nXSk7CiB9CiAKK3N0YXRpYyBjb25zdCBjaGFyKiBsaW5rVG9X ZWJLaXRCeXRlcyA9IFIiUFNPTlJFU09VUkNFKAorPGJvZHk+CisgIDxhIGlkPSJ0ZXN0TGluayIg aHJlZj0icHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCI+TGluazwvYT4KKzwvYm9keT4K KylQU09OUkVTT1VSQ0UiOworCitURVNUKFByb2Nlc3NTd2FwLCBQb2xpY3lDYW5jZWxBZnRlclNl cnZlclJlZGlyZWN0KQoreworICAgIGF1dG8gcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uID0gYWRv cHROUyhbW19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIHBy b2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKS5wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb24gPSBZ RVM7CisgICAgYXV0byBwcm9jZXNzUG9vbCA9IGFkb3B0TlMoW1tXS1Byb2Nlc3NQb29sIGFsbG9j XSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOnByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKV0p OworCisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdD b25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNl dFByb2Nlc3NQb29sOnByb2Nlc3NQb29sLmdldCgpXTsKKyAgICBhdXRvIGhhbmRsZXIgPSBhZG9w dE5TKFtbUFNPTlNjaGVtZSBhbGxvY10gaW5pdF0pOworICAgIFtoYW5kbGVyIGFkZE1hcHBpbmdG cm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy5nb29nbGUuY29tL21haW4uaHRtbCIgdG9EYXRhOmxp bmtUb1dlYktpdEJ5dGVzXTsKKyAgICBbaGFuZGxlciBhZGRSZWRpcmVjdEZyb21VUkxTdHJpbmc6 QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIiB0b1VSTFN0cmluZzpAInBzb246Ly93 d3cuYXBwbGUuY29tL2lnbm9yZS5odG1sIl07CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNl dFVSTFNjaGVtZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBmb3JVUkxTY2hlbWU6QCJwc29uIl07CisK KyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZy YW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246d2ViVmlld0NvbmZp Z3VyYXRpb24uZ2V0KCldKTsKKyAgICBhdXRvIG5hdmlnYXRpb25EZWxlZ2F0ZSA9IGFkb3B0TlMo W1tQU09OTmF2aWdhdGlvbkRlbGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcgc2V0 TmF2aWdhdGlvbkRlbGVnYXRlOm5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBuYXZp Z2F0aW9uRGVsZWdhdGUtPmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24gPSBeKFdLTmF2 aWdhdGlvbkFjdGlvbiAqYWN0aW9uLCB2b2lkICheZGVjaXNpb25IYW5kbGVyKShXS05hdmlnYXRp b25BY3Rpb25Qb2xpY3kpKSB7CisgICAgICAgIGlmIChbYWN0aW9uLnJlcXVlc3QuVVJMLmFic29s dXRlU3RyaW5nIGhhc1N1ZmZpeDpAImlnbm9yZS5odG1sIl0pIHsKKyAgICAgICAgICAgIGRlY2lz aW9uSGFuZGxlcihXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lDYW5jZWwpOworICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB9CisgICAgICAgIGRlY2lzaW9uSGFuZGxlcihXS05hdmlnYXRpb25B Y3Rpb25Qb2xpY3lBbGxvdyk7CisgICAgfTsKKworICAgIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCA9 IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29u Oi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1sIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0 OnJlcXVlc3RdOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBk b25lID0gZmFsc2U7CisgICAgYXV0byBwaWRBZnRlckZpcnN0TG9hZCA9IFt3ZWJWaWV3IF93ZWJQ cm9jZXNzSWRlbnRpZmllcl07CisKKyAgICBFWFBFQ1RfRVEoMSwgbnVtYmVyT2ZEZWNpZGVQb2xp Y3lDYWxscyk7CisKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJ0ZXN0TGluay5j bGljaygpIiBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRp bDo6cnVuKCZmYWlsZWQpOworICAgIGZhaWxlZCA9IGZhbHNlOworICAgIGRvbmUgPSBmYWxzZTsK KworICAgIEVYUEVDVF9FUSgzLCBudW1iZXJPZkRlY2lkZVBvbGljeUNhbGxzKTsKKworICAgIC8v IFdlIHNob3VsZCBzdGlsbCBiZSBvbiBnb29nbGUuY29tLgorICAgIEVYUEVDVF9FUShwaWRBZnRl ckZpcnN0TG9hZCwgW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7CisgICAgRVhQRUNU X1dLX1NUUkVRKEAicHNvbjovL3d3dy5nb29nbGUuY29tL21haW4uaHRtbCIsIFtbd2ViVmlldyBV UkxdIGFic29sdXRlU3RyaW5nXSk7CisKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6 QCJ0ZXN0TGluay5pbm5lclRleHQiIGNvbXBsZXRpb25IYW5kbGVyOiBbJl0gKGlkIGlubmVyVGV4 dCwgTlNFcnJvciAqZXJyb3IpIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAiTGluayIsIGlu bmVyVGV4dCk7CisgICAgICAgIGRvbmUgPSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRB UEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworfQorCitURVNUKFByb2Nl c3NTd2FwLCBDcm9zc1NpdGVEb3dubG9hZCkKK3sKKyAgICBhdXRvIHByb2Nlc3NQb29sQ29uZmln dXJhdGlvbiA9IGFkb3B0TlMoW1tfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gYWxsb2NdIGlu aXRdKTsKKyAgICBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1N3YXBzT25O YXZpZ2F0aW9uID0gWUVTOworICAgIGF1dG8gcHJvY2Vzc1Bvb2wgPSBhZG9wdE5TKFtbV0tQcm9j ZXNzUG9vbCBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZ3Vy YXRpb24uZ2V0KCldKTsKKworICAgIGF1dG8gd2ViVmlld0NvbmZpZ3VyYXRpb24gPSBhZG9wdE5T KFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3Q29u ZmlndXJhdGlvbiBzZXRQcm9jZXNzUG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07CisgICAgYXV0byBo YW5kbGVyID0gYWRvcHROUyhbW1BTT05TY2hlbWUgYWxsb2NdIGluaXRdKTsKKyAgICBbaGFuZGxl ciBhZGRNYXBwaW5nRnJvbVVSTFN0cmluZzpAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0 bWwiIHRvRGF0YTpsaW5rVG9XZWJLaXRCeXRlc107CisgICAgW2hhbmRsZXIgYWRkTWFwcGluZ0Zy b21VUkxTdHJpbmc6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIiB0b0RhdGE6Ikhl bGxvIl07CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6aGFu ZGxlci5nZXQoKSBmb3JVUkxTY2hlbWU6QCJwc29uIl07CisKKyAgICBhdXRvIHdlYlZpZXcgPSBh ZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwg ODAwLCA2MDApIGNvbmZpZ3VyYXRpb246d2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAg ICBhdXRvIG5hdmlnYXRpb25EZWxlZ2F0ZSA9IGFkb3B0TlMoW1tQU09OTmF2aWdhdGlvbkRlbGVn YXRlIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOm5h dmlnYXRpb25EZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBb TlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAicHNvbjov L3d3dy5nb29nbGUuY29tL21haW4uaHRtbCJdXTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpy ZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9u ZSA9IGZhbHNlOworICAgIGF1dG8gcGlkQWZ0ZXJGaXJzdExvYWQgPSBbd2ViVmlldyBfd2ViUHJv Y2Vzc0lkZW50aWZpZXJdOworCisgICAgc2hvdWxkQ29udmVydFRvRG93bmxvYWQgPSB0cnVlOwor ICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAInRlc3RMaW5rLmNsaWNrKCkiIGNvbXBs ZXRpb25IYW5kbGVyOm5pbF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmZhaWxl ZCk7CisgICAgZmFpbGVkID0gZmFsc2U7CisgICAgc2hvdWxkQ29udmVydFRvRG93bmxvYWQgPSBm YWxzZTsKKworICAgIC8vIFdlIHNob3VsZCBzdGlsbCBiZSBvbiBnb29nbGUuY29tLgorICAgIEVY UEVDVF9FUShwaWRBZnRlckZpcnN0TG9hZCwgW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVy XSk7CisgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5nb29nbGUuY29tL21haW4uaHRt bCIsIFtbd2ViVmlldyBVUkxdIGFic29sdXRlU3RyaW5nXSk7CisKKyAgICBbd2ViVmlldyBldmFs dWF0ZUphdmFTY3JpcHQ6QCJ0ZXN0TGluay5pbm5lclRleHQiIGNvbXBsZXRpb25IYW5kbGVyOiBb Jl0gKGlkIGlubmVyVGV4dCwgTlNFcnJvciAqZXJyb3IpIHsKKyAgICAgICAgRVhQRUNUX1dLX1NU UkVRKEAiTGluayIsIGlubmVyVGV4dCk7CisgICAgICAgIGRvbmUgPSB0cnVlOworICAgIH1dOwor ICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOwor fQorCiBlbnVtIGNsYXNzIFNob3VsZEVuYWJsZVBTT04geyBObywgWWVzIH07CiBzdGF0aWMgdm9p ZCBydW5DbGllbnRTaWRlUmVkaXJlY3RUZXN0KFNob3VsZEVuYWJsZVBTT04gc2hvdWxkRW5hYmxl UFNPTikKIHsKQEAgLTIyMzIsMTIgKzIzNDEsMjcgQEAgVEVTVChQcm9jZXNzU3dhcCwgUGFnZVNo b3dIaWRlKQogCiAgICAgRVhQRUNUX0VRKDd1LCBbcmVjZWl2ZWRNZXNzYWdlcyBjb3VudF0pOwog ICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBw YWdlc2hvdyBOT1QgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVswXSk7Ci0gICAg RVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2Vo aWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0pOwotICAgIEVYUEVDVF9X S19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93IE5PVCBw ZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsKLSAgICBFWFBFQ1RfV0tfU1RS RVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQi LCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29u Oi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2 ZWRNZXNzYWdlcy5nZXQoKVs0XSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53 ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2Fn ZXMuZ2V0KClbNV0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29t L21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClb Nl0pOworICAgIGlmIChbcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSBoYXNQcmVmaXg6QCJwc29u Oi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIl0pIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVR KEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIs IHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJw c29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlc2hvdyBOT1QgcGVyc2lzdGVkIiwg cmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgRVhQRUNU X1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgTk9U IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0pOworICAgICAgICBFWFBFQ1Rf V0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVy c2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7CisgICAgfQorICAgIGlmIChbcmVj ZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSBoYXNQcmVmaXg6QCJwc29uOi8vd3d3LmFwcGxlLmNvbS9t YWluLmh0bWwiXSkgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxl LmNvbS9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdl dCgpWzNdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3Jn L21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClb NF0pOworICAgIH0gZWxzZSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cu d2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3Nh Z2VzLmdldCgpWzNdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBs ZS5jb20vbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5n ZXQoKVs0XSk7CisgICAgfQorICAgIGlmIChbcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSBoYXNQ cmVmaXg6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIl0pIHsKKyAgICAgICAgRVhQ RUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VoaWRl IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0pOworICAgICAgICBFWFBFQ1Rf V0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJz aXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAgICB9IGVsc2UgeworICAgICAg ICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdl c2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdKTsKKyAgICAgICAgRVhQ RUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VoaWRl IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAgIH0KIH0KIAogLy8g RGlzYWJsaW5nIHRoZSBwYWdlIGNhY2hlIGV4cGxpY2l0bHkgaXMgKGZvciBzb21lIHJlYXNvbikg bm90IGF2YWlsYWJsZSBvbiBpT1MuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMjFmNzc4ODI1ZDcxYjdmNjE2NTkyYzI2YzI5 NzNhMDFkZjk4MDRmYy4uZWVhYWVkOTUwZjY4OTQzZmM1YWVlNTk0NTMxZDFmMThiOTI2YjZjYyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAxLTE1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBh cHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBWaWV3IGJlY29tZXMgYmxhbmsg YWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQorICAgICAgICA8cmRhcjovL3By b2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgU2tpcCB0ZXN0IHRlc3RpbmcgdGhlIGNyb3NzLXByb2Nlc3MgRE9NV2luZG93IEFQ SSBhcyBJIGJyb2tlIGl0IHdpdGggdGhpcyBwYXRjaC4KKyAgICAgICAgVGhlIGZlYXR1cmUgaXMg ZmFyIGZyb20gcmVhZHkgYW5kIG9mZiBieSBkZWZhdWx0IGFueXdheS4gSSB3aWxsIGFkZCBzdXBw b3J0IGJhY2sKKyAgICAgICAgaW4gYSBmb2xsb3ctdXAuCisKKyAgICAgICAgKiBwbGF0Zm9ybS93 azIvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAxOS0wMS0xMCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0 LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIz OTgyNS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRp b25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggOGU5 NTllZGFmZmQ4OTI3ZWY5YzJhYWMzMTZlOWUzMTAwY2QxNDBjYi4uOWQ5MGJlOGI0OGU1N2M5NjBi Y2RhNjg2Y2UyNDQwZDcxMzhiYjBmNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v d2syL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RF eHBlY3RhdGlvbnMKQEAgLTczMyw4ICs3MzMsOCBAQCBodHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0 YXRpc3RpY3MvcmVtb3ZlLWJsb2NraW5nLWluLXJlZGlyZWN0Lmh0bWwgWyBTa2lwIF0KIGh0dHAv dGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGljcy9ub24tcHJldmFsZW50LXJlc291cmNlcy1jYW4t YWNjZXNzLWNvb2tpZXMtaW4tYS10aGlyZC1wYXJ0eS1jb250ZXh0Lmh0bWwgWyBTa2lwIF0KIGh0 dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGljcy9jYXAtY2FjaGUtbWF4LWFnZS1mb3ItcHJl dmFsZW50LXJlc291cmNlLmh0bWwgWyBTa2lwIF0KIAotIyBQcm9jZXNzIHN3YXBwaW5nIGlzIG9u bHkgaW1wbGVtZW50ZWQgb24gV2ViS2l0Mi4KLWh0dHAvdGVzdHMvbmF2aWdhdGlvbi9wcm9jZXNz LXN3YXAtd2luZG93LW9wZW4uaHRtbCBbIFBhc3MgXQorIyBUaGlzIGZlYXR1cmUgaXMgY3VycmVu dGx5IGRpc2FibGVkIGJ5IGRlZmF1bHQgYW5kIHVuZmluaXNoZWQgPHJkYXI6Ly9wcm9ibGVtLzM4 OTI1MDc3Pi4KK2h0dHAvdGVzdHMvbmF2aWdhdGlvbi9wcm9jZXNzLXN3YXAtd2luZG93LW9wZW4u aHRtbCBbIFNraXAgXQogCiAjIENyb3NzLU9yaWdpbi1SZXNvdXJjZS1Qb2xpY3kgcmVzcG9uc2Ug aGVhZGVyIGlzIG9ubHkgaW1wbGVtZW50ZWQgaW4gV2ViS2l0Mi4KIGh0dHAvd3B0L2Nyb3NzLW9y aWdpbi1yZXNvdXJjZS1wb2xpY3kvIFsgUGFzcyBdCg== 359165 2019-01-15 09:15:36 -0800 2019-01-15 09:37:10 -0800 Patch bug-193361-20190115091536.patch text/plain 102368 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5OTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQzNGM2ZGZkZDNhNWQ5 YmMxZjQ2MjZkNTVmOWY0OTg3MWNhNDA1Yi4uOGY3NjUzMTJiNmNhOWY2MzY2Zjc5YzRhY2Q4ZGYy YmYyODhkY2JiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAxLTE1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBW aWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAg ICAgIFdoZW4gcmVzdG9yaW5nIGZyb20gUGFnZUNhY2hlLCBtYWtlIHN1cmUgd2Ugbm90aWZ5IHRo ZSBjbGllbnQgdGhhdCB0aGUgbG9hZCB3YXMgY29tbWl0dGVkCisgICAgICAgICpiZWZvcmUqIHdl IHRlbGwgaXQgdGhhdCB0aGUgbmF2aWdhdGlvbiBpcyBjb21wbGV0ZS4gVGhpcyB3b3VsZCBjb25m dXNlIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eQorICAgICAgICBsb2dpYyBpbiB0aGUgVUlQcm9j ZXNzLgorCiAyMDE5LTAxLTE1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBBdWRpdDogcHJvdmlkZSBhIHdheSB0byBkZXRlcm1pbmUg d2hldGhlciBhIGdpdmUgbm9kZSBoYXMgZXZlbnQgbGlzdGVuZXJzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIxNTgw ZmMwNThiNTM3ZWQxYWRlNWY3NTJlMzE3NjZmY2UzYmQ0MDEuLjQxYjI4MmZiZGM1YmVkZTBiNWU1 YjE3ZDA5NTlkNjI3ZmQxMjFlN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAwIEBACisyMDE5LTAx LTE1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lv bihQU09OKSBWaWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25s b2FkIGxpbmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5MzM2MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGlzc3VlIHRyYWNrZWQgYnkg cmRhcjovL3Byb2JsZW0vNDcwOTk1NzMgaXMgdGhhdCBhIHByb3Zpc2lvbmFsIGxvYWQgbWF5IGdl dAorICAgICAgICBjYW5jZWxlZCAob3IgY29udmVydGVkIGludG8gYSBkb3dubG9hZCkgKmFmdGVy KiB3ZSd2ZSBkZWNpZGVkIHRvIHByb2Nlc3Mtc3dhcC4KKyAgICAgICAgSW4gc3VjaCBjYXNlcywg dGhlIHZpZXcgc2hvdWxkIGtlZXAgZGlzcGxheWluZyB0aGUgY3VycmVudCBzaXRlIGFuZCBpdCBz aG91bGQKKyAgICAgICAgc3RpbGwgYmUgaW50ZXJhY3RpdmUuIEhvd2V2ZXIsIHdpdGggdGhlIHBy ZXZpb3VzIFBTT04gbW9kZWwsIHRoZSB2aWV3IChwYWdlUHJveHkpCisgICAgICAgIHdvdWxkIGhh dmUgYWxyZWFkeSBzd2FwcGVkIHRvIHRoZSBuZXcgcHJvY2VzcyBhbmQgd291bGQgZW5kIHVwIGRp c3BsYXlpbmcgdGhlCisgICAgICAgIGluaXRpYWxseSBlbXB0eSBkb2N1bWVudC4KKworICAgICAg ICBUbyBhZGRyZXNzIHRoZSBpc3N1ZSwgdGhpcyBwYXRjaCBpbnRyb2R1Y2VzIHRoZSBjb25jZXB0 IG9mIGEgcHJvdmlzaW9uYWwgbG9hZAorICAgICAgICBpbiB0aGUgVUlQcm9jZXNzLCBoYW5kbGVk IGJ5IGEgUHJvdmlzaW9uYWxQYWdlUHJveHkgd2hpY2ggaGFzIGl0cyBvd24gcHJpdmlzaW9uYWwK KyAgICAgICAgcHJvY2Vzcy4gVGhlIFdlYlBhZ2VQcm94eSBvd25zIHRoZSBQcm92aXNpb25hbFBh Z2VQcm94eSBidXQgd2UgZG8gbm90IGNvbW1pdCB0aGUKKyAgICAgICAgcHJvdmlzaW9uYWwgcGFn ZSB1bnRpbCBhZnRlciB0aGUgbG9hZCB3YXMgY29tbWl0dGVkIGluIHRoZSBuZXcgcHJvY2Vzcy4g VGhpcyBtZWFucworICAgICAgICB0aGF0IHRoZSB2aWV3IC8gV2ViUGFnZVByb3h5IGtlZXBzIHVz aW5nIHRoZSBvbGQgcHJvY2VzcyBhbmQgZGlzcGxheXMgdGhlIGN1cnJlbnQKKyAgICAgICAgY29u dGVudCB1bnRpbCBhIGxvYWQgaGFzIGNvbW1pdHRlZCBpbiB0aGUgcHJvdmlzaW9uYWwgcGFnZS4g SWYgbm8gbG9hZCBjb21taXRzCisgICAgICAgIGluIHRoZSBwcm92aXNpb25hbCBwcm9jZXNzIChl LmcuIGJlY2F1c2UgdGhlIGxvYWQgaXMgY2FuY2VsbGVkIG9yIGNvbnZlcnRlZCBpbnRvCisgICAg ICAgIGEgZG93bmxvYWQpLCB0aGVuIHdlIG1lcmVseSBkZXN0cm95IHRoZSBQcm92aXNpb25hbFBh Z2VQcm94eSBhbmQgdGVybWluYXRlIGl0cworICAgICAgICBwcm9jZXNzLCB3aXRob3V0IGltcGFj dGluZyB0aGUgV2ViUGFnZVByb3h5LgorCisgICAgICAgICogU2hhcmVkL1dlYlBhZ2VDcmVhdGlv blBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJh bWV0ZXJzOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzLmg6CisgICAgICAgIFJlbmFtZSBpc1N3YXBGcm9tU3VzcGVuZGVkIHRvIGlzUHJvY2Vzc1N3 YXAgZm9yIGNsYXJpdHkgYXMgd2UgYWx3YXlzIHdhbnQgdG8KKyAgICAgICAgZGVsYXkgYXR0YWNo aW5nIHRoZSBkcmF3aW5nIGFyZWEgaW4gY2FzZSBvZiBhIHByb2Nlc3Mtc3dhcCwgbm8gbWF0dGVy IHdoYXQKKyAgICAgICAgbm93IHRoYXQgdGhlIHByZXZpb3VzIHByb2Nlc3MgaXMga2VwdCBhbGl2 ZSB1bnRpbCB0aGUgcHJvdmlzaW9uYWwgbG9hZCBpcworICAgICAgICBjb21taXR0ZWQgaW4gdGhl IG5ldyBwcm9jZXNzLgorCisgICAgICAgICogU2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oOgorICAg ICAgICBEcm9wIFN1c3BlbmQgcG9saWN5IGFjdGlvbi4gQXQgZGVjaWRlUG9saWN5Rm9yTmF2aWdh dGlvbkFjdGlvbiB0aW1lLCBpbiBjYXNlIG9mCisgICAgICAgIHByb2Nlc3Mtc3dhcCwgd2Ugbm93 IHRlbGwgdGhlIHByZXZpb3VzIHByb2Nlc3MgdG8gc2ltcGx5IGlnbm9yZSB0aGUgbG9hZCwgd2hp bGUKKyAgICAgICAgd2UgY3JlYXRlIGEgUHJvdmlzaW9uYWxQYWdlUHJveHkgdG8gZG8gdGhlIG5l dyBsb2FkIGluIGEgbmV3IHByb2Nlc3MuCisgICAgICAgIFN1c3BlbnNpb24gb2YgdGhlIHByZXZp b3VzIHBhZ2UgaW4gdGhlIG9sZCBwcm9jZXNzLCBoYXBwZW5zIGxhdGVyLCB3aGVuIGEgbG9hZAor ICAgICAgICBpcyBhY3R1YWxseSBjb21taXR0ZWQgaW4gdGhlIG5ldyBwcm9jZXNzLgorCisgICAg ICAgICogU291cmNlcy50eHQ6CisgICAgICAgIEFkZCBuZXcgUHJvdmlzaW9uYWxQYWdlUHJveHkg ZmlsZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAg ICAgICAoLVtXS1dlYlZpZXcgX2tpbGxXZWJDb250ZW50UHJvY2Vzc0FuZFJlc2V0U3RhdGVdKToK KyAgICAgICAgV2hlbiBjYWxsaW5nIF9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0YXRl IG9uIGEgV0tXZWJWaWV3LCBraWxsIGJvdGggdGhlIGN1cnJlbnQKKyAgICAgICAgcHJvY2VzcyBh bmQgdGhlIHByb3Zpc2lvbmFsIG9uZSwgdG8gbWFpbnRhaW4gcHJldmlvdXMgYmVoYXZpb3IgaW4g b3VyIEFQSSB0ZXN0cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlQ2xpZW50Lmg6CisgICAg ICAgIFRpbnkgYnVpbGQgZml4LgorCisgICAgICAgICogVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFn ZVByb3h5LmNwcDogQWRkZWQuCisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5 OjpQcm92aXNpb25hbFBhZ2VQcm94eSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFn ZVByb3h5Ojp+UHJvdmlzaW9uYWxQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6dGFrZURyYXdpbmdBcmVhKToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlz aW9uYWxQYWdlUHJveHk6OmNhbmNlbCk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFn ZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFs UGFnZVByb3h5Ojpsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24pOgorICAgICAgICAo V2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6Z29Ub0JhY2tGb3J3YXJkSXRlbSk6CisgICAg ICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOgor ICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25h bExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5Ojpk aWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6 UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKToKKyAgICAgICAgKFdlYktp dDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVTeW5jTWVzc2FnZSk6CisgICAgICAg ICogVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5Lmg6IEFkZGVkLgorICAgICAgICAoV2Vi S2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6cGFnZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zp c2lvbmFsUGFnZVByb3h5OjptYWluRnJhbWUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpQcm92 aXNpb25hbFBhZ2VQcm94eTo6cHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFs UGFnZVByb3h5Ojpwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IGNvbnN0KToKKyAgICAgICAg KFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6Om5hdmlnYXRpb25JRCBjb25zdCk6CisgICAg ICAgIEFkZCBuZXcgUHJvdmlzaW9uYWxQYWdlUHJveHkgY2xhc3MgdG8gd3JhcCB0aGUgcHJvdmlz aW9uYWwgbG9hZCBpbiB0aGUgbmV3IHByb2Nlc3MKKyAgICAgICAgYWZ0ZXIgYSBzd2FwLiBUaGUg cHJvdmlzaW9uYWwgcGFnZSBpcyBvd25lZCBieSB0aGUgV2ViUGFnZVByb3h5IGFuZCB3ZSBvbmx5 IGNvbW1pdAorICAgICAgICB0aGUgcHJvdmlzaW9uYWwgcGFnZSB3aGVuIHRoZSBsb2FkIGlzIGNv bW1pdHRlZC4gVW50aWwgdGhlbiwgdGhlIFdlYlBhZ2VQcm94eSBrZWVwcworICAgICAgICB1c2lu ZyB0aGUgb2xkIHByb2Nlc3MgYW5kIGRpc3BsYXlpbmcgdGhlIGN1cnJlbnQgY29udGVudC4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6On5TdXNwZW5kZWRQYWdlUHJveHkpOgorICAgICAgICAo V2ViS2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6OnVuc3VzcGVuZCk6CisgICAgICAgIChXZWJLaXQ6 OlN1c3BlbmRlZFBhZ2VQcm94eTo6ZGlkUHJvY2Vzc1JlcXVlc3RUb1N1c3BlbmQpOgorICAgICAg ICBVbnJlZ2lzdGVyIHRoZSBTdXNwZW5kZWRQYWdlUHJveHkgYXMgYW4gSVBDIG1lc3NhZ2UgcmVj ZWl2ZXIgYSBsaXR0bGUgYml0IGVhcmxpZXIKKyAgICAgICAgd2hlbiB3ZSdyZSBnb2luZyB0byB1 bnN1c3BlbmQgaXQuIFRoaXMgYXZvaWRzIGNvbmZsaWN0aW5nIHdpdGggdGhlIFByb3Zpc2lvbmFs UGFnZVByb3h5CisgICAgICAgIHdoaWNoIHRyaWVzIHRvIHJlZ2lzdGVyIGl0c2VsZiBhcyBhbiBJ UEMgbWVzc2FnZSByZWNlaXZlciBmb3IgdGhlIHNhbWUgcGFnZUlEIHdoZW4KKyAgICAgICAgYSBw cm9jZXNzLXN3YXAgb2NjdXJzIGFuZCB3ZSdyZSBzd2l0Y2hpbmcgdG8gYSBzdXNwZW5kZWQgcGFn ZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViRnJhbWVQcm94eTo6aXNNYWluRnJhbWUgY29uc3QpOgorICAgICAgICBXZWJGcmFt ZVByb3h5Ojppc01haW5GcmFtZSgpIHJlbGllcyBvbiBjaGVja2luZyB0aGF0IHRoZSBmcmFtZSBp cyB0aGUgV2ViUGFnZVByb3h5J3MgbV9tYWluRnJhbWUuCisgICAgICAgIE5vdyB0aGF0IHRoZSBX ZWJQYWdlUHJveHkgY2FuIGhhdmUgYSBQcm92aXNpb25hbFBhZ2VQcm94eSwgYWxzbyBjaGVjayBp ZiBpdCBpcyB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkncworICAgICAgICBtX21haW5GcmFtZSB0 byBtYWludGFpbiBwcmV2aW91cyBiZWhhdmlvci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnN3YXBUb1dlYlBy b2Nlc3MpOgorICAgICAgICBzd2FwVG9XZWJQcm9jZXNzKCkgbm8gbG9uZ2VyIHRha2VzIGNhcmUg b2YgdW5zdXNwZW5kaW5nIHRoZSBTdXNwZW5kZWRQYWdlIGJlY2F1c2Ugd2Ugbm93IGNhbGwgc3dh cFRvV2ViUHJvY2VzcygpCisgICAgICAgIGxhdGVyLCB3aGVuIGEgbG9hZCBpcyBhY3R1YWxseSBj b21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHBhZ2UgLyBwcm9jZXNzLiBzd2FwVG9XZWJQcm9j ZXNzKCkgbm93IGFsc28gbmVlZHMKKyAgICAgICAgdG8gaW5pdGlhbGl6ZSBzb21lIGRhdGEgbWVt YmVycyBzdWNoIGFzIHRoZSBkcmF3aW5nIGFyZWEgYW5kIHRoZSBtYWluIGZyYW1lIGFzIGl0IGlz IHRyYW5zZmVycmluZyB0aGVtIG92ZXIgZnJvbQorICAgICAgICB0aGUgUHJvdmlzaW9uYWxQYWdl UHJveHkgd2hpY2ggc3RhcnRlZCB0aGUgcHJvdmlzaW9uYWwgbG9hZC4KKworICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2Vzcyk6CisgICAgICAg IFdlIG5vIGxvbmdlciBuZWVkIElzU3dhcEZyb21TdXNwZW5kZWQgcGFyYW1ldGVyIGFzIHRoaXMg aXMgY2FsbGVkIGxhdGVyIG5vdywgYWZ0ZXIgYSBsb2FkIGhhcyBhY3R1YWxseSBiZWVuCisgICAg ICAgIGNvbW1pdHRlZCBpbiB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vzcy4KKworICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKToKKyAgICAgICAgLSBXZSBubyBs b25nZXIgbmVlZCBJc1N3YXBGcm9tU3VzcGVuZGVkIHBhcmFtZXRlciBhcyB0aGlzIGlzIGNhbGxl ZCBsYXRlciBub3csIGFmdGVyIGEgbG9hZCBoYXMgYWN0dWFsbHkgYmVlbgorICAgICAgICAgIGNv bW1pdHRlZCBpbiB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vzcy4KKyAgICAgICAgLSBGYWN0b3Igc29t ZSBjb2RlIG91dCB0byBXZWJQYWdlUHJveHk6OnNldERyYXdpbmdBcmVhKCkgc28gdGhhdCBpdCBj YW4gYmUgc2hhcmVkIHdpdGggc3dhcFRvV2ViUHJvY2VzcygpLgorCisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbik6CisgICAgICAgIE9ubHkg Y2FsbCBzZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCgpIGluIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRp b24oKSBvbmx5IGlmIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCBpcyBub3QKKyAgICAgICAg WWVzLiBUaGlzIGF2b2lkcyBoaXR0aW5nIHNvbWUgYXNzZXJ0aW9ucyBhcyB0aGlzIHdhcyBhbHJl YWR5IGNhbGxlZCBkdXJpbmcgdGhlIGZpcnN0IEFQSSBjYWxsIGlmIG5lZWRlZC4KKworICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9u KToKKyAgICAgICAgSW4gY2FzZSBvZiBwcm9jZXNzIHN3YXAsIHRlbGwgdGhlIHByZXZpb3VzIHBy b2Nlc3MgdG8gaWdub3JlIHRoZSBsb2FkIGluc3RlYWQgb2Ygc3VzcGVuZGluZyBpdCByaWdodCBh d2F5LgorICAgICAgICBTdXNwZW5zaW9uIG5vdyBoYXBwZW5zIGxhdGVyLCBvbmx5IGlmIHdlIGVu ZCB1cCBjb21taXR0aW5nIHRoZSBwcm92aXNpb25hbCBsb2FkIGluIHRoZSBuZXcgcHJvY2Vzcy4K KyAgICAgICAgQWxzbyBkaXNjYXJkIHRoZSBTdXNwZW5kZWRQYWdlIGlmIGl0IGZhaWxlZCB0byBz dXNwZW5kICh3ZSBvbmx5IHJldXNlIGl0cyBwcm9jZXNzIGluIHRoaXMgY2FzZSkuIFRoaXMgdXNl ZAorICAgICAgICB0byBoYXBwZW4gYSBiaXQgbGF0ZXIgYnV0IGl0IGlzIGNsZWFyZXIgaWYgd2Ug ZG8gdGhpcyBhcyBlYXJseSBhcyBwb3NzaWJsZSBJIHRoaW5rLgorCisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKToKKyAgICAgICAgV2hlbiB0aGUg bG9hZCBpcyBjb21taXR0ZWQgaW4gdGhlIG5ldyBwcm9jZXNzLCB3ZSBjYWxsIFdlYlBhZ2VQcm94 eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKCkuIEl0IHRha2VzIGNhcmUgb2Y6CisgICAgICAgIC0g QWN0dWFsbHkgc3dhcHBpbmcgdGhlIFdlYlBhZ2VQcm94eSB0byB0aGUgbmV3IHByb2Nlc3MgYnkg Y2FsbGluZyBwcm9jZXNzRGlkVGVybWluYXRlKCkgLyBzd2FwVG9XZWJQcm9jZXNzKCkuCisgICAg ICAgIC0gU3VzcGVuZGluZyB0aGUgY3VycmVudCBwYWdlLgorICAgICAgICAtIExldHRpbmcgdGhl IGNsaWVudCBrbm93IHRoZSBsb2FkIGlzIGNvbWl0dGVkCisgICAgICAgIC0gRGVzdHJveSB0aGUg UHJvdmlzaW9uYWxQYWdlUHJveHkuCisgICAgICAgIFRoaXMgd29yayB1c2VkIHRvIGhhcHBlbiBl YXJsaWVyIGluIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcygpLgorCisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKToKKyAg ICAgICAgTW92ZWQgc29tZSBvZiB0aGUgbG9naWMgdG8gY29tbWl0UHJvdmlzaW9uYWxQYWdlKCku IFdlIG5vdyBtZXJlbHkgc3RhcnQgdGhlIGxvYWQgaW4gYSBuZXcgUHJvdmlzaW9uYWxQYWdlUHJv eHksCisgICAgICAgIHdpdGhvdXQgYWN0dWFsbHkgaGF2aW5nIHRoZSBXZWJQYWdlUHJveHkgc3dp dGNoIHRvIHRoZSBuZXcgcHJvY2VzcyB5ZXQuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OmRpZENyZWF0ZVdpbmRvdyk6CisgICAgICAgIERyb3Agc29tZSBjb2RlIHRoYXQgaXMgbm8gbG9u Z2VyIG5lZWRlZCwgbm93IHRoYXQgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IHRha2VzIGNhcmUg b2YgdGhpcy4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZERlc3Ryb3lOYXZp Z2F0aW9uKToKKyAgICAgICAgT24gcHJvY2Vzcy1zd2FwLCB3aGVuIHRlbGxpbmcgdGhlIHByZXZp b3VzIHByb2Nlc3MgdG8gaWdub3JlIHRoZSBsb2FkIGFuZCBzdGFydGluZyB0aGUgbmV3IGxvYWQg aW4gYSBuZXcKKyAgICAgICAgUHJvdmlzaW9uYWxQYWdlUHJveHksIHRoZSBwcmV2aW91cyBXZWJQ YWdlIGF0dGVtcHRzIHRvIGRlc3Ryb3kgdGhlIG5hdmlnYXRpb24uIEluIHRoaXMgY2FzZSwgd2Ug aWdub3JlCisgICAgICAgIHRoZSBjYWxsIHNpbmNlIHRoZSBuYXZpZ2F0aW9uIGlzIG1lcmVseSB0 YWtlbiBvdmVyIGJ5IHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eS4KKworICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAg ICBNb3ZlZCBzb21lIFBTT04gbG9naWMgdG8gdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGluc3Rl YWQuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxM b2FkRm9yRnJhbWUpOgorICAgICAgICBXaGVuIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFt ZSgpIGlzIGNhbGxlZCBmb3IgYSBQcm92aXNpb25hbFBhZ2VQcm94eSwgZGVzdHJveSBpdC4KKwor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb25Bc3luYyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5 Rm9yUmVzcG9uc2UpOgorICAgICAgICBDYXB0dXJlIHRoZSBwcm9jZXNzIGluIHRoZSBsYW1iZGEs IHRvIG1ha2Ugc3VyZSB3ZSBzZW5kIHRoZSBwb2xpY3kgZGVjaXNpb24gdG8gdGhlIHNhbWUgcHJv Y2VzcyB0aGF0CisgICAgICAgIGFza2VkIGZvciBpdCwgc28gYXMgdG8gbm90IGdldCBjb25mdXNl ZCBieSBwcm9jZXNzIHN3YXBzLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVz ZXRTdGF0ZSk6CisgICAgICAgIERyb3Agc29tZSBjb2RlIHRoYXQgaXMgbm8gbG9uZ2VyIG5lZWRl ZC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycyk6 CisgICAgICAgIE1vdmUgdGhlIGhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyBmbGFnIGluaXRp YWxpemF0aW9uIGZyb20gdGhlIGNhbGwgc2l0ZSB0byBoZXJlIG5vdyB0aGF0IHdlIGhhdmUKKyAg ICAgICAgbW9yZSB0aGFuIG9uZSBjYWxsIHNpdGUuIFRoaXMgd2FzIGp1c3Qgc29tZSBiYWQgZmFj dG9yaW5nLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVy cmlkZTo6UGFnZVByb2Nlc3NPdmVycmlkZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6flBhZ2VQcm9jZXNzT3ZlcnJpZGUpOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 Ojp0ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2Vzcyk6CisgICAgICAgIEFkZCB1dGlsaXR5IGNsYXNz IHRvIHRlbXBvcmFyaWx5IG92ZXJyaWRlIHRoZSBXZWJQYWdlUHJveHkncyBtX3Byb2Nlc3Mgd2l0 aCB0aGUgcHJvdmlzaW9uYWwgb25lIHdoZW4KKyAgICAgICAgdGhlIFByb3Zpc2lvbmFsUGFnZVBy b3h5IGludGVyYWN0cyB3aXRoIHRoZSBXZWJQYWdlUHJveHkuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5 OjpoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ cm9jZXNzUHJveHk6OnVwZGF0ZUJhY2tGb3J3YXJkSXRlbSk6CisgICAgICAgIEJlZm9yZSB1cGRh dGluZyBhIEJhY2tGb3J3YXJkTGlzdEl0ZW0sIHdlIG5vcm1hbGx5IG1ha2Ugc3VyZSB0aGUgcHJv Y2VzcyBoYXMgYSBXZWJQYWdlUHJveHkgd2l0aCB0aGUKKyAgICAgICAgaXRlbSdzIHBhZ2VJRC4g V2UgaGF2ZSB0byB0d2VhayB0aGUgbG9naWMgYmVjYXVzZSB0aGVyZSBtYXkgbm93IGJlIG5vIFdl YlBhZ2VQcm94eSB3aXRoIHRoaXMgcGFnZUlECisgICAgICAgIGFzc29jaWF0ZWQgd2l0aCB0aGlz IHByb2Nlc3MgeWV0LCBiZWNhdXNlIGl0IGlzIHN0aWxsIGEgUHJvdmlzaW9uYWxQYWdlUHJveHku CisKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpjYW5UZXJtaW5hdGVDaGlsZFBy b2Nlc3MpOgorICAgICAgICBEbyBub3QgdGVybWluYXRlIHRoZSBXZWJQcm9jZXNzIGlmIHRoZXJl IGFyZSBQcm92aXNpb25hbFBhZ2VQcm94eSBvYmplY3RzIHVzaW5nIGl0LgorCisgICAgICAgICog VUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNz UHJveHk6OmFkZFByb3Zpc2lvbmFsUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzc1Byb3h5OjpyZW1vdmVQcm92aXNpb25hbFBhZ2VQcm94eSk6CisKKyAgICAgICAgKiBXZWJL aXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKworICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9XZWJGcmFtZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OnRvUG9saWN5QWN0aW9uKToKKyAg ICAgICAgKFdlYktpdDo6V2ViRnJhbWU6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbik6CisgICAg ICAgIFN0b3AgZGVhbGluZyB3aXRoIFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZCBhcyBpdCBubyBs b25nZXIgZXhpc3RzLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpyZWluaXRpYWxpemVXZWJQYWdlKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKToKKworICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRJc1N1c3BlbmRlZCk6CisgICAgICAgIFN1c3BlbmQgdGhl IFBhZ2Ugd2hlbiBzZXRJc1N1c3BlbmRlZCh0cnVlKSBpcyBjYWxsZWQsIG5vdyB0aGF0IHRoZXJl IGlzIG5vIGxvbmdlciBhIFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZC4KKyAgICAgICAgc2V0SXNT dXNwZW5kZWQodHJ1ZSkgSVBDIGlzIHNlbnQgd2hlbiB3ZSBhY3R1YWxseSBjb21taXQgdGhlIHBy b3Zpc2lvbmFsIHBhZ2UuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tOgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVB bmltYXRpb25EcmF3aW5nQXJlYTo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEpOgorCiAy MDE5LTAxLTE0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgU3BsaXQgaGVhZGVyVmFsdWVGb3JWYXJ5IGludG8gc3BlY2lhbGl6ZWQgZnVuY3Rp b25zIGZvciBOZXR3b3JrUHJvY2VzcyBhbmQgV2ViUHJvY2Vzcy9XZWJLaXRMZWdhY3kKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDRjMjZhNjk4MWI0NjRkYTU5MTZmMDVl YjczNTk2NjkxNTdlZTlmZmUuLmViZjk1MGJhNmMyZWQ5MWY2MjMyYmQyYjVlZmI5Zjc5NTU3YWI1 OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMjAzMiwxMSArMjAz MiwxMSBAQCB2b2lkIEZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQoKQogCiAgICAg ICAgIE9wdGlvbmFsPEhhc0luc2VjdXJlQ29udGVudD4gaGFzSW5zZWN1cmVDb250ZW50ID0gY2Fj aGVkUGFnZS0+Y2FjaGVkTWFpbkZyYW1lKCktPmhhc0luc2VjdXJlQ29udGVudCgpOwogCisgICAg ICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOworCiAgICAgICAg IC8vIEZJWE1FOiBUaGlzIEFQSSBzaG91bGQgYmUgdHVybmVkIGFyb3VuZCBzbyB0aGF0IHdlIGdy b3VuZCBDYWNoZWRQYWdlIGludG8gdGhlIFBhZ2UuCiAgICAgICAgIGNhY2hlZFBhZ2UtPnJlc3Rv cmUoKm1fZnJhbWUucGFnZSgpKTsKIAotICAgICAgICBkaXNwYXRjaERpZENvbW1pdExvYWQoaGFz SW5zZWN1cmVDb250ZW50KTsKLQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgICAgIG1f ZnJhbWUucGFnZSgpLT5jaHJvbWUoKS5zZXREaXNwYXRjaFZpZXdwb3J0RGF0YURpZENoYW5nZVN1 cHByZXNzZWQoZmFsc2UpOwogICAgICAgICBtX2ZyYW1lLnBhZ2UoKS0+Y2hyb21lKCkuZGlzcGF0 Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UobV9mcmFtZS5wYWdlKCktPnZpZXdwb3J0QXJn dW1lbnRzKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzLmNwcAppbmRleCBjYTJkZjQwZWUxZGQyY2EzNmYzYTQ4YTA0NzU3Zjk3YmRiYjYz NjQ3Li42ZDA3YzAzYWQ4YzkyN2U1NDUzYzVmZGE5NTk2NzA5YTc3MjYxZTJiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcApAQCAt NzMsNyArNzMsNyBAQCB2b2lkIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZShJUEM6 OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2Rlci5lbmNvZGVFbnVtKGxheWVySG9z dGluZ01vZGUpOwogICAgIGVuY29kZXIgPDwgbWltZVR5cGVzV2l0aEN1c3RvbUNvbnRlbnRQcm92 aWRlcnM7CiAgICAgZW5jb2RlciA8PCBjb250cm9sbGVkQnlBdXRvbWF0aW9uOwotICAgIGVuY29k ZXIgPDwgaXNTd2FwRnJvbVN1c3BlbmRlZDsKKyAgICBlbmNvZGVyIDw8IGlzUHJvY2Vzc1N3YXA7 CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgZW5jb2RlciA8PCBjb2xvclNwYWNlOwpAQCAtMjI3 LDcgKzIyNyw3IEBAIE9wdGlvbmFsPFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM+IFdlYlBhZ2VD cmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkRlY29kCiAgICAgICAgIHJldHVybiBXVEY6 Om51bGxvcHQ7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmNvbnRyb2xsZWRC eUF1dG9tYXRpb24pKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotICAgIGlmICghZGVj b2Rlci5kZWNvZGUocGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKSkKKyAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkpCiAgICAgICAgIHJldHVybiBX VEY6Om51bGxvcHQ7CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmggYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgKaW5kZXggYWU0MzI1Y2JkNWYxZTU2NzYx NjU4NmY1ZTlmYTczZWU1YjM1YjkzNy4uYjM4MmNlZWRkNDQ5YThkOWEwZjg2OTQ3MzVmMjZjMDU5 NWRkZWNkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBh cmFtZXRlcnMuaApAQCAtMTI5LDcgKzEyOSw3IEBAIHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJh bWV0ZXJzIHsKICAgICBWZWN0b3I8U3RyaW5nPiBtaW1lVHlwZXNXaXRoQ3VzdG9tQ29udGVudFBy b3ZpZGVyczsKIAogICAgIGJvb2wgY29udHJvbGxlZEJ5QXV0b21hdGlvbjsKLSAgICBib29sIGlz U3dhcEZyb21TdXNwZW5kZWQgeyBmYWxzZSB9OworICAgIGJvb2wgaXNQcm9jZXNzU3dhcCB7IGZh bHNlIH07CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgQ29sb3JTcGFjZURhdGEgY29sb3JTcGFj ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oIGIv U291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKaW5kZXggMTQyYTUxOGRmMDk3 ZTVlZjJmYTE4MDQ4NGUwOWQwMzMzYzEwNWI4MS4uMzk3MTc5NWM0NmE1MWIzODgxOGM1NWI3NmQ2 NTNhMzRiNTI4OWU5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5 QWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKQEAg LTI5LDExICsyOSwxMSBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorLy8gRklYTUU6IFJlbW92 ZSB0aGlzIHR5cGUgYW5kIHVzZSBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gaW5zdGVhZC4KIGVudW0g Y2xhc3MgV2ViUG9saWN5QWN0aW9uIDogdWludDhfdCB7CiAgICAgVXNlLAogICAgIERvd25sb2Fk LAotICAgIElnbm9yZSwKLSAgICBTdXNwZW5kCisgICAgSWdub3JlCiB9OwogCiB9CkBAIC00NSw4 ICs0NSw3IEBAIHRlbXBsYXRlPD4gc3RydWN0IEVudW1UcmFpdHM8V2ViS2l0OjpXZWJQb2xpY3lB Y3Rpb24+IHsKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb24sCiAgICAgICAgIFdlYktp dDo6V2ViUG9saWN5QWN0aW9uOjpVc2UsCiAgICAgICAgIFdlYktpdDo6V2ViUG9saWN5QWN0aW9u OjpEb3dubG9hZCwKLSAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246Oklnbm9yZSwKLSAg ICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQKKyAgICAgICAgV2ViS2l0OjpX ZWJQb2xpY3lBY3Rpb246Oklnbm9yZQogICAgID47CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1NvdXJjZXMudHh0IGIvU291cmNlL1dlYktpdC9Tb3VyY2VzLnR4dAppbmRleCBhMGI2 ZjcyODQ2MDQxYzI2M2E1NDc2NzEwZWFjOTg3ZmVkMWQxNjA0Li44YWVjYjg2NDcyNTAyZDAyN2Ez NGFmMzcxOWRkODI4YjAwN2RiMTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMu dHh0CisrKyBiL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQKQEAgLTIzMCw2ICsyMzAsNyBAQCBV SVByb2Nlc3MvSW5zcGVjdG9yVGFyZ2V0UHJveHkuY3BwCiBVSVByb2Nlc3MvUGFnZUxvYWRTdGF0 ZS5jcHAKIFVJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcAogVUlQcm9jZXNzL1Byb2Nlc3NU aHJvdHRsZXIuY3BwCitVSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCiBVSVByb2Nl c3MvUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkuY3BwCiBVSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NU aW1lci5jcHAKIFVJUHJvY2Vzcy9TZXJ2aWNlV29ya2VyUHJvY2Vzc1Byb3h5LmNwcApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMDc0Y2Rk ZmQyNzg0ZTg2OTEyOGQwMjBiZWQ1OTIxM2ExY2JkZGU2OC4uNGRmYWQ2NGUwMTU0MzU5MjgwZTYx NjhiMWYxZWQ1ZWJlNmQ3ZDliYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJWaWV3Lm1tCkBAIC00NCw2ICs0NCw3IEBACiAjaW1wb3J0ICJOYXZpZ2F0aW9u U3RhdGUuaCIKICNpbXBvcnQgIk9iakNPYmplY3RHcmFwaC5oIgogI2ltcG9ydCAiUGFnZUNsaWVu dC5oIgorI2ltcG9ydCAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbXBvcnQgIlJlbW90ZUxh eWVyVHJlZVNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YS5oIgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJU cmVlVHJhbnNhY3Rpb24uaCIKICNpbXBvcnQgIlJlbW90ZU9iamVjdFJlZ2lzdHJ5LmgiCkBAIC00 NzAwLDYgKzQ3MDEsMTEgQEAgLSAodm9pZClfa2lsbFdlYkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRT dGF0ZQogewogICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nlc3NQcm94eT4gcHJvdGVjdGVkUHJvY2Vz c1Byb3h5KF9wYWdlLT5wcm9jZXNzKCkpOwogICAgIHByb3RlY3RlZFByb2Nlc3NQcm94eS0+cmVx dWVzdFRlcm1pbmF0aW9uKFdlYktpdDo6UHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpSZXF1ZXN0 ZWRCeUNsaWVudCk7CisKKyAgICBpZiAoYXV0byogcHJvdmlzaW9uYWxQYWdlUHJveHkgPSBfcGFn ZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKSkgeworICAgICAgICBSZWY8V2ViS2l0OjpXZWJQcm9j ZXNzUHJveHk+IHByb3RlY3RlZFByb2Nlc3NQcm94eShwcm92aXNpb25hbFBhZ2VQcm94eS0+cHJv Y2VzcygpKTsKKyAgICAgICAgcHJvdGVjdGVkUHJvY2Vzc1Byb3h5LT5yZXF1ZXN0VGVybWluYXRp b24oV2ViS2l0OjpQcm9jZXNzVGVybWluYXRpb25SZWFzb246OlJlcXVlc3RlZEJ5Q2xpZW50KTsK KyAgICB9CiB9CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xp ZW50LmgKaW5kZXggMTQ5NzE0YWIxZDIyNjVhNjgzNGQ1N2VmNDdiMTE2ZWE0ZTI5ZTM1MS4uODJj NzczMjJmMmRmODdlM2FlZDVlMDA0YzYxYjJmNzkzOTUwZTM4OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1BhZ2VDbGllbnQuaApAQCAtNDgsNiArNDgsNyBAQAogCiBPQkpDX0NMQVNTIENBTGF5ZXI7 CiBPQkpDX0NMQVNTIE5TRmlsZVdyYXBwZXI7CitPQkpDX0NMQVNTIE5TTWVudTsKIE9CSkNfQ0xB U1MgTlNTZXQ7CiBPQkpDX0NMQVNTIFdLRHJhd2luZ1ZpZXc7CiBPQkpDX0NMQVNTIF9XS1JlbW90 ZU9iamVjdFJlZ2lzdHJ5OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJv dmlzaW9uYWxQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9u YWxQYWdlUHJveHkuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdhNzc1NTE4NWU2MTc3OGU4ZWI1NTJhMDAzYTgy ZDQ5NGI4M2EzMGUKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Q cm92aXNpb25hbFBhZ2VQcm94eS5jcHAKQEAgLTAsMCArMSwzMDUgQEAKKy8qCisgKiBDb3B5cmln aHQgKEMpIDIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZv bGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9m IHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4K KyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUg YWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFu ZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoK KyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRS SUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJ RVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFO VElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICog UFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJ VFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJ TkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFH RVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VC U1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7 IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkg VEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFC SUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFS SVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisj aW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKKwor I2luY2x1ZGUgIkFQSU5hdmlnYXRpb24uaCIKKyNpbmNsdWRlICJEcmF3aW5nQXJlYVByb3h5Lmgi CisjaW5jbHVkZSAiTG9nZ2luZy5oIgorI2luY2x1ZGUgIlBhZ2VDbGllbnQuaCIKKyNpbmNsdWRl ICJXZWJCYWNrRm9yd2FyZExpc3QuaCIKKyNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3RJdGVt LmgiCisjaW5jbHVkZSAiV2ViRXJyb3JzLmgiCisjaW5jbHVkZSAiV2ViTmF2aWdhdGlvblN0YXRl LmgiCisjaW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2VzLmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5 LmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5TWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQcm9j ZXNzTWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNzUHJveHkuaCIKKyNpbmNsdWRlIDxX ZWJDb3JlL1Nob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZC5oPgorCituYW1lc3BhY2UgV2ViS2l0 IHsKKworI2RlZmluZSBSRUxFQVNFX0xPR19JRl9BTExPV0VEKGNoYW5uZWwsIGZtdCwgLi4uKSBS RUxFQVNFX0xPR19JRihtX3BhZ2UuaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCksIGNoYW5uZWws ICIlcCAtIFByb3Zpc2lvbmFsUGFnZVByb3h5OjoiIGZtdCwgdGhpcywgIyNfX1ZBX0FSR1NfXykK KworUHJvdmlzaW9uYWxQYWdlUHJveHk6OlByb3Zpc2lvbmFsUGFnZVByb3h5KFdlYlBhZ2VQcm94 eSYgcGFnZSwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVuaXF1ZV9wdHI8 U3VzcGVuZGVkUGFnZVByb3h5PiBzdXNwZW5kZWRQYWdlLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQs IGJvb2wgaXNTZXJ2ZXJSZWRpcmVjdCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBy ZXF1ZXN0LCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVk QnlDbGllbnQpCisgICAgOiBtX3BhZ2UocGFnZSkKKyAgICAsIG1fcHJvY2VzcyhXVEZNb3ZlKHBy b2Nlc3MpKQorICAgICwgbV9uYXZpZ2F0aW9uSUQobmF2aWdhdGlvbklEKQorICAgICwgbV9pc1Nl cnZlclJlZGlyZWN0KGlzU2VydmVyUmVkaXJlY3QpCisgICAgLCBtX3JlcXVlc3QocmVxdWVzdCkK KyAgICAsIG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudChwcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50KQorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgLCBtX3N1c3BlbnNpb25U b2tlbihtX3Byb2Nlc3MtPnRocm90dGxlcigpLmZvcmVncm91bmRBY3Rpdml0eVRva2VuKCkpCisj ZW5kaWYKK3sKKyAgICBtX3Byb2Nlc3MtPmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSwgKnRoaXMp OworICAgIG1fcHJvY2Vzcy0+YWRkUHJvdmlzaW9uYWxQYWdlUHJveHkoKnRoaXMpOworCisgICAg Ly8gSWYgd2UgYXJlIHJlYXR0YWNoaW5nIHRvIGEgU3VzcGVuZGVkUGFnZSwgdGhlbiB0aGUgV2Vi UHJvY2VzcycgV2ViUGFnZSBhbHJlYWR5IGV4aXN0cyBhbmQKKyAgICAvLyBXZWJQYWdlUHJveHk6 OmRpZENyZWF0ZU1haW5GcmFtZSgpIHdpbGwgbm90IGJlIGNhbGxlZCB0byBpbml0aWFsaXplIG1f bWFpbkZyYW1lLiBJbiBzdWNoCisgICAgLy8gY2FzZSwgd2UgbmVlZCB0byBpbml0aWFsaXplIG1f bWFpbkZyYW1lIHRvIHJlZmxlY3QgdGhlIGZhY3QgdGhlIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdl CisgICAgLy8gYWxyZWFkeSBleGlzdHMgYW5kIGFscmVhZHkgaGFzIGEgbWFpbiBmcmFtZS4KKyAg ICBpZiAoc3VzcGVuZGVkUGFnZSkgeworICAgICAgICBBU1NFUlQoJnN1c3BlbmRlZFBhZ2UtPnBy b2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpOworICAgICAgICBzdXNwZW5kZWRQYWdlLT51bnN1 c3BlbmQoKTsKKyAgICAgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5OjpjcmVhdGUobV9w YWdlLCBzdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpKTsKKyAgICAgICAgbV9wcm9jZXNzLT5m cmFtZUNyZWF0ZWQoc3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSwgKm1fbWFpbkZyYW1lKTsK KyAgICB9CisKKyAgICBpbml0aWFsaXplV2ViUGFnZSgpOworfQorCitQcm92aXNpb25hbFBhZ2VQ cm94eTo6flByb3Zpc2lvbmFsUGFnZVByb3h5KCkKK3sKKyAgICBtX3Byb2Nlc3MtPnJlbW92ZVBy b3Zpc2lvbmFsUGFnZVByb3h5KCp0aGlzKTsKKworICAgIGlmIChtX3dhc0NvbW1pdHRlZCkKKyAg ICAgICAgcmV0dXJuOworCisgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVz c2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlE KCkpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9w YWdlLnBhZ2VJRCgpKTsKKworICAgIGlmIChtX2RyYXdpbmdBcmVhKSB7CisgICAgICAgIGF1dG8g cGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2Vzcyht X3Byb2Nlc3MpOworICAgICAgICBtX2RyYXdpbmdBcmVhID0gbnVsbHB0cjsKKyAgICB9CisKKyAg ICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3Byb2Nlc3MgPSBtX3Byb2Nlc3MuY29weVJlZigp XSB7CisgICAgICAgIHByb2Nlc3MtPm1heWJlU2h1dERvd24oKTsKKyAgICB9KTsKK30KKworc3Rk Ojp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IFByb3Zpc2lvbmFsUGFnZVByb3h5Ojp0YWtl RHJhd2luZ0FyZWEoKQoreworICAgIHJldHVybiBXVEZNb3ZlKG1fZHJhd2luZ0FyZWEpOworfQor Cit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpjYW5jZWwoKQoreworICAgIC8vIElmIHRoZSBw cm92aXNpb25hbCBsb2FkIHN0YXJ0ZWQsIHRoZW4gaW5kaWNhdGUgdGhhdCBpdCBmYWlsZWQgZHVl IHRvIGNhbmNlbGxhdGlvbiBieSBjYWxsaW5nIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFt ZSgpLgorICAgIGlmIChtX3Byb3Zpc2lvbmFsTG9hZFVSTC5pc0VtcHR5KCkpCisgICAgICAgIHJl dHVybjsKKworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiY2Fu Y2VsOiBTaW11bGF0aW5nIGEgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lIGZvciBwYWdl SUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgQVNTRVJUKG1fbWFpbkZyYW1l KTsKKyAgICBhdXRvIGVycm9yID0gV2ViS2l0OjpjYW5jZWxsZWRFcnJvcihtX3JlcXVlc3QpOwor ICAgIGVycm9yLnNldFR5cGUoV2ViQ29yZTo6UmVzb3VyY2VFcnJvcjo6VHlwZTo6Q2FuY2VsbGF0 aW9uKTsKKyAgICBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUobV9tYWluRnJhbWUtPmZy YW1lSUQoKSwgeyB9LCBtX25hdmlnYXRpb25JRCwgbV9wcm92aXNpb25hbExvYWRVUkwsIGVycm9y LCBVc2VyRGF0YSB7IH0pOyAvLyBXaWxsIGRlbGV0ZSB8dGhpc3wuCit9CisKK3ZvaWQgUHJvdmlz aW9uYWxQYWdlUHJveHk6OnByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmcoKQoreworICAgIGZpbmlz aEluaXRpYWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2goKTsKK30KKwordm9pZCBQcm92 aXNpb25hbFBhZ2VQcm94eTo6ZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xh dW5jaCgpCit7CisgICAgQVNTRVJUKG1fcHJvY2Vzcy0+c3RhdGUoKSA9PSBXZWJQcm9jZXNzUHJv eHk6OlN0YXRlOjpSdW5uaW5nKTsKKworICAgIC8vIEZJWE1FOiBUaGUgV2ViUGFnZVByb3h5IGRl bGF5cyBhZGRpbmcgdGhlIHZpc2l0ZWQgbGluayBzdG9yZSB1bnRpbCBhZnRlciB0aGUgcHJvY2Vz cyBoYXMgbGF1bmNoZWQKKyAgICAvLyBzbyB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkgZG9lcyB0 aGUgc2FtZS4gSG93ZXZlciwgZG8gd2UgcmVhbGx5IG5lZWQgdG8/CisgICAgbV9wcm9jZXNzLT5h ZGRWaXNpdGVkTGlua1N0b3JlKG1fcGFnZS52aXNpdGVkTGlua1N0b3JlKCkpOworfQorCit2b2lk IFByb3Zpc2lvbmFsUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSgpCit7CisgICAgYXV0byBw YWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1f cHJvY2Vzcyk7CisgICAgbV9kcmF3aW5nQXJlYSA9IG1fcGFnZS5wYWdlQ2xpZW50KCkuY3JlYXRl RHJhd2luZ0FyZWFQcm94eSgpOworCisgICAgYXV0byBwYXJhbWV0ZXJzID0gbV9wYWdlLmNyZWF0 aW9uUGFyYW1ldGVycygpOworICAgIHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCA9IHRydWU7Cisg ICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpDcmVhdGVXZWJQYWdlKG1f cGFnZS5wYWdlSUQoKSwgcGFyYW1ldGVycyksIDApOworCisgICAgaWYgKG1fcHJvY2Vzcy0+c3Rh dGUoKSA9PSBXZWJQcm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKQorICAgICAgICBmaW5pc2hJ bml0aWFsaXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNoKCk7Cit9CisKK3ZvaWQgUHJvdmlz aW9uYWxQYWdlUHJveHk6OmxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBu YXZpZ2F0aW9uLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEsIGNvbnN0IFN0cmluZyYg TUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwg QVBJOjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdl YnNpdGVQb2xpY2llcykKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2Uu dGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBtX3BhZ2UubG9hZERh dGFXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCBkYXRhLCBNSU1FVHlwZSwgZW5jb2RpbmcsIGJh c2VVUkwsIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6Olll cywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQ cm94eTo6bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRp b24sIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFdlYkNvcmU6OlNob3VsZE9w ZW5FeHRlcm5hbFVSTHNQb2xpY3kgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgQVBJOjpP YmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQ b2xpY2llcykKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9y YXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBtX3BhZ2UubG9hZFJlcXVlc3RX aXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCBXVEZNb3ZlKHJlcXVlc3QpLCBzaG91bGRPcGVuRXh0 ZXJuYWxVUkxzUG9saWN5LCB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVp bmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Cit9CisKK3ZvaWQgUHJvdmlz aW9uYWxQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0oQVBJOjpOYXZpZ2F0aW9uJiBuYXZp Z2F0aW9uLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtJiBpdGVtLCBPcHRpb25hbDxXZWJzaXRlUG9s aWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBhdXRvIGl0ZW1TdGF0ZXMgPSBt X3BhZ2UuYmFja0ZvcndhcmRMaXN0KCkuZmlsdGVyZWRJdGVtU3RhdGVzKFt0aGlzLCB0YXJnZXRJ dGVtID0gJml0ZW1dKGF1dG8mIGl0ZW0pIHsKKyAgICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBpdGVt LnN1c3BlbmRlZFBhZ2UoKSkgeworICAgICAgICAgICAgaWYgKCZwYWdlLT5wcm9jZXNzKCkgPT0g bV9wcm9jZXNzLnB0cigpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAg fQorICAgICAgICByZXR1cm4gJml0ZW0gIT0gdGFyZ2V0SXRlbTsKKyAgICB9KTsKKyAgICBtX3By b2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlVwZGF0ZUJhY2tGb3J3YXJkTGlzdEZvclJl YXR0YWNoKFdURk1vdmUoaXRlbVN0YXRlcykpLCBtX3BhZ2UucGFnZUlEKCkpOworICAgIG1fcHJv Y2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0 aW9uLm5hdmlnYXRpb25JRCgpLCBpdGVtLml0ZW1JRCgpLCAqbmF2aWdhdGlvbi5iYWNrRm9yd2Fy ZEZyYW1lTG9hZFR5cGUoKSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZ ZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSksIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgbV9w cm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKK30KKwordm9pZCBQcm92aXNp b25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCit7Cisg ICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJkaWRDcmVhdGVNYWlu RnJhbWU6IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0LCBtX3BhZ2Uu cGFnZUlEKCksIGZyYW1lSUQpOworICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOworCisgICAgbV9t YWluRnJhbWUgPSBXZWJGcmFtZVByb3h5OjpjcmVhdGUobV9wYWdlLCBmcmFtZUlEKTsKKworICAg IC8vIEFkZCB0aGUgZnJhbWUgdG8gdGhlIHByb2Nlc3Mgd2lkZSBtYXAuCisgICAgbV9wcm9jZXNz LT5mcmFtZUNyZWF0ZWQoZnJhbWVJRCwgKm1fbWFpbkZyYW1lKTsKKworICAgIC8vIFRoaXMgbmF2 aWdhdGlvbiB3YXMgZGVzdHJveWVkIHNvIG5vIG5lZWQgdG8gbm90aWZ5IG9mIHJlZGlyZWN0Lgor ICAgIGlmICghbV9wYWdlLm5hdmlnYXRpb25TdGF0ZSgpLmhhc05hdmlnYXRpb24obV9uYXZpZ2F0 aW9uSUQpKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBSZXN0b3JlIHRoZSBtYWluIGZyYW1l J3MgY29tbWl0dGVkIFVSTCBhcyBzb21lIGNsaWVudHMgbWF5IHJlbHkgb24gaXQgdW50aWwgdGhl IG5leHQgbG9hZCBpcyBjb21taXR0ZWQuCisgICAgaWYgKGF1dG8qIG1haW5GcmFtZSA9IG1fcGFn ZS5tYWluRnJhbWUoKSkKKyAgICAgICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkuc2V0 VVJMKG1haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS51cmwoKSk7CisKKyAgICAvLyBOb3JtYWxs eSwgbm90aWZpY2F0aW9uIG9mIGEgc2VydmVyIHJlZGlyZWN0IGNvbWVzIGZyb20gdGhlIFdlYkNv bnRlbnQgcHJvY2Vzcy4KKyAgICAvLyBJZiB3ZSBhcmUgcHJvY2VzcyBzd2FwcGluZyBpbiByZXNw b25zZSB0byBhIHNlcnZlciByZWRpcmVjdCB0aGVuIHRoYXQgbm90aWZpY2F0aW9uIHdpbGwgbm90 IGNvbWUgZnJvbSB0aGUgbmV3IFdlYkNvbnRlbnQgcHJvY2Vzcy4KKyAgICAvLyBJbiB0aGlzIGNh c2Ugd2UgaGF2ZSB0aGUgVUlQcm9jZXNzIHN5bnRoZXNpemUgdGhlIHJlZGlyZWN0IG5vdGlmaWNh dGlvbiBhdCB0aGUgYXBwcm9wcmlhdGUgdGltZS4KKyAgICBpZiAobV9pc1NlcnZlclJlZGlyZWN0 KSB7CisgICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLmRpZFN0YXJ0UHJvdmlz aW9uYWxMb2FkKG1fcmVxdWVzdC51cmwoKSk7CisKKyAgICAgICAgYXV0byBwYWdlUHJvY2Vzc092 ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7Cisg ICAgICAgIG1fcGFnZS5kaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRG b3JGcmFtZShtX21haW5GcmFtZS0+ZnJhbWVJRCgpLCBtX25hdmlnYXRpb25JRCwgV1RGTW92ZSht X3JlcXVlc3QpLCB7IH0pOworICAgIH0KK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6 ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRf dCBuYXZpZ2F0aW9uSUQsIFVSTCYmIHVybCwgVVJMJiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0IFVz ZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICAvLyBJZiB0aGUgcHJldmlvdXMgcHJvdmlzaW9uYWwg bG9hZCB1c2VkIHRoZSBzYW1lIHByb2Nlc3MsIHdlIG1heSByZWNlaXZlIElQQyBmb3IgdGhpcyBw cmV2aW91cyBwcm92aXNpb25hbCdzIG1haW4gZnJhbWUgdGhhdCB3ZSBuZWVkIHRvIGlnbm9yZS4K KyAgICBpZiAoIW1fbWFpbkZyYW1lIHx8IG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkgIT0gZnJhbWVJ RCkKKyAgICAgICAgcmV0dXJuOworCisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNz U3dhcHBpbmcsICJkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOiBwYWdlSUQgPSAlIiBQ Ukl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgPSAlIiBQUkl1NjQs IG1fcGFnZS5wYWdlSUQoKSwgZnJhbWVJRCwgbmF2aWdhdGlvbklEKTsKKyAgICBBU1NFUlQobV9w cm92aXNpb25hbExvYWRVUkwuaXNOdWxsKCkpOworICAgIG1fcHJvdmlzaW9uYWxMb2FkVVJMID0g dXJsOworCisgICAgLy8gTWVyZWx5IGZvbGxvd2luZyBhIHNlcnZlciBzaWRlIHJlZGlyZWN0IHNv IHRoZXJlIGlzIG5vIG5lZWQgdG8gc2VuZCBhIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkIGFnYWlu LgorICAgIGlmIChtX2lzU2VydmVyUmVkaXJlY3QpCisgICAgICAgIHJldHVybjsKKworICAgIC8v IENsaWVudHMgZXhwZWN0IHRoZSBQYWdlJ3MgbWFpbiBmcmFtZSdzIGV4cGVjdGVkVVJMIHRvIGJl IHRoZSBwcm92aXNpb25hbCBvbmUgd2hlbiBhIHByb3Zpc2lvbmFsIGxvYWQgaXMgc3RhcnRlZC4K KyAgICBpZiAoYXV0byogcGFnZU1haW5GcmFtZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAg ICAgcGFnZU1haW5GcmFtZS0+ZGlkU3RhcnRQcm92aXNpb25hbExvYWQodXJsKTsKKworICAgIGF1 dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2Vz cyhtX3Byb2Nlc3MpOworICAgIG1fcGFnZS5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1l KGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgV1RGTW92ZSh1cmwpLCBXVEZNb3ZlKHVucmVhY2hhYmxl VVJMKSwgdXNlckRhdGEpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRGYWls UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6 U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0 aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNvcmU6OlJlc291 cmNlRXJyb3ImIGVycm9yLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCit7CisgICAgYXV0byBw YWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1f cHJvY2Vzcyk7CisKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywg ImRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZTogcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZy YW1lSUQgPSAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFn ZUlEKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCk7CisgICAgbV9wcm92aXNpb25hbExvYWRVUkwg PSB7IH07CisKKyAgICAvLyBNYWtlIHN1cmUgdGhlIFBhZ2UncyBtYWluIGZyYW1lJ3MgZXhwZWN0 ZWRVUkwgZ2V0cyBjbGVhcmVkIHNpbmNlIHdlIHVwZGF0ZWQgaXQgaW4gZGlkU3RhcnRQcm92aXNp b25hbExvYWQuCisgICAgaWYgKGF1dG8qIHBhZ2VNYWluRnJhbWUgPSBtX3BhZ2UubWFpbkZyYW1l KCkpCisgICAgICAgIHBhZ2VNYWluRnJhbWUtPmRpZEZhaWxQcm92aXNpb25hbExvYWQoKTsKKwor ICAgIG1fcGFnZS5kaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoZnJhbWVJRCwgZnJhbWVT ZWN1cml0eU9yaWdpbiwgbmF2aWdhdGlvbklELCBwcm92aXNpb25hbFVSTCwgZXJyb3IsIHVzZXJE YXRhKTsgLy8gV2lsbCBkZWxldGUgfHRoaXN8LgorfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVBy b3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2 aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29u dGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0 aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5mbywgYm9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50 LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJl Q29udGVudCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAgIC8vIElmIHRoZSBwcmV2 aW91cyBwcm92aXNpb25hbCBsb2FkIHVzZWQgdGhlIHNhbWUgcHJvY2Vzcywgd2UgbWF5IHJlY2Vp dmUgSVBDIGZvciB0aGlzIHByZXZpb3VzIHByb3Zpc2lvbmFsJ3MgbWFpbiBmcmFtZSB0aGF0IHdl IG5lZWQgdG8gaWdub3JlLgorICAgIGlmICghbV9tYWluRnJhbWUgfHwgbV9tYWluRnJhbWUtPmZy YW1lSUQoKSAhPSBmcmFtZUlEKQorICAgICAgICByZXR1cm47CisKKyAgICBSRUxFQVNFX0xPR19J Rl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZENvbW1pdExvYWRGb3JGcmFtZTogcGFnZUlE ID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEID0gJSIg UFJJdTY0LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCk7CisgICAgbV9w cm92aXNpb25hbExvYWRVUkwgPSB7IH07CisgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVj ZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3Bh Z2UucGFnZUlEKCkpOworCisgICAgbV93YXNDb21taXR0ZWQgPSB0cnVlOworICAgIG1fcGFnZS5j b21taXRQcm92aXNpb25hbFBhZ2UoZnJhbWVJRCwgbmF2aWdhdGlvbklELCBtaW1lVHlwZSwgZnJh bWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIGZyYW1lTG9hZFR5cGUsIGNlcnRpZmljYXRlSW5m bywgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCB1c2Vy RGF0YSk7IC8vIFdpbGwgZGVsZXRlIHx0aGlzfC4KK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQ cm94eTo6ZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBJUEM6 OkRlY29kZXImIGRlY29kZXIpCit7CisgICAgQVNTRVJUKGRlY29kZXIubWVzc2FnZVJlY2VpdmVy TmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSk7 CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6OkRpZFN0YXJ0UHJvZ3Jlc3M6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VO YW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ2hhbmdlUHJvZ3Jlc3M6Om5hbWUo KQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQ cm94eTo6QmFja0ZvcndhcmRBZGRJdGVtOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNz YWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkxvZ0RpYWdub3N0aWNNZXNzYWdl OjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OkxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aEVuaGFuY2VkUHJpdmFjeTo6bmFt ZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjpTZXROZXR3b3JrUmVxdWVzdHNJblByb2dyZXNzOjpuYW1lKCkKKyNpZiBQTEFURk9S TShDT0NPQSkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OlJlZ2lzdGVyV2ViUHJvY2Vzc0FjY2Vzc2liaWxpdHlUb2tlbjo6bmFtZSgp CisjZW5kaWYKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OkRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYzo6bmFtZSgp CisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpTdGFydFVSTFNjaGVtZVRhc2s6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3Nh Z2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGVjaWRlUG9saWN5Rm9yUmVzcG9u c2U6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6RGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0OjpuYW1lKCkKKyAgICAgICAg fHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENo YW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWU6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1l c3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkTmF2aWdhdGVXaXRoTmF2 aWdhdGlvbkRhdGE6Om5hbWUoKSkKKyAgICB7CisgICAgICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVy cmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAg ICAgICBtX3BhZ2UuZGlkUmVjZWl2ZU1lc3NhZ2UoY29ubmVjdGlvbiwgZGVjb2Rlcik7CisgICAg ICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENyZWF0ZU1haW5GcmFtZTo6bmFtZSgpKSB7CisgICAg ICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDcmVhdGVN YWluRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRl TWFpbkZyYW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1l c3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU3RhcnRQcm92aXNpb25h bExvYWRGb3JGcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lPihkZWNv ZGVyLCB0aGlzLCAmUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2Fk Rm9yRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIubWVz c2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRGYWlsUHJvdmlzaW9uYWxM b2FkRm9yRnJhbWU6Om5hbWUoKSkgeworICAgICAgICBJUEM6OmhhbmRsZU1lc3NhZ2U8TWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6RGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lPihkZWNvZGVy LCB0aGlzLCAmUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JG cmFtZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdl TmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENvbW1pdExvYWRGb3JGcmFtZTo6 bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpEaWRDb21taXRMb2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBh Z2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KworICAgIExPRyhQcm9jZXNzU3dhcHBpbmcsICJVbmhhbmRsZWQgbWVzc2FnZSAlczo6JXMgZnJv bSBwcm92aXNpb25hbCBwcm9jZXNzIiwgZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkudG9T dHJpbmcoKS5kYXRhKCksIGRlY29kZXIubWVzc2FnZU5hbWUoKS50b1N0cmluZygpLmRhdGEoKSk7 Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVTeW5jTWVzc2FnZShJ UEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIElQQzo6RGVjb2RlciYgZGVjb2Rlciwgc3RkOjp1 bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mIGVuY29kZXIpCit7CisgICAgaWYgKGRlY29kZXIubWVz c2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpCYWNrRm9yd2FyZEl0ZW1BdElu ZGV4OjpuYW1lKCkgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OkJhY2tGb3J3YXJkR29Ub0l0ZW06Om5hbWUoKSkgeworICAgICAgICBhdXRvIHBhZ2VQ cm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9j ZXNzKTsKKyAgICAgICAgbV9wYWdlLmRpZFJlY2VpdmVTeW5jTWVzc2FnZShjb25uZWN0aW9uLCBk ZWNvZGVyLCBlbmNvZGVyKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIExPRyhQcm9j ZXNzU3dhcHBpbmcsICJVbmhhbmRsZWQgc3luYyBtZXNzYWdlICVzOjolcyBmcm9tIHByb3Zpc2lv bmFsIHByb2Nlc3MiLCBkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKS50b1N0cmluZygpLmRh dGEoKSwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgpKTsKK30KKworfSAv LyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Q cm92aXNpb25hbFBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9u YWxQYWdlUHJveHkuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45MDIwZDgxZjZmNWY1ZGYwZTQ5YTBiYTZiMmIwMzEw ZDRiMzBmZDg3Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJv dmlzaW9uYWxQYWdlUHJveHkuaApAQCAtMCwwICsxLDkzIEBACisvKgorICogQ29weXJpZ2h0IChD KSAyMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK KyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dp bmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3Vy Y2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAy LiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3Zl IGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl IGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Ig b3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBU SElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRP UlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJ TkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMg T0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBP U0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENP TlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURF TlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJ TkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRV VEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBC VVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9S WSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZ LCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5H IElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJ U0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI3ByYWdt YSBvbmNlCisKKyNpbmNsdWRlICJNZXNzYWdlUmVjZWl2ZXIuaCIKKworbmFtZXNwYWNlIFdlYkNv cmUgeworY2xhc3MgUmVzb3VyY2VSZXF1ZXN0OworfQorCituYW1lc3BhY2UgV2ViS2l0IHsKKwor Y2xhc3MgRHJhd2luZ0FyZWFQcm94eTsKK2NsYXNzIFN1c3BlbmRlZFBhZ2VQcm94eTsKK2NsYXNz IFdlYkZyYW1lUHJveHk7CitjbGFzcyBXZWJQYWdlUHJveHk7CitjbGFzcyBXZWJQcm9jZXNzUHJv eHk7CisKK2NsYXNzIFByb3Zpc2lvbmFsUGFnZVByb3h5IDogcHVibGljIElQQzo6TWVzc2FnZVJl Y2VpdmVyIHsKKyAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKK3B1YmxpYzoKKyAgICBQcm92 aXNpb25hbFBhZ2VQcm94eShXZWJQYWdlUHJveHkmLCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmLCBz dGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiwgdWludDY0X3QgbmF2aWdhdGlvbklE LCBib29sIGlzU2VydmVyUmVkaXJlY3QsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYs IFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpOworICAgIH5Qcm92aXNpb25hbFBhZ2VQcm94 eSgpOworCisgICAgV2ViUGFnZVByb3h5JiBwYWdlKCkgeyByZXR1cm4gbV9wYWdlOyB9CisgICAg V2ViRnJhbWVQcm94eSogbWFpbkZyYW1lKCkgY29uc3QgeyByZXR1cm4gbV9tYWluRnJhbWUuZ2V0 KCk7IH0KKyAgICBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MoKSB7IHJldHVybiBtX3Byb2Nlc3Mu Z2V0KCk7IH0KKyAgICBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVx dWVzdGVkQnlDbGllbnQoKSBjb25zdCB7IHJldHVybiBtX3Byb2Nlc3NTd2FwUmVxdWVzdGVkQnlD bGllbnQ7IH0KKyAgICB1aW50NjRfdCBuYXZpZ2F0aW9uSUQoKSBjb25zdCB7IHJldHVybiBtX25h dmlnYXRpb25JRDsgfQorCisgICAgRHJhd2luZ0FyZWFQcm94eSogZHJhd2luZ0FyZWEoKSBjb25z dCB7IHJldHVybiBtX2RyYXdpbmdBcmVhLmdldCgpOyB9CisgICAgc3RkOjp1bmlxdWVfcHRyPERy YXdpbmdBcmVhUHJveHk+IHRha2VEcmF3aW5nQXJlYSgpOworCisgICAgdm9pZCBsb2FkRGF0YVdp dGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYs IGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0 cmluZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9s aWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKKyAgICB2b2lkIGxvYWRSZXF1ZXN0V2l0aE5h dmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdl YkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0 YSwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7CisgICAg dm9pZCBnb1RvQmFja0ZvcndhcmRJdGVtKEFQSTo6TmF2aWdhdGlvbiYsIFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0mLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmKTsKKyAgICB2b2lkIGNh bmNlbCgpOworCisgICAgdm9pZCBwcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5nKCk7CisKK3ByaXZh dGU6CisgICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKKyAgICB2b2lkIGRpZFJlY2VpdmVNZXNz YWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIGZpbmFsOworICAgIHZvaWQgZGlk UmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYsIHN0ZDo6 dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+JikgZmluYWw7CisKKyAgICB2b2lkIGRpZENyZWF0ZU1h aW5GcmFtZSh1aW50NjRfdCBmcmFtZUlEKTsKKyAgICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxM b2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwm JiwgVVJMJiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRD b21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklE LCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3Zp ZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUlu Zm8mLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0lu c2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYp OworICAgIHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1l SUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdp biwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJMLCBj b25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgY29uc3QgVXNlckRhdGEmKTsKKworICAgIHZv aWQgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsKKyAgICB2b2lkIGZpbmlzaEluaXRpYWxpemluZ1dlYlBh Z2VBZnRlclByb2Nlc3NMYXVuY2goKTsKKworICAgIFdlYlBhZ2VQcm94eSYgbV9wYWdlOworICAg IFJlZjxXZWJQcm9jZXNzUHJveHk+IG1fcHJvY2VzczsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RHJh d2luZ0FyZWFQcm94eT4gbV9kcmF3aW5nQXJlYTsKKyAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4g bV9tYWluRnJhbWU7CisgICAgdWludDY0X3QgbV9uYXZpZ2F0aW9uSUQ7CisgICAgYm9vbCBtX2lz U2VydmVyUmVkaXJlY3Q7CisgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IG1fcmVxdWVzdDsK KyAgICBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRC eUNsaWVudDsKKyAgICBib29sIG1fd2FzQ29tbWl0dGVkIHsgZmFsc2UgfTsKKyAgICBVUkwgbV9w cm92aXNpb25hbExvYWRVUkw7CisKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIFByb2Nl c3NUaHJvdHRsZXI6OkJhY2tncm91bmRBY3Rpdml0eVRva2VuIG1fc3VzcGVuc2lvblRva2VuOwor I2VuZGlmCit9OworCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwCmluZGV4IGYxOThhODE1MzNmNzZiMmU4ZTJi ZjcxZDRhM2I5ZDI3NDBjOTUwNzguLmZmNzZkOWY3Zjk3YWM2ZmE0ZmJiMzAyZjY0NjY2MWQxNjc4 YWUyNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQ cm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5 LmNwcApAQCAtMTAwLDcgKzEwMCw5IEBAIFN1c3BlbmRlZFBhZ2VQcm94eTo6flN1c3BlbmRlZFBh Z2VQcm94eSgpCiAgICAgLy8gSWYgdGhlIHN1c3BlbmRlZCBwYWdlIHdhcyBub3QgY29uc3VtZWQg YmVmb3JlIGdldHRpbmcgZGVzdHJveWVkLCB0aGVuIGNsb3NlIHRoZSBjb3JyZXNwb25kaW5nIHBh Z2UKICAgICAvLyBvbiB0aGUgV2ViUHJvY2VzcyBzaWRlLgogICAgIG1fcHJvY2Vzcy0+c2VuZChN ZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKLSAgICBtX3Byb2Nl c3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdl UmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisKKyAgICBpZiAobV9zdXNwZW5zaW9u U3RhdGUgPT0gU3VzcGVuc2lvblN0YXRlOjpTdXNwZW5kaW5nKQorICAgICAgICBtX3Byb2Nlc3Mt PnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVj ZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CiAKICAgICAvLyBXZSBjYWxsIG1heWJlU2h1 dERvd24oKSBhc3luY2hyb25vdXNseSBzaW5jZSB0aGUgU3VzcGVuZGVkUGFnZSBpcyBjdXJyZW50 bHkgYmVpbmcgcmVtb3ZlZCBmcm9tIHRoZSBXZWJQcm9jZXNzUG9vbAogICAgIC8vIGFuZCB3ZSB3 YW50IHRvIGF2b2lkIHJlLWVudGVyaW5nIFdlYlByb2Nlc3NQb29sIG1ldGhvZHMuCkBAIC0xMzQs NyArMTM2LDYgQEAgdm9pZCBTdXNwZW5kZWRQYWdlUHJveHk6OnVuc3VzcGVuZCgpCiAgICAgQVNT RVJUKG1fc3VzcGVuc2lvblN0YXRlID09IFN1c3BlbnNpb25TdGF0ZTo6U3VzcGVuZGVkKTsKIAog ICAgIG1fc3VzcGVuc2lvblN0YXRlID0gU3VzcGVuc2lvblN0YXRlOjpSZXN1bWVkOwotICAgIG1f cHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1l c3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKICAgICBtX3Byb2Nlc3MtPnNl bmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldElzU3VzcGVuZGVkKGZhbHNlKSwgbV9wYWdlLnBhZ2VJ RCgpKTsKIH0KIApAQCAtMTUxLDYgKzE1Miw4IEBAIHZvaWQgU3VzcGVuZGVkUGFnZVByb3h5Ojpk aWRQcm9jZXNzUmVxdWVzdFRvU3VzcGVuZChTdXNwZW5zaW9uU3RhdGUgbmV3U3VzcGVuc2lvCiAg ICAgbV9zdXNwZW5zaW9uVG9rZW4gPSBudWxscHRyOwogI2VuZGlmCiAKKyAgICBtX3Byb2Nlc3Mt PnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVj ZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisKICAgICBpZiAobV9yZWFkeVRvVW5zdXNw ZW5kSGFuZGxlcikKICAgICAgICAgbV9yZWFkeVRvVW5zdXNwZW5kSGFuZGxlcih0aGlzKTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKaW5kZXggYzc3YTI2Yjc0 MjdjMzFjODI4ZTJlYWEyMjFmODA3MGI3N2FkZDI2Mi4uNTNjNzE5NmMyYWEwYTMzZDIyMDc1ODE5 MGNkNGJkOTVhNWNkMDI1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi RnJhbWVQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94 eS5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJXZWJGcmFtZVByb3h5LmgiCiAKICNp bmNsdWRlICJBUElOYXZpZ2F0aW9uLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHku aCIKICNpbmNsdWRlICJXZWJDZXJ0aWZpY2F0ZUluZm8uaCIKICNpbmNsdWRlICJXZWJGcmFtZVBv bGljeUxpc3RlbmVyUHJveHkuaCIKICNpbmNsdWRlICJXZWJQYWdlTWVzc2FnZXMuaCIKQEAgLTc0 LDcgKzc1LDcgQEAgYm9vbCBXZWJGcmFtZVByb3h5Ojppc01haW5GcmFtZSgpIGNvbnN0CiAgICAg aWYgKCFtX3BhZ2UpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHJldHVybiB0aGlzID09 IG1fcGFnZS0+bWFpbkZyYW1lKCk7CisgICAgcmV0dXJuIHRoaXMgPT0gbV9wYWdlLT5tYWluRnJh bWUoKSB8fCAobV9wYWdlLT5wcm92aXNpb25hbFBhZ2VQcm94eSgpICYmIHRoaXMgPT0gbV9wYWdl LT5wcm92aXNpb25hbFBhZ2VQcm94eSgpLT5tYWluRnJhbWUoKSk7CiB9CiAKIHZvaWQgV2ViRnJh bWVQcm94eTo6bG9hZFVSTChjb25zdCBVUkwmIHVybCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwCmluZGV4IGM4YWI3MDMzM2I0MDM5YTg3NzljNGNhM2YzMWUxOTA3NTYz YTMzNjkuLmI5NGRkZDk2YTM0YTFhZDczYzdjZTZlNjA4MzdhOWQ2MDlmM2ZmMWMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNzcsNiArNzcsNyBAQAogI2lu Y2x1ZGUgIlBsdWdpbkluZm9ybWF0aW9uLmgiCiAjaW5jbHVkZSAiUGx1Z2luUHJvY2Vzc01hbmFn ZXIuaCIKICNpbmNsdWRlICJQcmludEluZm8uaCIKKyNpbmNsdWRlICJQcm92aXNpb25hbFBhZ2VQ cm94eS5oIgogI2luY2x1ZGUgIlNhZmVCcm93c2luZ1dhcm5pbmcuaCIKICNpbmNsdWRlICJTaGFy ZVNoZWV0Q2FsbGJhY2tJRC5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlckRhdGFSZWZlcmVuY2Uu aCIKQEAgLTU0NSw2ICs1NDYsMTMgQEAgUEFMOjpTZXNzaW9uSUQgV2ViUGFnZVByb3h5OjpzZXNz aW9uSUQoKSBjb25zdAogICAgIHJldHVybiBtX3dlYnNpdGVEYXRhU3RvcmUtPnNlc3Npb25JRCgp OwogfQogCitEcmF3aW5nQXJlYVByb3h5KiBXZWJQYWdlUHJveHk6OmRyYXdpbmdBcmVhKCkgY29u c3QKK3sKKyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UgJiYgbV9wcm9jZXNzLnB0cigpID09ICZt X3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2VzcygpICYmIG1fcHJvdmlzaW9uYWxQYWdlLT5kcmF3aW5n QXJlYSgpKQorICAgICAgICByZXR1cm4gbV9wcm92aXNpb25hbFBhZ2UtPmRyYXdpbmdBcmVhKCk7 CisgICAgcmV0dXJuIG1fZHJhd2luZ0FyZWEuZ2V0KCk7Cit9CisKIHZvaWQgV2ViUGFnZVByb3h5 OjpjaGFuZ2VXZWJzaXRlRGF0YVN0b3JlKFdlYnNpdGVEYXRhU3RvcmUmIHdlYnNpdGVEYXRhU3Rv cmUpCiB7CiAgICAgbV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgpLnBhZ2VFbmRVc2luZ1dlYnNpdGVE YXRhU3RvcmUoKnRoaXMpOwpAQCAtNzY4LDM4ICs3NzYsMjYgQEAgYm9vbCBXZWJQYWdlUHJveHk6 OnN1c3BlbmRDdXJyZW50UGFnZUlmUG9zc2libGUoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9u LCBPcHQKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OnN3YXBUb1dl YlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVuaXF1ZV9wdHI8 U3VzcGVuZGVkUGFnZVByb3h5PiYmIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSwgSXNTd2FwRnJv bVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9pZCBXZWJQYWdlUHJveHk6OnN3YXBU b1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVuaXF1ZV9w dHI8RHJhd2luZ0FyZWFQcm94eT4mJiBkcmF3aW5nQXJlYSwgUmVmUHRyPFdlYkZyYW1lUHJveHk+ JiYgbWFpbkZyYW1lKQogewogICAgIEFTU0VSVCghbV9pc0Nsb3NlZCk7CiAgICAgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRChMb2FkaW5nLCAic3dhcFRvV2ViUHJvY2Vzczogd2ViUElEID0gJWksIHBh Z2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJ RCk7CiAKICAgICBtX3Byb2Nlc3MgPSBXVEZNb3ZlKHByb2Nlc3MpOworICAgIEFTU0VSVCghbV9k cmF3aW5nQXJlYSk7CisgICAgc2V0RHJhd2luZ0FyZWEoV1RGTW92ZShkcmF3aW5nQXJlYSkpOwor ICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOworICAgIG1fbWFpbkZyYW1lID0gV1RGTW92ZShtYWlu RnJhbWUpOwogICAgIG1faXNWYWxpZCA9IHRydWU7CiAKLSAgICAvLyBJZiB3ZSBhcmUgcmVhdHRh Y2hpbmcgdG8gYSBTdXNwZW5kZWRQYWdlLCB0aGVuIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdlIGFs cmVhZHkgZXhpc3RzIGFuZAotICAgIC8vIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1l KCkgd2lsbCBub3QgYmUgY2FsbGVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUuIEluIHN1Y2gK LSAgICAvLyBjYXNlLCB3ZSBuZWVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUgdG8gcmVmbGVj dCB0aGUgZmFjdCB0aGUgdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UKLSAgICAvLyBhbHJlYWR5IGV4 aXN0cyBhbmQgYWxyZWFkeSBoYXMgYSBtYWluIGZyYW1lLgotICAgIGlmIChkZXN0aW5hdGlvblN1 c3BlbmRlZFBhZ2UpIHsKLSAgICAgICAgaWYgKCFkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPmZh aWxlZFRvU3VzcGVuZCgpKSB7Ci0gICAgICAgICAgICBBU1NFUlQoIW1fbWFpbkZyYW1lKTsKLSAg ICAgICAgICAgIEFTU0VSVCgmZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5wcm9jZXNzKCkgPT0g bV9wcm9jZXNzLnB0cigpKTsKLSAgICAgICAgICAgIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZS0+ dW5zdXNwZW5kKCk7Ci0gICAgICAgICAgICBtX21haW5GcmFtZSA9IFdlYkZyYW1lUHJveHk6OmNy ZWF0ZSgqdGhpcywgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpKTsKLSAg ICAgICAgICAgIG1fcHJvY2Vzcy0+ZnJhbWVDcmVhdGVkKGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFn ZS0+bWFpbkZyYW1lSUQoKSwgKm1fbWFpbkZyYW1lKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAg ICAgICAgIC8vIFdlIGZhaWxlZCB0byBzdXNwZW5kIHRoZSBwYWdlIHNvIGRlc3Ryb3kgaXQgbm93 IGFuZCBtZXJlbHkgcmV1c2UgaXRzIFdlYkNvbnRlbnQgcHJvY2Vzcy4KLSAgICAgICAgICAgIGRl c3RpbmF0aW9uU3VzcGVuZGVkUGFnZSA9IG51bGxwdHI7Ci0gICAgICAgIH0KLSAgICB9Ci0KICAg ICBtX3Byb2Nlc3MtPmFkZEV4aXN0aW5nV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQsIFdlYlByb2Nl c3NQcm94eTo6QmVnaW5zVXNpbmdEYXRhU3RvcmU6Ok5vKTsKICAgICBtX3Byb2Nlc3MtPmFkZE1l c3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1l KCksIG1fcGFnZUlELCAqdGhpcyk7CiAKLSAgICBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3Mo aXNTd2FwRnJvbVN1c3BlbmRlZCk7CisgICAgLy8gTm8gbmVlZCB0byBpbml0aWFsaXplIHRoZSBX ZWJQYWdlIHNpbmNlIGl0IHdhcyBjcmVhdGVkIHdoZW4gd2UgY3JlYXRlZCB0aGUgUHJvdmlzaW9u YWxQYWdlUHJveHkuCisgICAgZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKFNob3VsZEluaXRp YWxpemVXZWJQYWdlOjpObyk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hp bmdUb1dlYlByb2Nlc3MoSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQor dm9pZCBXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhTaG91bGRJbml0 aWFsaXplV2ViUGFnZSBzaG91bGRJbml0aWFsaXplUGFnZSkKIHsKICAgICBBU1NFUlQobV9wcm9j ZXNzLT5zdGF0ZSgpICE9IENoaWxkUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6VGVybWluYXRlZCk7CiAK QEAgLTgzNSw3ICs4MzEsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNoaW5nVG9X ZWJQcm9jZXNzKElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1cwogICAgIG1fZWRpdGFi bGVJbWFnZUNvbnRyb2xsZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEVkaXRhYmxlSW1hZ2VDb250cm9s bGVyPigqdGhpcyk7CiAjZW5kaWYKIAotICAgIGluaXRpYWxpemVXZWJQYWdlKGlzU3dhcEZyb21T dXNwZW5kZWQpOworICAgIGlmIChzaG91bGRJbml0aWFsaXplUGFnZSA9PSBTaG91bGRJbml0aWFs aXplV2ViUGFnZTo6WWVzKQorICAgICAgICBpbml0aWFsaXplV2ViUGFnZSgpOwogCiAgICAgbV9p bnNwZWN0b3ItPnVwZGF0ZUZvck5ld1BhZ2VQcm9jZXNzKHRoaXMpOwogCkBAIC05MDAsMTIgKzg5 NywxMSBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9X ZWJQcm9jZXNzV2l0aEl0ZW0oV2ViQmFja0ZvcndhcgogICAgIHJldHVybiBXVEZNb3ZlKG5hdmln YXRpb24pOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoSXNTd2Fw RnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9pZCBXZWJQYWdlUHJveHk6OnNl dERyYXdpbmdBcmVhKHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmIGRyYXdpbmdB cmVhKQogewotICAgIEFTU0VSVChpc1ZhbGlkKCkpOwotCi0gICAgbV9kcmF3aW5nQXJlYSA9IHBh Z2VDbGllbnQoKS5jcmVhdGVEcmF3aW5nQXJlYVByb3h5KCk7Ci0gICAgQVNTRVJUKG1fZHJhd2lu Z0FyZWEpOworICAgIG1fZHJhd2luZ0FyZWEgPSBXVEZNb3ZlKGRyYXdpbmdBcmVhKTsKKyAgICBp ZiAoIW1fZHJhd2luZ0FyZWEpCisgICAgICAgIHJldHVybjsKIAogI2lmIEVOQUJMRShBU1lOQ19T Q1JPTExJTkcpICYmIFBMQVRGT1JNKENPQ09BKQogICAgIGlmIChtX2RyYXdpbmdBcmVhLT50eXBl KCkgPT0gRHJhd2luZ0FyZWFUeXBlUmVtb3RlTGF5ZXJUcmVlKSB7CkBAIC05MTYsMTUgKzkxMiwx NiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoSXNTd2FwRnJvbVN1c3Bl bmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQogI2VuZGlmCiAgICAgfQogI2VuZGlmCit9CiAKLSAg ICBhdXRvIHBhcmFtZXRlcnMgPSBjcmVhdGlvblBhcmFtZXRlcnMoKTsKLSAgICBwYXJhbWV0ZXJz LmlzU3dhcEZyb21TdXNwZW5kZWQgPSBpc1N3YXBGcm9tU3VzcGVuZGVkID09IElzU3dhcEZyb21T dXNwZW5kZWQ6OlllczsKK3ZvaWQgV2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSgpCit7 CisgICAgQVNTRVJUKGlzVmFsaWQoKSk7CiAKLSNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCi0g ICAgcGFyYW1ldGVycy5oYXNSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMgPSBwcm9jZXNzKCkucHJv Y2Vzc1Bvb2woKS5tYXlIYXZlUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXJzKG1fd2Vic2l0ZURhdGFT dG9yZSk7Ci0jZW5kaWYKKyAgICBzZXREcmF3aW5nQXJlYShwYWdlQ2xpZW50KCkuY3JlYXRlRHJh d2luZ0FyZWFQcm94eSgpKTsKKyAgICBBU1NFUlQobV9kcmF3aW5nQXJlYSk7CiAKLSAgICBwcm9j ZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6Q3JlYXRlV2ViUGFnZShtX3BhZ2VJRCwg cGFyYW1ldGVycyksIDApOworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNz OjpDcmVhdGVXZWJQYWdlKG1fcGFnZUlELCBjcmVhdGlvblBhcmFtZXRlcnMoKSksIDApOwogCiAg ICAgbV9uZWVkc1RvRmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCA9 IHRydWU7CiAgICAgZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCgp OwpAQCAtMTA3Niw3ICsxMDczLDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRSZXF1ZXN0V2l0 aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBSZXNvdXIKICAgICBhdXRv IHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CiAKICAgICBhdXRv IHVybCA9IHJlcXVlc3QudXJsKCk7Ci0gICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdBUElS ZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCB1cmwpOworICAgIGlmIChzaG91bGRUcmVhdEFzQ29udGlu dWluZ0xvYWQgIT0gU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMpCisgICAgICAgIG1f cGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFuc2FjdGlvbiwgdXJsKTsK IAogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICByZWF0dGFjaFRvV2ViUHJvY2VzcygpOwpA QCAtMTI5NCw2ICsxMjkyLDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzdG9wTG9hZGluZygpCiAg ICAgfQogCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTdG9wTG9hZGlu ZygpLCBtX3BhZ2VJRCk7CisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlKSB7CisgICAgICAgIG1f cHJvdmlzaW9uYWxQYWdlLT5jYW5jZWwoKTsKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBu dWxscHRyOworICAgIH0KICAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS5zdGFy dCgpOwogfQogCkBAIC0yNjk4LDcgKzI3MDAsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVjZWl2 ZWROYXZpZ2F0aW9uUG9saWN5RGVjaXNpb24oV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbgog ICAgICAgICB9CiAKICAgICAgICAgaWYgKHByb2Nlc3NGb3JOYXZpZ2F0aW9uLnB0cigpICE9ICZw cm9jZXNzKCkpIHsKLSAgICAgICAgICAgIHBvbGljeUFjdGlvbiA9IGlzUGFnZU9wZW5lZEJ5RE9N U2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgPyBXZWJQb2xpY3lBY3Rpb246Oklnbm9yZSA6 IFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZDsKKyAgICAgICAgICAgIHBvbGljeUFjdGlvbiA9IFdl YlBvbGljeUFjdGlvbjo6SWdub3JlOwogICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RChQcm9jZXNzU3dhcHBpbmcsICJkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uLCBzd2Fw cGluZyBwcm9jZXNzICVpIHdpdGggcHJvY2VzcyAlaSBmb3IgbmF2aWdhdGlvbiwgcmVhc29uOiAl e3B1YmxpY31zIiwgcHJvY2Vzc0lkZW50aWZpZXIoKSwgcHJvY2Vzc0Zvck5hdmlnYXRpb24tPnBy b2Nlc3NJZGVudGlmaWVyKCksIHJlYXNvbi51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgICAgIExP RyhQcm9jZXNzU3dhcHBpbmcsICIoUHJvY2Vzc1N3YXBwaW5nKSBTd2l0Y2hpbmcgZnJvbSBwcm9j ZXNzICVpIHRvIG5ldyBwcm9jZXNzICglaSkgZm9yIG5hdmlnYXRpb24gJSIgUFJJdTY0ICIgJyVz JyIsIHByb2Nlc3NJZGVudGlmaWVyKCksIHByb2Nlc3NGb3JOYXZpZ2F0aW9uLT5wcm9jZXNzSWRl bnRpZmllcigpLCBuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi0+bG9nZ2lu Z1N0cmluZygpKTsKICAgICAgICAgfSBlbHNlCkBAIC0yNzA3LDggKzI3MDksMTQgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uKFdlYlBvbGljeUFj dGlvbiBwb2xpY3lBY3Rpb24KICAgICAgICAgYm9vbCBzaG91bGRQcm9jZXNzU3dhcCA9IHByb2Nl c3NGb3JOYXZpZ2F0aW9uLnB0cigpICE9ICZwcm9jZXNzKCk7CiAgICAgICAgIHJlY2VpdmVkUG9s aWN5RGVjaXNpb24ocG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uLnB0cigpLCBzaG91bGRQcm9jZXNz U3dhcCA/IFdURjo6bnVsbG9wdCA6IFdURk1vdmUoZGF0YSksIFdURk1vdmUoc2VuZGVyKSk7CiAK LSAgICAgICAgaWYgKHNob3VsZFByb2Nlc3NTd2FwKQotICAgICAgICAgICAgY29udGludWVOYXZp Z2F0aW9uSW5OZXdQcm9jZXNzKG5hdmlnYXRpb24sIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSA/ IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLnRha2VTdXNwZW5kZWRQYWdlKCpkZXN0aW5hdGlvblN1 c3BlbmRlZFBhZ2UpIDogbnVsbHB0ciwgV1RGTW92ZShwcm9jZXNzRm9yTmF2aWdhdGlvbiksIHBy b2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFdURk1vdmUoZGF0YSkpOworICAgICAgICBpZiAo IXNob3VsZFByb2Nlc3NTd2FwKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGF1dG8g c3VzcGVuZGVkUGFnZSA9IGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSA/IHByb2Nlc3MoKS5wcm9j ZXNzUG9vbCgpLnRha2VTdXNwZW5kZWRQYWdlKCpkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UpIDog bnVsbHB0cjsKKyAgICAgICAgaWYgKHN1c3BlbmRlZFBhZ2UgJiYgc3VzcGVuZGVkUGFnZS0+ZmFp bGVkVG9TdXNwZW5kKCkpCisgICAgICAgICAgICBzdXNwZW5kZWRQYWdlID0gbnVsbHB0cjsKKwor ICAgICAgICBjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MobmF2aWdhdGlvbiwgV1RGTW92 ZShzdXNwZW5kZWRQYWdlKSwgV1RGTW92ZShwcm9jZXNzRm9yTmF2aWdhdGlvbiksIHByb2Nlc3NT d2FwUmVxdWVzdGVkQnlDbGllbnQsIFdURk1vdmUoZGF0YSkpOwogICAgIH0pOwogfQogCkBAIC0y NzQ0LDI0ICsyNzUyLDQ1IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZFBvbGljeURlY2lz aW9uKFdlYlBvbGljeUFjdGlvbiBhY3Rpb24sIEFQSTo6TmF2aWdhdGlvCiAgICAgc2VuZGVyLT5z ZW5kKGFjdGlvbiwgbmF2aWdhdGlvbiA/IG5hdmlnYXRpb24tPm5hdmlnYXRpb25JRCgpIDogMCwg ZG93bmxvYWRJRCwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKIH0KIAotdm9pZCBXZWJQYWdl UHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhBUEk6Ok5hdmlnYXRpb24mIG5h dmlnYXRpb24sIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYgc3VzcGVuZGVk UGFnZVByb3h5LCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIFByb2Nlc3NTd2FwUmVx dWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgT3B0aW9uYWw8V2Vi c2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit2b2lkIFdlYlBhZ2VQcm94eTo6 Y29tbWl0UHJvdmlzaW9uYWxQYWdlKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRp b25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQ cm92aWRlciwgdWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNh dGVJbmZvJiBjZXJ0aWZpY2F0ZUluZm8sIGJvb2wgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0 aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRl bnQsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKIHsKLSAgICBSRUxFQVNFX0xPR19JRl9BTExP V0VEKExvYWRpbmcsICJjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3M6IHdlYlBJRCA9ICVp LCBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9w YWdlSUQpOwotICAgIExPRyhMb2FkaW5nLCAiQ29udGludWluZyBuYXZpZ2F0aW9uICUiIFBSSXU2 NCAiICclcycgaW4gYSBuZXcgd2ViIHByb2Nlc3MiLCBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgp LCBuYXZpZ2F0aW9uLmxvZ2dpbmdTdHJpbmcoKSk7CisgICAgQVNTRVJUKG1fcHJvdmlzaW9uYWxQ YWdlKTsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJjb21taXRQcm92aXNp b25hbFBhZ2U6IHByZXZpb3VzUElEID0gJWksIG5ld1BJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1 NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wcm92aXNpb25hbFBhZ2UtPnBy b2Nlc3MoKS5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCk7CiAKLSAgICBSZWY8V2ViUHJv Y2Vzc1Byb3h5PiBwcmV2aW91c1Byb2Nlc3MgPSBtX3Byb2Nlc3MuY29weVJlZigpOwogICAgIE9w dGlvbmFsPHVpbnQ2NF90PiBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzID0gbV9tYWluRnJh bWUgPyBtYWtlT3B0aW9uYWwobV9tYWluRnJhbWUtPmZyYW1lSUQoKSkgOiBXVEY6Om51bGxvcHQ7 Ci0gICAgYXV0byBtYWluRnJhbWVVUkwgPSBtX21haW5GcmFtZSA/IG1fbWFpbkZyYW1lLT51cmwo KSA6IFVSTCgpOwogCi0gICAgQVNTRVJUKG1fcHJvY2Vzcy5wdHIoKSAhPSBwcm9jZXNzLnB0cigp KTsKKyAgICBBU1NFUlQobV9wcm9jZXNzLnB0cigpICE9ICZtX3Byb3Zpc2lvbmFsUGFnZS0+cHJv Y2VzcygpKTsKIAogICAgIHByb2Nlc3NEaWRUZXJtaW5hdGUoUHJvY2Vzc1Rlcm1pbmF0aW9uUmVh c29uOjpOYXZpZ2F0aW9uU3dhcCk7CiAKICAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNl aXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFn ZUlEKTsKLSAgICBib29sIGRpZFN1c3BlbmRQcmV2aW91c1BhZ2UgPSBzdXNwZW5kQ3VycmVudFBh Z2VJZlBvc3NpYmxlKG5hdmlnYXRpb24sIG1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MsIHBy b2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpOworICAgIGF1dG8qIG5hdmlnYXRpb24gPSBuYXZp Z2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQo KSk7CisgICAgYm9vbCBkaWRTdXNwZW5kUHJldmlvdXNQYWdlID0gbmF2aWdhdGlvbiA/IHN1c3Bl bmRDdXJyZW50UGFnZUlmUG9zc2libGUoKm5hdmlnYXRpb24sIG1haW5GcmFtZUlESW5QcmV2aW91 c1Byb2Nlc3MsIG1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50 KCkpIDogZmFsc2U7CiAgICAgbV9wcm9jZXNzLT5yZW1vdmVXZWJQYWdlKCp0aGlzLCBtX3BhZ2VJ RCwgV2ViUHJvY2Vzc1Byb3h5OjpFbmRzVXNpbmdEYXRhU3RvcmU6Ok5vKTsKIAotICAgIHN3YXBU b1dlYlByb2Nlc3MoV1RGTW92ZShwcm9jZXNzKSwgV1RGTW92ZShzdXNwZW5kZWRQYWdlUHJveHkp LCBkaWRTdXNwZW5kUHJldmlvdXNQYWdlID8gSXNTd2FwRnJvbVN1c3BlbmRlZDo6WWVzIDogSXNT d2FwRnJvbVN1c3BlbmRlZDo6Tm8pOworICAgIC8vIFRoZXJlIGlzIG5vIHdheSB3ZSdsbCBiZSBh YmxlIHRvIHJldHVybiB0byB0aGUgcGFnZSBpbiB0aGUgcHJldmlvdXMgcGFnZSBzbyBjbG9zZSBp dC4KKyAgICBpZiAoIWRpZFN1c3BlbmRQcmV2aW91c1BhZ2UpCisgICAgICAgIG1fcHJvY2Vzcy0+ c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgcGFnZUlEKCkpOworCisgICAgc3dhcFRv V2ViUHJvY2VzcyhtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2VzcygpLCBtX3Byb3Zpc2lvbmFsUGFn ZS0+dGFrZURyYXdpbmdBcmVhKCksIG1fcHJvdmlzaW9uYWxQYWdlLT5tYWluRnJhbWUoKSk7CisK KyAgICBkaWRDb21taXRMb2FkRm9yRnJhbWUoZnJhbWVJRCwgbmF2aWdhdGlvbklELCBtaW1lVHlw ZSwgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIGZyYW1lTG9hZFR5cGUsIGNlcnRpZmlj YXRlSW5mbywgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50 LCB1c2VyRGF0YSk7CisKKyAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7Cit9CisKK3Zv aWQgV2ViUGFnZVByb3h5Ojpjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpOYXZp Z2F0aW9uJiBuYXZpZ2F0aW9uLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYm IHN1c3BlbmRlZFBhZ2VQcm94eSwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBuZXdQcm9jZXNzLCBQ cm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQs IE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQoreworICAg IFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImNvbnRpbnVlTmF2aWdhdGlvbkluTmV3 UHJvY2Vzczogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9j ZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCk7CisgICAgTE9HKExvYWRpbmcsICJDb250aW51aW5n IG5hdmlnYXRpb24gJSIgUFJJdTY0ICIgJyVzJyBpbiBhIG5ldyB3ZWIgcHJvY2VzcyIsIG5hdmln YXRpb24ubmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24ubG9nZ2luZ1N0cmluZygpKTsKKworICAg IGlmIChtX3Byb3Zpc2lvbmFsUGFnZSkgeworICAgICAgICBpZiAobV9wcm92aXNpb25hbFBhZ2Ut Pm5hdmlnYXRpb25JRCgpICE9IG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCkpCisgICAgICAgICAg ICBtX3Byb3Zpc2lvbmFsUGFnZS0+Y2FuY2VsKCk7CisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdl ID0gbnVsbHB0cjsKKyAgICB9CisKKyAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IHN0ZDo6bWFrZV91 bmlxdWU8UHJvdmlzaW9uYWxQYWdlUHJveHk+KCp0aGlzLCBuZXdQcm9jZXNzLmNvcHlSZWYoKSwg V1RGTW92ZShzdXNwZW5kZWRQYWdlUHJveHkpLCBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBu YXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0SXNSZWRpcmVjdCgpLCBuYXZpZ2F0aW9uLmN1cnJlbnRS ZXF1ZXN0KCksIHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpOwogCiAgICAgaWYgKGF1dG8q IGl0ZW0gPSBuYXZpZ2F0aW9uLnRhcmdldEl0ZW0oKSkgewogICAgICAgICBMT0coTG9hZGluZywg IldlYlBhZ2VQcm94eSAlcCBjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MgdG8gYmFjayBp dGVtIFVSTCAlcyIsIHRoaXMsIGl0ZW0tPnVybCgpLnV0ZjgoKS5kYXRhKCkpOwpAQCAtMjc2OSw2 NyArMjc5OCwyMiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQ cm9jZXNzKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgcwogICAgICAgICBhdXRvIHRyYW5z YWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CiAgICAgICAgIG1fcGFnZUxv YWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFuc2FjdGlvbiwgaXRlbS0+dXJsKCkp OwogCi0gICAgICAgIGF1dG8gaXRlbVN0YXRlcyA9IG1fYmFja0ZvcndhcmRMaXN0LT5maWx0ZXJl ZEl0ZW1TdGF0ZXMoW3RoaXMsIHRhcmdldEl0ZW0gPSBpdGVtXShXZWJCYWNrRm9yd2FyZExpc3RJ dGVtJiBpdGVtKSB7Ci0gICAgICAgICAgICBpZiAoYXV0byogcGFnZSA9IGl0ZW0uc3VzcGVuZGVk UGFnZSgpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKCZwYWdlLT5wcm9jZXNzKCkgPT0gbV9wcm9j ZXNzLnB0cigpKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAg ICB9Ci0gICAgICAgICAgICByZXR1cm4gJml0ZW0gIT0gdGFyZ2V0SXRlbTsKLSAgICAgICAgfSk7 Ci0gICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6VXBkYXRlQmFja0Zv cndhcmRMaXN0Rm9yUmVhdHRhY2goV1RGTW92ZShpdGVtU3RhdGVzKSksIG1fcGFnZUlEKTsKLSAg ICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJ dGVtKG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIGl0ZW0tPml0ZW1JRCgpLCAqbmF2aWdhdGlv bi5iYWNrRm9yd2FyZEZyYW1lTG9hZFR5cGUoKSwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2Fk OjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSksIG1fcGFnZUlEKTsKLSAgICAgICAgbV9w cm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKLQorICAgICAgICBtX3Byb3Zp c2lvbmFsUGFnZS0+Z29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uLCAqaXRlbSwgV1RGTW92 ZSh3ZWJzaXRlUG9saWNpZXMpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGlmICht X2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKSAmJiAobmF2aWdhdGlvbi5sb2NrQmFja0Zv cndhcmRMaXN0KCkgPT0gTG9ja0JhY2tGb3J3YXJkTGlzdDo6WWVzIHx8IG5hdmlnYXRpb24ubG9j a0hpc3RvcnkoKSA9PSBMb2NrSGlzdG9yeTo6WWVzKSkgewogICAgICAgICAvLyBJZiBXZWJDb3Jl IGlzIHN1cHBvc2VkIHRvIGxvY2sgdGhlIGhpc3RvcnkgZm9yIHRoaXMgbG9hZCwgdGhlbiB0aGUg bmV3IHByb2Nlc3MgbmVlZHMgdG8ga25vdyBhYm91dCB0aGUgY3VycmVudCBoaXN0b3J5IGl0ZW0g c28gaXQgY2FuIHVwZGF0ZQogICAgICAgICAvLyBpdCBpbnN0ZWFkIG9mIGNyZWF0aW5nIGEgbmV3 IG9uZS4KLSAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRDdXJy ZW50SGlzdG9yeUl0ZW1Gb3JSZWF0dGFjaChtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0o KS0+aXRlbVN0YXRlKCkpLCBtX3BhZ2VJRCk7CisgICAgICAgIG5ld1Byb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OlNldEN1cnJlbnRIaXN0b3J5SXRlbUZvclJlYXR0YWNoKG1fYmFja0Zv cndhcmRMaXN0LT5jdXJyZW50SXRlbSgpLT5pdGVtU3RhdGUoKSksIG1fcGFnZUlEKTsKICAgICB9 CiAKICAgICAvLyBGSVhNRTogV29yayBvdXQgdGltaW5nIG9mIHJlc3BvbmRpbmcgd2l0aCB0aGUg bGFzdCBwb2xpY3kgZGVsZWdhdGUsIGV0YwogICAgIEFTU0VSVCghbmF2aWdhdGlvbi5jdXJyZW50 UmVxdWVzdCgpLmlzRW1wdHkoKSk7CiAgICAgaWYgKGF1dG8mIHN1YnN0aXR1dGVEYXRhID0gbmF2 aWdhdGlvbi5zdWJzdGl0dXRlRGF0YSgpKQotICAgICAgICBsb2FkRGF0YVdpdGhOYXZpZ2F0aW9u KG5hdmlnYXRpb24sIHsgc3Vic3RpdHV0ZURhdGEtPmNvbnRlbnQuZGF0YSgpLCBzdWJzdGl0dXRl RGF0YS0+Y29udGVudC5zaXplKCkgfSwgc3Vic3RpdHV0ZURhdGEtPk1JTUVUeXBlLCBzdWJzdGl0 dXRlRGF0YS0+ZW5jb2RpbmcsIHN1YnN0aXR1dGVEYXRhLT5iYXNlVVJMLCBzdWJzdGl0dXRlRGF0 YS0+dXNlckRhdGEuZ2V0KCksIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZN b3ZlKHdlYnNpdGVQb2xpY2llcykpOworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZS0+bG9hZERh dGFXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCB7IHN1YnN0aXR1dGVEYXRhLT5jb250ZW50LmRh dGEoKSwgc3Vic3RpdHV0ZURhdGEtPmNvbnRlbnQuc2l6ZSgpIH0sIHN1YnN0aXR1dGVEYXRhLT5N SU1FVHlwZSwgc3Vic3RpdHV0ZURhdGEtPmVuY29kaW5nLCBzdWJzdGl0dXRlRGF0YS0+YmFzZVVS TCwgc3Vic3RpdHV0ZURhdGEtPnVzZXJEYXRhLmdldCgpLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2ll cykpOwogICAgIGVsc2UKLSAgICAgICAgbG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihuYXZpZ2F0 aW9uLCBSZXNvdXJjZVJlcXVlc3QgeyBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCkgfSwgV2Vi Q29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkQWxsb3dFeHRlcm5hbFNj aGVtZXMsIG51bGxwdHIsIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3Zl KHdlYnNpdGVQb2xpY2llcykpOwotCi0gICAgQVNTRVJUKCFtX21haW5GcmFtZSk7Ci0gICAgbV9t YWluRnJhbWVDcmVhdGlvbkhhbmRsZXIgPSBbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigq dGhpcyksIG5hdmlnYXRpb25JRCA9IG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIHJlcXVlc3Qg PSAgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpLCBtYWluRnJhbWVVUkwsIGlzU2VydmVyUmVk aXJlY3QgPSBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0SXNSZWRpcmVjdCgpXSgpIG11dGFibGUg ewotICAgICAgICBpZiAoIXdlYWtUaGlzKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAg IEFTU0VSVChtX21haW5GcmFtZSk7Ci0gICAgICAgIC8vIFRoaXMgbmF2aWdhdGlvbiB3YXMgZGVz dHJveWVkIHNvIG5vIG5lZWQgdG8gbm90aWZ5IG9mIHJlZGlyZWN0LgotICAgICAgICBpZiAoIW5h dmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRpb24obmF2aWdhdGlvbklEKSkKLSAgICAgICAgICAgIHJl dHVybjsKLQotICAgICAgICAvLyBSZXN0b3JlIHRoZSBtYWluIGZyYW1lJ3MgY29tbWl0dGVkIFVS TCBhcyBzb21lIGNsaWVudHMgbWF5IHJlbHkgb24gaXQgdW50aWwgdGhlIG5leHQgbG9hZCBpcyBj b21taXR0ZWQuCi0gICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLnNldFVSTCht YWluRnJhbWVVUkwpOwotCi0gICAgICAgIC8vIE5vcm1hbGx5LCBub3RpZmljYXRpb24gb2YgYSBz ZXJ2ZXIgcmVkaXJlY3QgY29tZXMgZnJvbSB0aGUgV2ViQ29udGVudCBwcm9jZXNzLgotICAgICAg ICAvLyBJZiB3ZSBhcmUgcHJvY2VzcyBzd2FwcGluZyBpbiByZXNwb25zZSB0byBhIHNlcnZlciBy ZWRpcmVjdCB0aGVuIHRoYXQgbm90aWZpY2F0aW9uIHdpbGwgbm90IGNvbWUgZnJvbSB0aGUgbmV3 IFdlYkNvbnRlbnQgcHJvY2Vzcy4KLSAgICAgICAgLy8gSW4gdGhpcyBjYXNlIHdlIGhhdmUgdGhl IFVJUHJvY2VzcyBzeW50aGVzaXplIHRoZSByZWRpcmVjdCBub3RpZmljYXRpb24gYXQgdGhlIGFw cHJvcHJpYXRlIHRpbWUuCi0gICAgICAgIGlmIChpc1NlcnZlclJlZGlyZWN0KSB7Ci0gICAgICAg ICAgICBtX21haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5kaWRTdGFydFByb3Zpc2lvbmFsTG9h ZChyZXF1ZXN0LnVybCgpKTsKLSAgICAgICAgICAgIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZv clByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKG1fbWFpbkZyYW1lLT5mcmFtZUlEKCksIG5hdmlnYXRp b25JRCwgV1RGTW92ZShyZXF1ZXN0KSwgeyB9KTsKLSAgICAgICAgfQotICAgIH07Ci0KLSAgICBp ZiAoIW1fcHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKS5jb25maWd1cmF0aW9uKCkucHJvY2Vzc1N3YXBz T25XaW5kb3dPcGVuV2l0aE9wZW5lcigpIHx8ICFpc1BhZ2VPcGVuZWRCeURPTVNob3dpbmdJbml0 aWFsRW1wdHlEb2N1bWVudCgpIHx8ICFtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzKSB7Ci0g ICAgICAgIC8vIFRoZXJlIGlzIG5vIHdheSB3ZSdsbCBiZSBhYmxlIHRvIHJldHVybiB0byB0aGUg cGFnZSBpbiB0aGUgcHJldmlvdXMgcGFnZSBzbyBjbG9zZSBpdC4KLSAgICAgICAgaWYgKCFkaWRT dXNwZW5kUHJldmlvdXNQYWdlKQotICAgICAgICAgICAgcHJldmlvdXNQcm9jZXNzLT5zZW5kKE1l c3NhZ2VzOjpXZWJQYWdlOjpDbG9zZSgpLCBtX3BhZ2VJRCk7Ci0gICAgICAgIHJldHVybjsKLSAg ICB9Ci0KLSAgICBtX21haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlciA9IFt0aGlzLCBwcmV2 aW91c1Byb2Nlc3MgPSBXVEZNb3ZlKHByZXZpb3VzUHJvY2VzcyksIG1haW5GcmFtZUlESW5QcmV2 aW91c1Byb2Nlc3MgPSAqbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2Vzc10oY29uc3QgR2xvYmFs V2luZG93SWRlbnRpZmllciYgd2luZG93SWRlbnRpZmllcikgewotICAgICAgICBBU1NFUlQobV9t YWluRnJhbWUpOwotICAgICAgICBHbG9iYWxGcmFtZUlkZW50aWZpZXIgbmF2aWdhdGVkRnJhbWVJ ZGVudGlmaWVySW5OZXdQcm9jZXNzIHsgcGFnZUlEKCksIG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkg fTsKLSAgICAgICAgcHJldmlvdXNQcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpGcmFt ZUJlY2FtZVJlbW90ZShtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzLCBuYXZpZ2F0ZWRGcmFt ZUlkZW50aWZpZXJJbk5ld1Byb2Nlc3MsIHdpbmRvd0lkZW50aWZpZXIpLCBwYWdlSUQoKSk7Ci0g ICAgfTsKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UtPmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRp b24obmF2aWdhdGlvbiwgUmVzb3VyY2VSZXF1ZXN0IHsgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVz dCgpIH0sIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZEFsbG93 RXh0ZXJuYWxTY2hlbWVzLCBudWxscHRyLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOwogfQog CiBib29sIFdlYlBhZ2VQcm94eTo6aXNQYWdlT3BlbmVkQnlET01TaG93aW5nSW5pdGlhbEVtcHR5 RG9jdW1lbnQoKSBjb25zdApAQCAtMzY5NCwxMSArMzY3OCw2IEBAIHZvaWQgV2ViUGFnZVByb3h5 OjpkaWRDcmVhdGVNYWluRnJhbWUodWludDY0X3QgZnJhbWVJRCkKIAogICAgIC8vIEFkZCB0aGUg ZnJhbWUgdG8gdGhlIHByb2Nlc3Mgd2lkZSBtYXAuCiAgICAgbV9wcm9jZXNzLT5mcmFtZUNyZWF0 ZWQoZnJhbWVJRCwgKm1fbWFpbkZyYW1lKTsKLQotICAgIGlmIChtX21haW5GcmFtZUNyZWF0aW9u SGFuZGxlcikgewotICAgICAgICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlcigpOwotICAgICAg ICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlciA9IG51bGxwdHI7Ci0gICAgfQogfQogCiB2b2lk IFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlU3ViZnJhbWUodWludDY0X3QgZnJhbWVJRCkKQEAgLTM3 MjMsMTAgKzM3MDIsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlU3ViZnJhbWUodWlu dDY0X3QgZnJhbWVJRCkKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVdpbmRvdyh1aW50 NjRfdCBmcmFtZUlELCBHbG9iYWxXaW5kb3dJZGVudGlmaWVyJiYgd2luZG93SWRlbnRpZmllcikK IHsKLSAgICBpZiAobV9tYWluRnJhbWUgJiYgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSA9PSBmcmFt ZUlEKSB7Ci0gICAgICAgIGlmIChhdXRvIG1haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlciA9 IFdURk1vdmUobV9tYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIpKQotICAgICAgICAgICAg bWFpbkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyKHdpbmRvd0lkZW50aWZpZXIpOwotICAgIH0K IH0KIAogZG91YmxlIFdlYlBhZ2VQcm94eTo6ZXN0aW1hdGVkUHJvZ3Jlc3MoKSBjb25zdApAQCAt Mzc3OSw2ICszNzU0LDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWREZXN0cm95TmF2aWdhdGlv bih1aW50NjRfdCBuYXZpZ2F0aW9uSUQpCiB7CiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90 ZWN0b3IocGFnZUNsaWVudCgpKTsKIAorICAgIC8vIE9uIHByb2Nlc3Mtc3dhcCwgdGhlIHByZXZp b3VzIHByb2Nlc3MgdHJpZXMgdG8gZGVzdHJveSB0aGUgbmF2aWdhdGlvbiBidXQgdGhlIHByb3Zp c2lvbmFsIHByb2Nlc3MgaXMgYWN0dWFsbHkgdGFraW5nIG92ZXIgdGhlIG5hdmlnYXRpb24uCisg ICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlICYmIG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9u SUQoKSA9PSBuYXZpZ2F0aW9uSUQpCisgICAgICAgIHJldHVybjsKKwogICAgIC8vIEZJWE1FOiBN ZXNzYWdlIGNoZWNrIHRoZSBuYXZpZ2F0aW9uSUQuCiAgICAgbV9uYXZpZ2F0aW9uU3RhdGUtPmRp ZERlc3Ryb3lOYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCk7CiB9CkBAIC0zNzk2LDE0ICszNzc1LDYg QEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWlu dDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmEKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkg JiYgbmF2aWdhdGlvbklEKQogICAgICAgICBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0YXRlKCku bmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpOwogCi0gICAgLy8gSWYgdGhpcyBzZWVtaW5nbHkgbmV3 IGxvYWQgaXMgYWN0dWFsbHkgY29udGludWluZyBhIHNlcnZlciByZWRpcmVjdCBmb3IgYSBwcmV2 aW91cyBuYXZpZ2F0aW9uIGluIGEgbmV3IHByb2Nlc3MsCi0gICAgLy8gdGhlbiB3ZSBpZ25vcmUg dGhpcyBub3RpZmljYXRpb24uCi0gICAgaWYgKG5hdmlnYXRpb24gJiYgbmF2aWdhdGlvbi0+Y3Vy cmVudFJlcXVlc3RJc1JlZGlyZWN0KCkpIHsKLSAgICAgICAgYXV0byBuYXZpZ2F0aW9uUHJvY2Vz c0lkZW50aWZpZXIgPSBuYXZpZ2F0aW9uLT5jdXJyZW50UmVxdWVzdFByb2Nlc3NJZGVudGlmaWVy KCk7Ci0gICAgICAgIGlmIChuYXZpZ2F0aW9uUHJvY2Vzc0lkZW50aWZpZXIgJiYgKm5hdmlnYXRp b25Qcm9jZXNzSWRlbnRpZmllciAhPSBtX3Byb2Nlc3MtPmNvcmVQcm9jZXNzSWRlbnRpZmllcigp KQotICAgICAgICAgICAgcmV0dXJuOwotICAgIH0KLQogICAgIExPRyhMb2FkaW5nLCAiV2ViUGFn ZVByb3h5ICUiIFBSSXU2NCAiIGluIHByb2Nlc3MgcGlkICVpIGRpZFN0YXJ0UHJvdmlzaW9uYWxM b2FkRm9yRnJhbWUgdG8gZnJhbWVJRCAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEICUiIFBSSXU2 NCAiLCB1cmwgJXMiLCBtX3BhZ2VJRCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBm cmFtZUlELCBuYXZpZ2F0aW9uSUQsIHVybC5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQ Ukl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQsIGZyYW1lSUQp OwogCkBAIC0zOTExLDYgKzM4ODIsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZhaWxQcm92 aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cmkKIAogICAg IFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKKyAgICBpZiAo bV9wcm92aXNpb25hbFBhZ2UgJiYgbV9wcm92aXNpb25hbFBhZ2UtPm5hdmlnYXRpb25JRCgpID09 IG5hdmlnYXRpb25JRCAmJiAmbV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3MoKSAhPSBtX3Byb2Nl c3MucHRyKCkpIHsKKyAgICAgICAgLy8gVGhlIGxvYWQgZGlkIG5vdCBmYWlsLCBpdCBtZXJlbHkg aGFwcGVuaW5nIGluIGEgbmV3IHByb3Zpc2lvbmFsIHByb2Nlc3MuCisgICAgICAgIHJldHVybjsK KyAgICB9CisKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUo ZnJhbWVJRCk7CiAgICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CiAKQEAgLTM5NDksNiArMzkyNSwx MCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVp bnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaQogICAgIH0KIAogICAgIG1fZmFpbGluZ1Byb3Zp c2lvbmFsTG9hZFVSTCA9IHsgfTsKKworICAgIC8vIElmIHRoZSBwcm92aXNpb25hbCBwYWdlJ3Mg bG9hZCBmYWlscyB0aGVuIHdlIGRlc3Ryb3kgdGhlIHByb3Zpc2lvbmFsIHBhZ2UuCisgICAgaWYg KG1fcHJvdmlzaW9uYWxQYWdlICYmIG1fcHJvdmlzaW9uYWxQYWdlLT5tYWluRnJhbWUoKSA9PSBm cmFtZSkKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBudWxscHRyOwogfQogCiB2b2lkIFdl YlBhZ2VQcm94eTo6Y2xlYXJMb2FkRGVwZW5kZW50Q2FsbGJhY2tzKCkKQEAgLTQzNDAsOCArNDMy MCw4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9u QXN5bmModWludDY0X3QgZnJhbWVJRCwgV2ViQ29yCiAgICAgYXV0byogZnJhbWUgPSBtX3Byb2Nl c3MtPndlYkZyYW1lKGZyYW1lSUQpOwogICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOwogCi0gICAg ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbigqZnJhbWUsIFdURk1vdmUoZnJhbWVTZWN1 cml0eU9yaWdpbiksIG5hdmlnYXRpb25JRCwgV1RGTW92ZShuYXZpZ2F0aW9uQWN0aW9uRGF0YSks IFdURk1vdmUoZnJhbWVJbmZvRGF0YSksIG9yaWdpbmF0aW5nUGFnZUlELCBvcmlnaW5hbFJlcXVl c3QsIFdURk1vdmUocmVxdWVzdCksIFdURk1vdmUocmVxdWVzdEJvZHkpLCBXVEZNb3ZlKHJlZGly ZWN0UmVzcG9uc2UpLCB1c2VyRGF0YSwgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShbdGhp cywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklEXSAo YXV0by4uLiBhcmdzKSB7Ci0gICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4p LCBtX3BhZ2VJRCk7CisgICAgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbigqZnJhbWUs IFdURk1vdmUoZnJhbWVTZWN1cml0eU9yaWdpbiksIG5hdmlnYXRpb25JRCwgV1RGTW92ZShuYXZp Z2F0aW9uQWN0aW9uRGF0YSksIFdURk1vdmUoZnJhbWVJbmZvRGF0YSksIG9yaWdpbmF0aW5nUGFn ZUlELCBvcmlnaW5hbFJlcXVlc3QsIFdURk1vdmUocmVxdWVzdCksIFdURk1vdmUocmVxdWVzdEJv ZHkpLCBXVEZNb3ZlKHJlZGlyZWN0UmVzcG9uc2UpLCB1c2VyRGF0YSwgUG9saWN5RGVjaXNpb25T ZW5kZXI6OmNyZWF0ZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBmcmFt ZUlELCBsaXN0ZW5lcklELCBwcm9jZXNzID0gbV9wcm9jZXNzLmNvcHlSZWYoKV0gKGF1dG8uLi4g YXJncykgeworICAgICAgICBwcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRSZWNl aXZlUG9saWN5RGVjaXNpb24oZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJncy4uLiksIG1fcGFnZUlE KTsKICAgICB9KSk7CiB9CiAKQEAgLTQ1NzUsMTIgKzQ1NTUsMTIgQEAgdm9pZCBXZWJQYWdlUHJv eHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3Vy aXR5T3JpZ2kKICAgICBNRVNTQUdFX0NIRUNLX1VSTChyZXNwb25zZS51cmwoKSk7CiAKICAgICBS ZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvbklEID8gbV9uYXZp Z2F0aW9uU3RhdGUtPm5hdmlnYXRpb24obmF2aWdhdGlvbklEKSA6IG51bGxwdHI7Ci0gICAgYXV0 byBsaXN0ZW5lciA9IG1ha2VSZWYoZnJhbWUtPnNldFVwUG9saWN5TGlzdGVuZXJQcm94eShbdGhp cywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklELCBu YXZpZ2F0aW9uID0gV1RGTW92ZShuYXZpZ2F0aW9uKV0gKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lB Y3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVu dCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBSZWZQdHI8U2FmZUJyb3dzaW5nV2Fybmlu Zz4mJiBzYWZlQnJvd3NpbmdXYXJuaW5nKSBtdXRhYmxlIHsKKyAgICBhdXRvIGxpc3RlbmVyID0g bWFrZVJlZihmcmFtZS0+c2V0VXBQb2xpY3lMaXN0ZW5lclByb3h5KFt0aGlzLCBwcm90ZWN0ZWRU aGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIG5hdmlnYXRpb24gPSBX VEZNb3ZlKG5hdmlnYXRpb24pLCBwcm9jZXNzID0gbV9wcm9jZXNzLmNvcHlSZWYoKV0gKFdlYlBv bGljeUFjdGlvbiBwb2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwgUHJvY2Vzc1N3 YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBSZWZQdHI8 U2FmZUJyb3dzaW5nV2FybmluZz4mJiBzYWZlQnJvd3NpbmdXYXJuaW5nKSBtdXRhYmxlIHsKICAg ICAgICAgLy8gRklYTUU6IEFzc2VydCB0aGUgQVBJOjpXZWJzaXRlUG9saWNpZXMqIGlzIG51bGxw dHIgaGVyZSBvbmNlIGNsaWVudHMgb2YgV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNlV2l0aFBvbGlj aWVzIGdvIGF3YXkuCiAgICAgICAgIFJFTEVBU0VfQVNTRVJUKHByb2Nlc3NTd2FwUmVxdWVzdGVk QnlDbGllbnQgPT0gUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDo6Tm8pOwogICAgICAgICBB U1NFUlRfVU5VU0VEKHNhZmVCcm93c2luZ1dhcm5pbmcsICFzYWZlQnJvd3NpbmdXYXJuaW5nKTsK LSAgICAgICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24sIG5hdmlnYXRpb24u Z2V0KCksIFdURjo6bnVsbG9wdCwgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShbdGhpcywg cHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGZyYW1lSUQsIGxpc3RlbmVy SURdIChhdXRvLi4uIGFyZ3MpIHsKLSAgICAgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdl czo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQs IGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CisgICAgICAgIHJlY2VpdmVkUG9saWN5RGVjaXNpb24ocG9s aWN5QWN0aW9uLCBuYXZpZ2F0aW9uLmdldCgpLCBXVEY6Om51bGxvcHQsIFBvbGljeURlY2lzaW9u U2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRo aXMpLCBmcmFtZUlELCBsaXN0ZW5lcklELCBwcm9jZXNzID0gV1RGTW92ZShwcm9jZXNzKV0gKGF1 dG8uLi4gYXJncykgeworICAgICAgICAgICAgcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4p LCBtX3BhZ2VJRCk7CiAgICAgICAgIH0pKTsKICAgICB9LCBTaG91bGRFeHBlY3RTYWZlQnJvd3Np bmdSZXN1bHQ6Ok5vKSk7CiAKQEAgLTY0ODcsOCArNjQ2Nyw2IEBAIHZvaWQgV2ViUGFnZVByb3h5 Ojpwcm9jZXNzV2lsbEJlY29tZUZvcmVncm91bmQoKQogdm9pZCBXZWJQYWdlUHJveHk6OnJlc2V0 U3RhdGUoUmVzZXRTdGF0ZVJlYXNvbiByZXNldFN0YXRlUmVhc29uKQogewogICAgIG1fbWFpbkZy YW1lID0gbnVsbHB0cjsKLSAgICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlciA9IG51bGxwdHI7 Ci0gICAgbV9tYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIgPSBudWxscHRyOwogCiAjaWYg UExBVEZPUk0oQ09DT0EpCiAgICAgbV9zY3JvbGxpbmdQZXJmb3JtYW5jZURhdGEgPSBudWxscHRy OwpAQCAtNjc3OSw2ICs2NzU3LDEwIEBAIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMgV2ViUGFn ZVByb3h5OjpjcmVhdGlvblBhcmFtZXRlcnMoKQogICAgIHBhcmFtZXRlcnMuYXBwbGljYXRpb25N YW5pZmVzdCA9IG1fY29uZmlndXJhdGlvbi0+YXBwbGljYXRpb25NYW5pZmVzdCgpID8gT3B0aW9u YWw8V2ViQ29yZTo6QXBwbGljYXRpb25NYW5pZmVzdD4obV9jb25maWd1cmF0aW9uLT5hcHBsaWNh dGlvbk1hbmlmZXN0KCktPmFwcGxpY2F0aW9uTWFuaWZlc3QoKSkgOiBXVEY6Om51bGxvcHQ7CiAj ZW5kaWYKIAorI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikKKyAgICBwYXJhbWV0ZXJzLmhhc1Jl Z2lzdGVyZWRTZXJ2aWNlV29ya2VycyA9IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLm1heUhhdmVS ZWdpc3RlcmVkU2VydmljZVdvcmtlcnMobV93ZWJzaXRlRGF0YVN0b3JlKTsKKyNlbmRpZgorCiAg ICAgcGFyYW1ldGVycy5uZWVkc0ZvbnRBdHRyaWJ1dGVzID0gbV9uZWVkc0ZvbnRBdHRyaWJ1dGVz OwogCiAgICAgbV9wcm9jZXNzLT5hZGRXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eShtX3Vz ZXJDb250ZW50Q29udHJvbGxlciwgcGFyYW1ldGVycyk7CkBAIC04NTQwLDYgKzg1MjIsMjEgQEAg dm9pZCBXZWJQYWdlUHJveHk6OnNpbXVsYXRlRGV2aWNlT3JpZW50YXRpb25DaGFuZ2UoZG91Ymxl IGFscGhhLCBkb3VibGUgYmV0YSwgZG8KICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6Oldl YlBhZ2U6OlNpbXVsYXRlRGV2aWNlT3JpZW50YXRpb25DaGFuZ2UoYWxwaGEsIGJldGEsIGdhbW1h KSwgbV9wYWdlSUQpOwogfQogCitXZWJQYWdlUHJveHk6OlBhZ2VQcm9jZXNzT3ZlcnJpZGU6OlBh Z2VQcm9jZXNzT3ZlcnJpZGUoV2ViUGFnZVByb3h5JiBwYWdlLCBXZWJQcm9jZXNzUHJveHkmIG5l d1Byb2Nlc3MpCisgICAgOiBtX3BhZ2UoJnBhZ2UpCisgICAgLCBtX3ByZXZpb3VzUHJvY2Vzcyhw YWdlLnByb2Nlc3MoKSkKK3sKKyAgICBwYWdlLm1fcHJvY2VzcyA9IG5ld1Byb2Nlc3M7Cit9CisK K1dlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6UGFnZVByb2Nlc3NPdmVycmlkZShQ YWdlUHJvY2Vzc092ZXJyaWRlJiYpID0gZGVmYXVsdDsKKworV2ViUGFnZVByb3h5OjpQYWdlUHJv Y2Vzc092ZXJyaWRlOjp+UGFnZVByb2Nlc3NPdmVycmlkZSgpCit7CisgICAgaWYgKG1fcGFnZSkK KyAgICAgICAgbV9wYWdlLT5tX3Byb2Nlc3MgPSBXVEZNb3ZlKG1fcHJldmlvdXNQcm9jZXNzKTsK K30KKwogI2lmIEVOQUJMRShEQVRBX0RFVEVDVElPTikKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRl dGVjdERhdGFJbkFsbEZyYW1lcyhXZWJDb3JlOjpEYXRhRGV0ZWN0b3JUeXBlcyB0eXBlcywgQ29t cGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBEYXRhRGV0ZWN0aW9uUmVzdWx0Jik+JiYgY29tcGxl dGlvbkhhbmRsZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGRl OTg2OTRhYTM3ZGIzYzdmMmNlMjdjYzgyOWE5MjAwMjExZGUxMGQuLmYzNDBjZGEyNWY0NjU1ZWRh M2Q2MTQ1Y2I4YmVmYWU0MWQxNmNkY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oCkBAIC0yMjUsNiArMjI1LDcgQEAgY2xhc3MgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudDsK IGNsYXNzIE5hdGl2ZVdlYk1vdXNlRXZlbnQ7CiBjbGFzcyBOYXRpdmVXZWJXaGVlbEV2ZW50Owog Y2xhc3MgUGFnZUNsaWVudDsKK2NsYXNzIFByb3Zpc2lvbmFsUGFnZVByb3h5OwogY2xhc3MgUmVt b3RlTGF5ZXJUcmVlSG9zdDsKIGNsYXNzIFJlbW90ZUxheWVyVHJlZVNjcm9sbGluZ1BlcmZvcm1h bmNlRGF0YTsKIGNsYXNzIFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOwpAQCAtMzU2LDcgKzM1 Nyw3IEBAIHB1YmxpYzoKICAgICBXZWJGcmFtZVByb3h5KiBmb2N1c2VkRnJhbWUoKSBjb25zdCB7 IHJldHVybiBtX2ZvY3VzZWRGcmFtZS5nZXQoKTsgfQogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1l U2V0TGFyZ2VzdEZyYW1lKCkgY29uc3QgeyByZXR1cm4gbV9mcmFtZVNldExhcmdlc3RGcmFtZS5n ZXQoKTsgfQogCi0gICAgRHJhd2luZ0FyZWFQcm94eSogZHJhd2luZ0FyZWEoKSBjb25zdCB7IHJl dHVybiBtX2RyYXdpbmdBcmVhLmdldCgpOyB9CisgICAgRHJhd2luZ0FyZWFQcm94eSogZHJhd2lu Z0FyZWEoKSBjb25zdDsKIAogICAgIFdlYk5hdmlnYXRpb25TdGF0ZSYgbmF2aWdhdGlvblN0YXRl KCkgeyByZXR1cm4gKm1fbmF2aWdhdGlvblN0YXRlLmdldCgpOyB9CiAKQEAgLTM3OSw2ICszODAs NyBAQCBwdWJsaWM6CiAKICAgICBib29sIGFkZHNWaXNpdGVkTGlua3MoKSBjb25zdCB7IHJldHVy biBtX2FkZHNWaXNpdGVkTGlua3M7IH0KICAgICB2b2lkIHNldEFkZHNWaXNpdGVkTGlua3MoYm9v bCBhZGRzVmlzaXRlZExpbmtzKSB7IG1fYWRkc1Zpc2l0ZWRMaW5rcyA9IGFkZHNWaXNpdGVkTGlu a3M7IH0KKyAgICBWaXNpdGVkTGlua1N0b3JlJiB2aXNpdGVkTGlua1N0b3JlKCkgeyByZXR1cm4g bV92aXNpdGVkTGlua1N0b3JlOyB9CiAKICAgICB2b2lkIGV4aXRGdWxsc2NyZWVuSW1tZWRpYXRl bHkoKTsKICAgICB2b2lkIGZ1bGxzY3JlZW5NYXlSZXR1cm5Ub0lubGluZSgpOwpAQCAtNDU4LDgg KzQ2MCw4IEBAIHB1YmxpYzoKICAgICBBUEk6Okljb25Mb2FkaW5nQ2xpZW50JiBpY29uTG9hZGlu Z0NsaWVudCgpIHsgcmV0dXJuICptX2ljb25Mb2FkaW5nQ2xpZW50OyB9CiAgICAgdm9pZCBzZXRJ Y29uTG9hZGluZ0NsaWVudChzdGQ6OnVuaXF1ZV9wdHI8QVBJOjpJY29uTG9hZGluZ0NsaWVudD4m Jik7CiAKLSAgICBlbnVtIGNsYXNzIElzU3dhcEZyb21TdXNwZW5kZWQgeyBObywgWWVzIH07Ci0g ICAgdm9pZCBpbml0aWFsaXplV2ViUGFnZShJc1N3YXBGcm9tU3VzcGVuZGVkID0gSXNTd2FwRnJv bVN1c3BlbmRlZDo6Tm8pOworICAgIHZvaWQgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsKKyAgICB2b2lk IHNldERyYXdpbmdBcmVhKHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmKTsKIAog ICAgIFdlYWtQdHI8U2VjS2V5UHJveHlTdG9yZT4gc2VjS2V5UHJveHlTdG9yZShjb25zdCBXZWJD b3JlOjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSYpOwogICAgICAgICAKQEAgLTEwMjUsNiArMTAy NywxOSBAQCBwdWJsaWM6CiAgICAgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKCkgeyByZXR1cm4g bV9wcm9jZXNzOyB9CiAgICAgUHJvY2Vzc0lEIHByb2Nlc3NJZGVudGlmaWVyKCkgY29uc3Q7CiAK KyAgICBjbGFzcyBQYWdlUHJvY2Vzc092ZXJyaWRlIHsKKyAgICBwdWJsaWM6CisgICAgICAgIFBh Z2VQcm9jZXNzT3ZlcnJpZGUoV2ViUGFnZVByb3h5JiwgV2ViUHJvY2Vzc1Byb3h5JiBuZXdQcm9j ZXNzKTsKKyAgICAgICAgUGFnZVByb2Nlc3NPdmVycmlkZShQYWdlUHJvY2Vzc092ZXJyaWRlJiYp OworICAgICAgICB+UGFnZVByb2Nlc3NPdmVycmlkZSgpOworCisgICAgcHJpdmF0ZToKKyAgICAg ICAgUmVmUHRyPFdlYlBhZ2VQcm94eT4gbV9wYWdlOworICAgICAgICBSZWY8V2ViUHJvY2Vzc1By b3h5PiBtX3ByZXZpb3VzUHJvY2VzczsKKyAgICB9OworCisgICAgUGFnZVByb2Nlc3NPdmVycmlk ZSB0ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhXZWJQcm9jZXNzUHJveHkmIG5ld1Byb2Nlc3Mp IHsgcmV0dXJuIFBhZ2VQcm9jZXNzT3ZlcnJpZGUoKnRoaXMsIG5ld1Byb2Nlc3MpOyB9CisKICAg ICBXZWJQcmVmZXJlbmNlcyYgcHJlZmVyZW5jZXMoKSB7IHJldHVybiBtX3ByZWZlcmVuY2VzOyB9 CiAgICAgdm9pZCBzZXRQcmVmZXJlbmNlcyhXZWJQcmVmZXJlbmNlcyYpOwogCkBAIC0xNDE1LDYg KzE0MzAsMjEgQEAgcHVibGljOgogICAgIEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyJiBlZGl0YWJs ZUltYWdlQ29udHJvbGxlcigpIHsgcmV0dXJuICptX2VkaXRhYmxlSW1hZ2VDb250cm9sbGVyOyB9 CiAjZW5kaWYKIAorICAgIFByb3Zpc2lvbmFsUGFnZVByb3h5KiBwcm92aXNpb25hbFBhZ2VQcm94 eSgpIGNvbnN0IHsgcmV0dXJuIG1fcHJvdmlzaW9uYWxQYWdlLmdldCgpOyB9CisgICAgdm9pZCBj b21taXRQcm92aXNpb25hbFBhZ2UodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlv bklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFBy b3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0 ZUluZm8mLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhh c0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0 YSYpOworCisgICAgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90 IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYsIFVSTCYmIHVucmVhY2hhYmxl VVJMLCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0 YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJp bmcmIHByb3Zpc2lvbmFsVVJMLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgY29uc3Qg VXNlckRhdGEmKTsKKyAgICB2b2lkIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lv bmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwg V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIGNvbnN0IFVzZXJEYXRhJik7CisKKyAgICB2b2lk IGxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgY29uc3QgSVBDOjpEYXRh UmVmZXJlbmNlJiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGlu ZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFdlYkNvcmU6 OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0 YT4mJiA9IFdURjo6bnVsbG9wdCk7CisgICAgdm9pZCBsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9u KEFQSTo6TmF2aWdhdGlvbiYsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBXZWJDb3JlOjpT aG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFdlYkNv cmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVz RGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7CisKKyAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgor ICAgIC8vIEltcGxlbWVudGVkIGluIGdlbmVyYXRlZCBXZWJQYWdlUHJveHlNZXNzYWdlUmVjZWl2 ZXIuY3BwCisgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6 OkRlY29kZXImKSBvdmVycmlkZTsKKyAgICB2b2lkIGRpZFJlY2VpdmVTeW5jTWVzc2FnZShJUEM6 OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImLCBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVy PiYpIG92ZXJyaWRlOworCiBwcml2YXRlOgogICAgIFdlYlBhZ2VQcm94eShQYWdlQ2xpZW50Jiwg V2ViUHJvY2Vzc1Byb3h5JiwgdWludDY0X3QgcGFnZUlELCBSZWY8QVBJOjpQYWdlQ29uZmlndXJh dGlvbj4mJik7CiAgICAgdm9pZCBwbGF0Zm9ybUluaXRpYWxpemUoKTsKQEAgLTE0MzksMTIgKzE0 NjksNiBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBzZXRVc2VyQWdlbnQoU3RyaW5nJiYpOwogCi0g ICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKLSAgICAvLyBJbXBsZW1lbnRlZCBpbiBnZW5lcmF0 ZWQgV2ViUGFnZVByb3h5TWVzc2FnZVJlY2VpdmVyLmNwcAotICAgIHZvaWQgZGlkUmVjZWl2ZU1l c3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgb3ZlcnJpZGU7Ci0gICAgdm9p ZCBkaWRSZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJiwg c3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mKSBvdmVycmlkZTsKLQotCiAgICAgLy8gSVBD OjpNZXNzYWdlU2VuZGVyCiAgICAgYm9vbCBzZW5kTWVzc2FnZShzdGQ6OnVuaXF1ZV9wdHI8SVBD OjpFbmNvZGVyPiwgT3B0aW9uU2V0PElQQzo6U2VuZE9wdGlvbj4pIG92ZXJyaWRlOwogICAgIElQ Qzo6Q29ubmVjdGlvbiogbWVzc2FnZVNlbmRlckNvbm5lY3Rpb24oKSBvdmVycmlkZTsKQEAgLTE0 NjYsMTIgKzE0OTAsOSBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlkQ3JlYXRlU3ViZnJhbWUodWlu dDY0X3QgZnJhbWVJRCk7CiAgICAgdm9pZCBkaWRDcmVhdGVXaW5kb3codWludDY0X3QgZnJhbWVJ RCwgV2ViQ29yZTo6R2xvYmFsV2luZG93SWRlbnRpZmllciYmKTsKIAotICAgIHZvaWQgZGlkU3Rh cnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZp Z2F0aW9uSUQsIFVSTCYmLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmKTsK LSAgICB2b2lkIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZy YW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiYsIGNvbnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCB3aWxsUGVyZm9ybUNs aWVudFJlZGlyZWN0Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiB1cmws IGRvdWJsZSBkZWxheSwgV2ViQ29yZTo6TG9ja0JhY2tGb3J3YXJkTGlzdCk7CiAgICAgdm9pZCBk aWRDYW5jZWxDbGllbnRSZWRpcmVjdEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpOwogICAgIHZv aWQgZGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50 NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmKTsKLSAgICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExv YWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdp bkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3Qg U3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIGNv bnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCBkaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3Qg ZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBi b29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBl LCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mLCBib29sIGNvbnRhaW5zUGx1Z2luRG9j dW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5z ZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkRmluaXNoRG9jdW1l bnRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBj b25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkRmluaXNoTG9hZEZvckZyYW1lKHVpbnQ2NF90 IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgVXNlckRhdGEmKTsKQEAgLTE1 NzUsMTggKzE1OTYsMTYgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldENhblNob3J0Q2lyY3VpdEhv cml6b250YWxXaGVlbEV2ZW50cyhib29sIGNhblNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2 ZW50cykgeyBtX2NhblNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50cyA9IGNhblNob3J0 Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50czsgfQogCiAgICAgdm9pZCByZWF0dGFjaFRvV2Vi UHJvY2VzcygpOwotICAgIHZvaWQgc3dhcFRvV2ViUHJvY2VzcyhSZWY8V2ViUHJvY2Vzc1Byb3h5 PiYmLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmLCBJc1N3YXBGcm9tU3Vz cGVuZGVkKTsKKyAgICB2b2lkIHN3YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4m Jiwgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+JiYsIFJlZlB0cjxXZWJGcmFtZVBy b3h5PiYmIG1haW5GcmFtZSk7CiAgICAgdm9pZCBkaWRGYWlsVG9TdXNwZW5kQWZ0ZXJQcm9jZXNz U3dhcCgpOwogICAgIHZvaWQgZGlkU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAoKTsKIAotICAgIHZv aWQgZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKElzU3dhcEZyb21TdXNwZW5kZWQgPSBJc1N3 YXBGcm9tU3VzcGVuZGVkOjpObyk7CisgICAgZW51bSBjbGFzcyBTaG91bGRJbml0aWFsaXplV2Vi UGFnZSB7IE5vLCBZZXMgfTsKKyAgICB2b2lkIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhT aG91bGRJbml0aWFsaXplV2ViUGFnZSA9IFNob3VsZEluaXRpYWxpemVXZWJQYWdlOjpZZXMpOwog CiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVhdHRhY2hUb1dlYlByb2Nlc3NGb3JSZWxv YWQoKTsKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiByZWF0dGFjaFRvV2ViUHJvY2Vzc1dp dGhJdGVtKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKTsKIAotICAgIHZvaWQgbG9hZERhdGFXaXRo TmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBj b25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJp bmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRB c0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpu dWxsb3B0KTsKLSAgICB2b2lkIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0 aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRl cm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJl YXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RG OjpudWxsb3B0KTsKLQogICAgIHZvaWQgcmVxdWVzdE5vdGlmaWNhdGlvblBlcm1pc3Npb24odWlu dDY0X3Qgbm90aWZpY2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nKTsKICAgICB2 b2lkIHNob3dOb3RpZmljYXRpb24oY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBi b2R5LCBjb25zdCBTdHJpbmcmIGljb25VUkwsIGNvbnN0IFN0cmluZyYgdGFnLCBjb25zdCBTdHJp bmcmIGxhbmcsIFdlYkNvcmU6Ok5vdGlmaWNhdGlvbkRpcmVjdGlvbiwgY29uc3QgU3RyaW5nJiBv cmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsKICAgICB2b2lkIGNhbmNlbE5v dGlmaWNhdGlvbih1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CkBAIC0xOTUyLDggKzE5NzEsNiBA QCBwcml2YXRlOgogICAgIFJlZjxXZWJzaXRlRGF0YVN0b3JlPiBtX3dlYnNpdGVEYXRhU3RvcmU7 CiAKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9tYWluRnJhbWU7Ci0gICAgRnVuY3Rpb248 dm9pZCgpPiBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlcjsKLSAgICBGdW5jdGlvbjx2b2lkKGNv bnN0IFdlYkNvcmU6Okdsb2JhbFdpbmRvd0lkZW50aWZpZXImKT4gbV9tYWluRnJhbWVXaW5kb3dD cmVhdGlvbkhhbmRsZXI7CiAKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9mb2N1c2VkRnJh bWU7CiAgICAgUmVmUHRyPFdlYkZyYW1lUHJveHk+IG1fZnJhbWVTZXRMYXJnZXN0RnJhbWU7CkBA IC0yMzI0LDYgKzIzNDEsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9uZWVkc0ZvbnRBdHRyaWJ1 dGVzIHsgZmFsc2UgfTsKICAgICBib29sIG1fbWF5SGF2ZVVuaXZlcnNhbEZpbGVSZWFkU2FuZGJv eEV4dGVuc2lvbiB7IGZhbHNlIH07CiAKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJvdmlzaW9uYWxQ YWdlUHJveHk+IG1fcHJvdmlzaW9uYWxQYWdlOworCiAjaWYgSEFWRShQRU5DSUxLSVQpCiAgICAg c3RkOjp1bmlxdWVfcHRyPEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyPiBtX2VkaXRhYmxlSW1hZ2VD b250cm9sbGVyOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQcm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1By b3h5LmNwcAppbmRleCBkYjFmZDU4YjkzZGZmNTg2NWQxM2ZjNTQxYjZlNWQ4NzQ2ZWI4ZTBhLi5k YWJlZGJjMGE3NDQxMjZiZGU2OGQ1OTQ2ZDc1MzFmZWY3NWM3NTU5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNs dWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiUGx1Z2luSW5mb1N0b3JlLmgiCiAjaW5jbHVkZSAi UGx1Z2luUHJvY2Vzc01hbmFnZXIuaCIKKyNpbmNsdWRlICJQcm92aXNpb25hbFBhZ2VQcm94eS5o IgogI2luY2x1ZGUgIlRleHRDaGVja2VyLmgiCiAjaW5jbHVkZSAiVGV4dENoZWNrZXJTdGF0ZS5o IgogI2luY2x1ZGUgIlVJTWVzc2FnZVBvcnRDaGFubmVsUHJvdmlkZXIuaCIKQEAgLTU4NCw2ICs1 ODUsMTUgQEAgYm9vbCBXZWJQcm9jZXNzUHJveHk6OmZ1bGxLZXlib2FyZEFjY2Vzc0VuYWJsZWQo KQogfQogI2VuZGlmCiAKK2Jvb2wgV2ViUHJvY2Vzc1Byb3h5OjpoYXNQcm92aXNpb25hbFBhZ2VX aXRoSUQodWludDY0X3QgcGFnZUlEKSBjb25zdAoreworICAgIGZvciAoYXV0byogcHJvdmlzaW9u YWxQYWdlIDogbV9wcm92aXNpb25hbFBhZ2VzKSB7CisgICAgICAgIGlmIChwcm92aXNpb25hbFBh Z2UtPnBhZ2UoKS5wYWdlSUQoKSA9PSBwYWdlSUQpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK KyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorCiB2b2lkIFdlYlByb2Nlc3NQcm94eTo6dXBk YXRlQmFja0ZvcndhcmRJdGVtKGNvbnN0IEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSYgaXRlbVN0 YXRlKQogewogICAgIGlmIChhdXRvKiBpdGVtID0gV2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6aXRl bUZvcklEKGl0ZW1TdGF0ZS5pZGVudGlmaWVyKSkgewpAQCAtNTkxLDcgKzYwMSw3IEBAIHZvaWQg V2ViUHJvY2Vzc1Byb3h5Ojp1cGRhdGVCYWNrRm9yd2FyZEl0ZW0oY29uc3QgQmFja0ZvcndhcmRM aXN0SXRlbVN0YXRlJiBpdGVtCiAgICAgICAgIC8vIHRoZSBiYWNrL2ZvcndhcmQgaXRlbXMgcGFn ZS4KICAgICAgICAgLy8gZS5nLiBUaGUgb2xkIHdlYiBwcm9jZXNzIGlzIG5hdmlnYXRpbmcgdG8g YWJvdXQ6YmxhbmsgZm9yIHN1c3BlbnNpb24uCiAgICAgICAgIC8vIFdlIGlnbm9yZSB0aGVzZSB1 cGRhdGVzLgotICAgICAgICBpZiAobV9wYWdlTWFwLmNvbnRhaW5zKGl0ZW0tPnBhZ2VJRCgpKSkK KyAgICAgICAgaWYgKG1fcGFnZU1hcC5jb250YWlucyhpdGVtLT5wYWdlSUQoKSkgfHwgaGFzUHJv dmlzaW9uYWxQYWdlV2l0aElEKGl0ZW0tPnBhZ2VJRCgpKSkKICAgICAgICAgICAgIGl0ZW0tPnNl dFBhZ2VTdGF0ZShpdGVtU3RhdGUucGFnZVN0YXRlKTsKICAgICB9CiB9CkBAIC03ODAsNiArNzkw LDEyIEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVuY2hpbmcoUHJvY2Vzc0xh dW5jaGVyKiBsYXVuY2hlciwgSVBDOjpDb25uZWN0CiAgICAgICAgIHBhZ2UtPnByb2Nlc3NEaWRG aW5pc2hMYXVuY2hpbmcoKTsKICAgICB9CiAKKyAgICBmb3IgKGF1dG8qIHByb3Zpc2lvbmFsUGFn ZSA6IG1fcHJvdmlzaW9uYWxQYWdlcykgeworICAgICAgICBBU1NFUlQodGhpcyA9PSAmcHJvdmlz aW9uYWxQYWdlLT5wcm9jZXNzKCkpOworICAgICAgICBwcm92aXNpb25hbFBhZ2UtPnByb2Nlc3NE aWRGaW5pc2hMYXVuY2hpbmcoKTsKKyAgICB9CisKKwogICAgIFJFTEVBU0VfQVNTRVJUKCFtX3dl YkNvbm5lY3Rpb24pOwogICAgIG1fd2ViQ29ubmVjdGlvbiA9IFdlYkNvbm5lY3Rpb25Ub1dlYlBy b2Nlc3M6OmNyZWF0ZSh0aGlzKTsKIApAQCAtODczLDcgKzg4OSw3IEBAIHZvaWQgV2ViUHJvY2Vz c1Byb3h5OjptYXliZVNodXREb3duKCkKIAogYm9vbCBXZWJQcm9jZXNzUHJveHk6OmNhblRlcm1p bmF0ZUNoaWxkUHJvY2VzcygpCiB7Ci0gICAgaWYgKCFtX3BhZ2VNYXAuaXNFbXB0eSgpIHx8IG1f cHJvY2Vzc1Bvb2wtPmhhc1N1c3BlbmRlZFBhZ2VGb3IoKnRoaXMpKQorICAgIGlmICghbV9wYWdl TWFwLmlzRW1wdHkoKSB8fCBtX3Byb2Nlc3NQb29sLT5oYXNTdXNwZW5kZWRQYWdlRm9yKCp0aGlz KSB8fCAhbV9wcm92aXNpb25hbFBhZ2VzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIGZhbHNl OwogCiAgICAgaWYgKCFtX3Byb2Nlc3NQb29sLT5zaG91bGRUZXJtaW5hdGUodGhpcykpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCmluZGV4IDc1ZjY1YTdmN2ViMWFj YzgxOTk5MWNlNGY5ZjY5ODZjOTViNjFmZjMuLjUwNDI2MzBkZTM3MWQ4NWE4MjgzNzQzNDhhYTk2 OTE3MzljOWNkNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nl c3NQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5o CkBAIC03MCw2ICs3MCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgTmV0d29ya1Byb2Nl c3NQcm94eTsKIGNsYXNzIE9iakNPYmplY3RHcmFwaDsKIGNsYXNzIFBhZ2VDbGllbnQ7CitjbGFz cyBQcm92aXNpb25hbFBhZ2VQcm94eTsKIGNsYXNzIFVzZXJNZWRpYUNhcHR1cmVNYW5hZ2VyUHJv eHk7CiBjbGFzcyBWaXNpdGVkTGlua1N0b3JlOwogY2xhc3MgV2ViQmFja0ZvcndhcmRMaXN0SXRl bTsKQEAgLTEyNCw2ICsxMjUsOSBAQCBwdWJsaWM6CiAgICAgZW51bSBjbGFzcyBFbmRzVXNpbmdE YXRhU3RvcmUgOiBib29sIHsgTm8sIFllcyB9OwogICAgIHZvaWQgcmVtb3ZlV2ViUGFnZShXZWJQ YWdlUHJveHkmLCB1aW50NjRfdCBwYWdlSUQsIEVuZHNVc2luZ0RhdGFTdG9yZSk7CiAKKyAgICB2 b2lkIGFkZFByb3Zpc2lvbmFsUGFnZVByb3h5KFByb3Zpc2lvbmFsUGFnZVByb3h5JiBwcm92aXNp b25hbFBhZ2UpIHsgQVNTRVJUKCFtX3Byb3Zpc2lvbmFsUGFnZXMuY29udGFpbnMoJnByb3Zpc2lv bmFsUGFnZSkpOyBtX3Byb3Zpc2lvbmFsUGFnZXMuYWRkKCZwcm92aXNpb25hbFBhZ2UpOyB9Cisg ICAgdm9pZCByZW1vdmVQcm92aXNpb25hbFBhZ2VQcm94eShQcm92aXNpb25hbFBhZ2VQcm94eSYg cHJvdmlzaW9uYWxQYWdlKSB7IEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFnZXMuY29udGFpbnMoJnBy b3Zpc2lvbmFsUGFnZSkpOyBtX3Byb3Zpc2lvbmFsUGFnZXMucmVtb3ZlKCZwcm92aXNpb25hbFBh Z2UpOyB9CisKICAgICB0eXBlbmFtZSBXZWJQYWdlUHJveHlNYXA6OlZhbHVlc0NvbnN0SXRlcmF0 b3JSYW5nZSBwYWdlcygpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZU1hcC52YWx1ZXMoKTsgfQogICAg IHVuc2lnbmVkIHBhZ2VDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZU1hcC5zaXplKCk7IH0K ICAgICB1bnNpZ25lZCB2aXNpYmxlUGFnZUNvdW50KCkgY29uc3QgeyByZXR1cm4gbV92aXNpYmxl UGFnZUNvdW50ZXIudmFsdWUoKTsgfQpAQCAtMzMwLDYgKzMzNCw4IEBAIHByaXZhdGU6CiAKICAg ICB2b2lkIGxvZ0RpYWdub3N0aWNNZXNzYWdlRm9yUmVzb3VyY2VMaW1pdFRlcm1pbmF0aW9uKGNv bnN0IFN0cmluZyYgbGltaXRLZXkpOwogCisgICAgYm9vbCBoYXNQcm92aXNpb25hbFBhZ2VXaXRo SUQodWludDY0X3QgcGFnZUlEKSBjb25zdDsKKwogICAgIGVudW0gY2xhc3MgSXNXZWFrIHsgTm8s IFllcyB9OwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGNsYXNzIFdlYWtPclN0cm9uZ1B0ciB7 CiAgICAgcHVibGljOgpAQCAtMzczLDYgKzM3OSw3IEBAIHByaXZhdGU6CiAKICAgICBXZWJQYWdl UHJveHlNYXAgbV9wYWdlTWFwOwogICAgIFdlYkZyYW1lUHJveHlNYXAgbV9mcmFtZU1hcDsKKyAg ICBIYXNoU2V0PFByb3Zpc2lvbmFsUGFnZVByb3h5Kj4gbV9wcm92aXNpb25hbFBhZ2VzOwogICAg IFVzZXJJbml0aWF0ZWRBY3Rpb25NYXAgbV91c2VySW5pdGlhdGVkQWN0aW9uTWFwOwogCiAgICAg SGFzaFNldDxWaXNpdGVkTGlua1N0b3JlKj4gbV92aXNpdGVkTGlua1N0b3JlczsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3Vy Y2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IGRlZGJhZGNj ZDM0ZjBhNDM0ZDZkZTE0NTRjNDRhOTg5MjJjYTAxY2QuLmQ3ZGEyN2EwNTEyODllN2U1MWY0OGUy YzllY2E3OWZhODkxMTI0NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagpAQCAtMzA3MCw2ICszMDcwLDggQEAKIAkJNDY2QkMwMzgxRkEyNjZD OTAwMkZBOUMxIC8qIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9u LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDY2QkMwMzkxRkEyNjZDOTAwMkZB OUMxIC8qIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmggKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmMuaDsgcGF0aCA9IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmg7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ2NkJDMDNBMUZBMjY2QzkwMDJGQTlDMSAvKiBXZWJTV0Nv bnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5tZXNzYWdlcy5pbiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7IHBhdGgg PSBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5tZXNzYWdlcy5pbjsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKKwkJNDY4MzU2OUEyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFs UGFnZVByb3h5LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFByb3Zpc2lvbmFs UGFnZVByb3h5Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTQ2ODM1NjlCMjFFODFD QzcwMDZFMjdBMyAvKiBQcm92aXNpb25hbFBhZ2VQcm94eS5jcHAgKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmNwcC5jcHA7IHBhdGggPSBQcm92aXNpb25hbFBhZ2VQcm94eS5jcHA7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCTQ2QTJCNjA2MUU1Njc1QTIwMEMzREVEQSAvKiBCYWNrZ3JvdW5k UHJvY2Vzc1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAu Y3BwOyBwYXRoID0gQmFja2dyb3VuZFByb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVyLmNwcDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDZBMkI2MDcxRTU2NzVBMjAwQzNERURBIC8qIEJh Y2tncm91bmRQcm9jZXNzUmVzcG9uc2l2ZW5lc3NUaW1lci5oICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jLmg7IHBhdGggPSBCYWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVuZXNzVGltZXIuaDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDZERjA2MzkxRjM5MDVFNTAwMTk4MEJCIC8qIE5l dHdvcmtDT1JTUHJlZmxpZ2h0Q2hlY2tlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5j cHA7IHBhdGggPSBOZXR3b3JrQ09SU1ByZWZsaWdodENoZWNrZXIuY3BwOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwpAQCAtNzMxMiw2ICs3MzE0LDggQEAKIAkJCQk4NkU2N0EyMjE5MEY0MTE4 MDAwMDRBQjcgLyogUHJvY2Vzc1Rocm90dGxlci5jcHAgKi8sCiAJCQkJODZFNjdBMjExOTBGNDEx ODAwMDA0QUI3IC8qIFByb2Nlc3NUaHJvdHRsZXIuaCAqLywKIAkJCQk4MzA0OEFFNTFBQ0E0NURD MDA4MkM4MzIgLyogUHJvY2Vzc1Rocm90dGxlckNsaWVudC5oICovLAorCQkJCTQ2ODM1NjlCMjFF ODFDQzcwMDZFMjdBMyAvKiBQcm92aXNpb25hbFBhZ2VQcm94eS5jcHAgKi8sCisJCQkJNDY4MzU2 OUEyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmggKi8sCiAJCQkJQTU1 QkE4MUIxQkEyNUIxRTAwN0NEMzNEIC8qIFJlbW90ZVdlYkluc3BlY3RvclByb3h5LmNwcCAqLywK IAkJCQlBNTVCQTgxOTFCQTI1QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2ViSW5zcGVjdG9yUHJveHku aCAqLywKIAkJCQlBNTVCQTgxQTFCQTI1QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2ViSW5zcGVjdG9y UHJveHkubWVzc2FnZXMuaW4gKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJGcmFtZS5jcHAKaW5kZXggMDA3NDliNDc3YTI0Y2U4Y2NjODI1MDFkOTRlMDhiNjBlZTFh NjI2My4uZmZlZDAwYzgyMDZhOTRmMGU0ZmZjN2ZmM2E4YTlkZmY4NjEzZmFjOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcApAQCAtMjYzLDggKzI2 Myw2IEBAIHN0YXRpYyBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gdG9Qb2xpY3lBY3Rpb24oV2ViUG9s aWN5QWN0aW9uIHBvbGljeUFjdGlvbikKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6OlBvbGljeUFj dGlvbjo6SWdub3JlOwogICAgIGNhc2UgV2ViUG9saWN5QWN0aW9uOjpEb3dubG9hZDoKICAgICAg ICAgcmV0dXJuIFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6RG93bmxvYWQ7Ci0gICAgY2FzZSBXZWJQ b2xpY3lBY3Rpb246OlN1c3BlbmQ6Ci0gICAgICAgIGJyZWFrOwogICAgIH0KICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKICAgICByZXR1cm4gV2ViQ29yZTo6UG9saWN5QWN0aW9uOjpJZ25vcmU7 CkBAIC0yNzIsMTEgKzI3MCw4IEBAIHN0YXRpYyBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gdG9Qb2xp Y3lBY3Rpb24oV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbikKIAogdm9pZCBXZWJGcmFtZTo6 ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKHVpbnQ2NF90IGxpc3RlbmVySUQsIFdlYlBvbGljeUFj dGlvbiBhY3Rpb24sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgRG93bmxvYWRJRCBkb3dubG9hZElE LCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKIHsKLSAg ICBpZiAoIW1fY29yZUZyYW1lIHx8ICFtX3BvbGljeUxpc3RlbmVySUQgfHwgbGlzdGVuZXJJRCAh PSBtX3BvbGljeUxpc3RlbmVySUQgfHwgIW1fcG9saWN5RnVuY3Rpb24pIHsKLSAgICAgICAgaWYg KGFjdGlvbiA9PSBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQpCi0gICAgICAgICAgICBwYWdlKCkt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJvY2Vz c1N3YXAoKSk7CisgICAgaWYgKCFtX2NvcmVGcmFtZSB8fCAhbV9wb2xpY3lMaXN0ZW5lcklEIHx8 IGxpc3RlbmVySUQgIT0gbV9wb2xpY3lMaXN0ZW5lcklEIHx8ICFtX3BvbGljeUZ1bmN0aW9uKQog ICAgICAgICByZXR1cm47Ci0gICAgfQogCiAgICAgRnJhbWVQb2xpY3lGdW5jdGlvbiBmdW5jdGlv biA9IFdURk1vdmUobV9wb2xpY3lGdW5jdGlvbik7CiAgICAgYm9vbCBmb3JOYXZpZ2F0aW9uQWN0 aW9uID0gbV9wb2xpY3lGdW5jdGlvbkZvck5hdmlnYXRpb25BY3Rpb24gPT0gRm9yTmF2aWdhdGlv bkFjdGlvbjo6WWVzOwpAQCAtMjkyLDE2ICsyODcsNyBAQCB2b2lkIFdlYkZyYW1lOjpkaWRSZWNl aXZlUG9saWN5RGVjaXNpb24odWludDY0X3QgbGlzdGVuZXJJRCwgV2ViUG9saWN5QWN0aW9uIGFj dAogICAgICAgICAgICAgZG9jdW1lbnRMb2FkZXItPnNldE5hdmlnYXRpb25JRChuYXZpZ2F0aW9u SUQpOwogICAgIH0KIAotICAgIGJvb2wgc2hvdWxkU3VzcGVuZCA9IGZhbHNlOwotICAgIGlmIChh Y3Rpb24gPT0gV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kKSB7Ci0gICAgICAgIHNob3VsZFN1c3Bl bmQgPSB0cnVlOwotICAgICAgICBhY3Rpb24gPSBXZWJQb2xpY3lBY3Rpb246Oklnbm9yZTsKLSAg ICB9Ci0KICAgICBmdW5jdGlvbih0b1BvbGljeUFjdGlvbihhY3Rpb24pKTsKLQotICAgIGlmIChz aG91bGRTdXNwZW5kKQotICAgICAgICBwYWdlKCktPnN1c3BlbmRGb3JQcm9jZXNzU3dhcCgpOwog fQogCiB2b2lkIFdlYkZyYW1lOjpzdGFydERvd25sb2FkKGNvbnN0IFdlYkNvcmU6OlJlc291cmNl UmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWROYW1lKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCA4MDNiYThiOTk1ZWQz ZWM4MzFhYjQ2YjUzOTdjNzY2MmU2YTgxYzY1Li4xMGU1YTc3MjMzYzk1NzY4MTJhMzA5N2UwODNh MTVmOTAwZmRlYmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcApAQCAtNDAxLDcgKzQwMSw3IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFn ZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICAsIG1fb3Zl cnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgeyBwYXJhbWV0ZXJzLm92ZXJyaWRlQ29udGVudFNl Y3VyaXR5UG9saWN5IH0KICAgICAsIG1fY3B1TGltaXQocGFyYW1ldGVycy5jcHVMaW1pdCkKICNp ZiBQTEFURk9STShNQUMpCi0gICAgLCBtX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdlVHJh bnNpdGlvbihwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQpCisgICAgLCBtX3Nob3VsZEF0 dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNpdGlvbihwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXAp CiAjZW5kaWYKIHsKICAgICBBU1NFUlQobV9wYWdlSUQpOwpAQCAtNDcxLDggKzQ3MSw4IEBAIFdl YlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz JiYgcGFyYW1ldGVycykKICAgICBtX2RyYXdpbmdBcmVhLT5zZXRQYWludGluZ0VuYWJsZWQoZmFs c2UpOwogICAgIG1fZHJhd2luZ0FyZWEtPnNldFNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQo cGFyYW1ldGVycy5zaG91bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50KTsKIAotICAgIGlmIChwYXJh bWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQpCi0gICAgICAgIGZyZWV6ZUxheWVyVHJlZShMYXll clRyZWVGcmVlemVSZWFzb246OlN3YXBGcm9tU3VzcGVuZGVkKTsKKyAgICBpZiAocGFyYW1ldGVy cy5pc1Byb2Nlc3NTd2FwKQorICAgICAgICBmcmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJlZXpl UmVhc29uOjpQcm9jZXNzU3dhcCk7CiAKICNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKQogICAg IG1fdXNlQXN5bmNTY3JvbGxpbmcgPSBwYXJhbWV0ZXJzLnN0b3JlLmdldEJvb2xWYWx1ZUZvcktl eShXZWJQcmVmZXJlbmNlc0tleTo6dGhyZWFkZWRTY3JvbGxpbmdFbmFibGVkS2V5KCkpOwpAQCAt Njk2LDcgKzY5Niw3IEBAIHZvaWQgV2ViUGFnZTo6cmVpbml0aWFsaXplV2ViUGFnZShXZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICAgICAgbV9kcmF3aW5nQXJlYS0+ dXBkYXRlUHJlZmVyZW5jZXMocGFyYW1ldGVycy5zdG9yZSk7CiAgICAgICAgIG1fZHJhd2luZ0Fy ZWEtPnNldFBhaW50aW5nRW5hYmxlZCh0cnVlKTsKICNpZiBQTEFURk9STShNQUMpCi0gICAgICAg IG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uID0gcGFyYW1ldGVycy5p c1N3YXBGcm9tU3VzcGVuZGVkOworICAgICAgICBtX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25Q YWdlVHJhbnNpdGlvbiA9IHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcDsKICNlbmRpZgogICAgICAg ICB1bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlBhZ2VTdXNwZW5kZWQp OwogICAgIH0KQEAgLTMwNTMsMTIgKzMwNTMsNiBAQCB2b2lkIFdlYlBhZ2U6OmRpZFJlY2VpdmVQ b2xpY3lEZWNpc2lvbih1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBsaXN0ZW5lcklELCBXZQog ICAgIFdlYkZyYW1lKiBmcmFtZSA9IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLndlYkZyYW1lKGZy YW1lSUQpOwogICAgIGlmICghZnJhbWUpCiAgICAgICAgIHJldHVybjsKLSAgICBpZiAocG9saWN5 QWN0aW9uID09IFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZCkgewotICAgICAgICBBU1NFUlQoZnJh bWUgPT0gbV9tYWluRnJhbWUpOwotICAgICAgICBzZXRJc1N1c3BlbmRlZCh0cnVlKTsKLQotICAg ICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5zZW5kUHJld2FybUluZm9ybWF0aW9uKG1haW5X ZWJGcmFtZSgpLT51cmwoKSk7Ci0gICAgfQogICAgIGZyYW1lLT5kaWRSZWNlaXZlUG9saWN5RGVj aXNpb24obGlzdGVuZXJJRCwgcG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uSUQsIGRvd25sb2FkSUQs IFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiB9CiAKQEAgLTMxMDAsNyArMzA5NCw3IEBAIHZv aWQgV2ViUGFnZTo6ZGlkQ29tcGxldGVQYWdlVHJhbnNpdGlvbigpCiAKICAgICBib29sIGlzSW5p dGlhbEVtcHR5RG9jdW1lbnQgPSAhbV9tYWluRnJhbWU7CiAgICAgaWYgKCFpc0luaXRpYWxFbXB0 eURvY3VtZW50KQotICAgICAgICB1bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFz b246OlN3YXBGcm9tU3VzcGVuZGVkKTsKKyAgICAgICAgdW5mcmVlemVMYXllclRyZWUoTGF5ZXJU cmVlRnJlZXplUmVhc29uOjpQcm9jZXNzU3dhcCk7CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAg aWYgKG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uICYmICFpc0luaXRp YWxFbXB0eURvY3VtZW50KSB7CkBAIC02MzEyLDYgKzYzMDYsMTAgQEAgdm9pZCBXZWJQYWdlOjpz ZXRJc1N1c3BlbmRlZChib29sIHN1c3BlbmRlZCkKICAgICBpZiAobV9pc1N1c3BlbmRlZCkgewog ICAgICAgICAvLyBVbmZyb3plbiBvbiBkcmF3aW5nIGFyZWEgcmVzZXQuCiAgICAgICAgIGZyZWV6 ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlBhZ2VTdXNwZW5kZWQpOworCisgICAg ICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnNlbmRQcmV3YXJtSW5mb3JtYXRpb24obWFpbldl YkZyYW1lKCktPnVybCgpKTsKKworICAgICAgICBzdXNwZW5kRm9yUHJvY2Vzc1N3YXAoKTsKICAg ICB9IGVsc2UKICAgICAgICAgbV9zaG91bGRSZXNldERyYXdpbmdBcmVhQWZ0ZXJTdXNwZW5kID0g dHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRl eCA3MTVlMTI0NTIwZmYwNzZiOTYwYWVkNzBlOWI5MjA3NWE2NTUyYWVmLi5mM2I5MzRlMjdkYTlk NWVhNWExYmJmNTVmMTQ5ZjVhODUxMjczNmU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC02OTYsNyArNjk2LDcgQEAgcHVibGljOgogICAgICAgICBQ cm9jZXNzU3VzcGVuZGVkICAgICAgICA9IDEgPDwgMiwKICAgICAgICAgUGFnZVN1c3BlbmRlZCAg ICAgICAgICAgPSAxIDw8IDMsCiAgICAgICAgIFByaW50aW5nICAgICAgICAgICAgICAgID0gMSA8 PCA0LAotICAgICAgICBTd2FwRnJvbVN1c3BlbmRlZCAgICAgICA9IDEgPDwgNSwKKyAgICAgICAg UHJvY2Vzc1N3YXAgICAgICAgICAgICAgPSAxIDw8IDUsCiAgICAgfTsKICAgICB2b2lkIGZyZWV6 ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb24pOwogICAgIHZvaWQgdW5mcmVlemVMYXll clRyZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29uKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbSBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25E cmF3aW5nQXJlYS5tbQppbmRleCA5MWFkNzFhZGUxYjdkYjRmOWRjZTY0ZDRmMzMwNDY3YjIyYjgz M2NjLi44M2I2NTk5MjcwYjUxYzdiYjE4ZWZlNzM3YTU5MmUwMjU3MWEyODA2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9u RHJhd2luZ0FyZWEubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFj L1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCkBAIC05Nyw3ICs5Nyw3IEBAIFRpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYShX ZWJQYWdlJiB3ZWJQYWdlLCBjCiAgICAgdXBkYXRlTGF5ZXJIb3N0aW5nQ29udGV4dCgpOwogICAg IHNldENvbG9yU3BhY2UocGFyYW1ldGVycy5jb2xvclNwYWNlKTsKIAotICAgIGlmICghcGFyYW1l dGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKQorICAgIGlmICghcGFyYW1ldGVycy5pc1Byb2Nlc3NT d2FwKQogICAgICAgICBhdHRhY2goKTsKIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9n IGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDlhMjYyNDA0YmVjZGE1ZjE5OWYzMTFhY2UyMGVlMTM0 MzNiMTczNTcuLjMyNDlmNDNlMzZiOGU5ZjU0OTQ3MmQ5MjA0YjJjNjgxZTJhNjllMDAgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NiBAQAorMjAxOS0wMS0xNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAg ICAgIFJlZ3Jlc3Npb24oUFNPTikgVmlldyBiZWNvbWVzIGJsYW5rIGFmdGVyIGNsaWNrIGEgY3Jv c3Mtc2l0ZSBkb3dubG9hZCBsaW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTMzNjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBBUEkg dGVzdCBjb3ZlcmFnZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW06CisgICAgICAgICgtW1BTT05OYXZpZ2F0aW9u RGVsZWdhdGUgd2ViVmlldzpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2U6ZGVjaXNp b25IYW5kbGVyOl0pOgorCiAyMDE5LTAxLTE1ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0xGQ10gVXNlIHRoZSBjb250YWluaW5nIGJsb2NrJ3MgcGFkZGluZyBi b3ggdG8gcG9zaXRpb24gb3V0LW9mLWZsb3cgZWxlbWVudHMuCmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1t IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2 aWdhdGlvbi5tbQppbmRleCBmMzVkOGJhYTM1M2YwNzAyNGZkNDBlN2Q1Mjc0NTNhNzQyMTBjM2Jh Li5kNWJkNWVjNzc2YmQ1ZTE3YjBiZDljOTQwMDJjY2I1NDQ3Y2E1ZDA4IDEwMDY0NAotLS0gYS9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0 aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vz c1N3YXBPbk5hdmlnYXRpb24ubW0KQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChD KSAyMDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykg MjAxNy0yMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3Ry aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv dXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucwpAQCAtNzIsNiArNzIsNyBAQCBzdGF0aWMgYm9vbCBzZXJ2ZXJSZWRp cmVjdGVkOwogc3RhdGljIEhhc2hTZXQ8cGlkX3Q+IHNlZW5QSURzOwogc3RhdGljIGJvb2wgd2ls bFBlcmZvcm1DbGllbnRSZWRpcmVjdDsKIHN0YXRpYyBib29sIGRpZFBlcmZvcm1DbGllbnRSZWRp cmVjdDsKK3N0YXRpYyBib29sIHNob3VsZENvbnZlcnRUb0Rvd25sb2FkOwogc3RhdGljIFJldGFp blB0cjxOU1VSTD4gY2xpZW50UmVkaXJlY3RTb3VyY2VVUkw7CiBzdGF0aWMgUmV0YWluUHRyPE5T VVJMPiBjbGllbnRSZWRpcmVjdERlc3RpbmF0aW9uVVJMOwogCkBAIC0xMjgsNiArMTI5LDExIEBA IC0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uOihXS05hdmlnYXRpCiAgICAgZGlkUmVwb25kVG9Qb2xpY3lEZWNpc2lvbkNh bGwgPSB0cnVlOwogfQogCistICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVj aWRlUG9saWN5Rm9yTmF2aWdhdGlvblJlc3BvbnNlOihXS05hdmlnYXRpb25SZXNwb25zZSAqKW5h dmlnYXRpb25SZXNwb25zZSBkZWNpc2lvbkhhbmRsZXI6KHZvaWQgKF4pKFdLTmF2aWdhdGlvblJl c3BvbnNlUG9saWN5KSlkZWNpc2lvbkhhbmRsZXIKK3sKKyAgICBkZWNpc2lvbkhhbmRsZXIoc2hv dWxkQ29udmVydFRvRG93bmxvYWQgPyBfV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3lCZWNvbWVE b3dubG9hZCA6IFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5QWxsb3cpOworfQorCiAtICh2b2lk KXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9y UHJvdmlzaW9uYWxOYXZpZ2F0aW9uOihXS05hdmlnYXRpb24gKiluYXZpZ2F0aW9uCiB7CiAgICAg c2VlblBJRHMuYWRkKFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0pOwpAQCAtMTQwNSw3 ICsxNDExLDcgQEAgVEVTVChQcm9jZXNzU3dhcCwgU2VydmVyUmVkaXJlY3QpCiAKICAgICBFWFBF Q1RfRkFMU0Uoc2VydmVyUmVkaXJlY3RlZCk7CiAgICAgRVhQRUNUX0VRKDMsIG51bWJlck9mRGVj aWRlUG9saWN5Q2FsbHMpOwotICAgIEVYUEVDVF9FUSgydSwgc2VlblBJRHMuc2l6ZSgpKTsKKyAg ICBFWFBFQ1RfRVEoM3UsIHNlZW5QSURzLnNpemUoKSk7CiB9CiAKIFRFU1QoUHJvY2Vzc1N3YXAs IFNlcnZlclJlZGlyZWN0MikKQEAgLTE0NjcsNiArMTQ3MywxMDkgQEAgVEVTVChQcm9jZXNzU3dh cCwgU2VydmVyUmVkaXJlY3QyKQogICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Vi a2l0Lm9yZy9tYWluMS5odG1sIiwgW1t3ZWJWaWV3IFVSTF0gYWJzb2x1dGVTdHJpbmddKTsKIH0K IAorc3RhdGljIGNvbnN0IGNoYXIqIGxpbmtUb1dlYktpdEJ5dGVzID0gUiJQU09OUkVTT1VSQ0Uo Cis8Ym9keT4KKyAgPGEgaWQ9InRlc3RMaW5rIiBocmVmPSJwc29uOi8vd3d3LndlYmtpdC5vcmcv bWFpbi5odG1sIj5MaW5rPC9hPgorPC9ib2R5PgorKVBTT05SRVNPVVJDRSI7CisKK1RFU1QoUHJv Y2Vzc1N3YXAsIFBvbGljeUNhbmNlbEFmdGVyU2VydmVyUmVkaXJlY3QpCit7CisgICAgYXV0byBw cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1 cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgp LnByb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbiA9IFlFUzsKKyAgICBhdXRvIHByb2Nlc3NQb29sID0g YWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJv Y2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpXSk7CisKKyAgICBhdXRvIHdlYlZpZXdDb25maWd1 cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsK KyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0 KCldOworICAgIGF1dG8gaGFuZGxlciA9IGFkb3B0TlMoW1tQU09OU2NoZW1lIGFsbG9jXSBpbml0 XSk7CisgICAgW2hhbmRsZXIgYWRkTWFwcGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3Lmdv b2dsZS5jb20vbWFpbi5odG1sIiB0b0RhdGE6bGlua1RvV2ViS2l0Qnl0ZXNdOworICAgIFtoYW5k bGVyIGFkZFJlZGlyZWN0RnJvbVVSTFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWlu Lmh0bWwiIHRvVVJMU3RyaW5nOkAicHNvbjovL3d3dy5hcHBsZS5jb20vaWdub3JlLmh0bWwiXTsK KyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdl dCgpIGZvclVSTFNjaGVtZTpAInBzb24iXTsKKworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMo W1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYw MCkgY29uZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIGF1dG8g bmF2aWdhdGlvbkRlbGVnYXRlID0gYWRvcHROUyhbW1BTT05OYXZpZ2F0aW9uRGVsZWdhdGUgYWxs b2NdIGluaXRdKTsKKyAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6bmF2aWdhdGlv bkRlbGVnYXRlLmdldCgpXTsKKworICAgIG5hdmlnYXRpb25EZWxlZ2F0ZS0+ZGVjaWRlUG9saWN5 Rm9yTmF2aWdhdGlvbkFjdGlvbiA9IF4oV0tOYXZpZ2F0aW9uQWN0aW9uICphY3Rpb24sIHZvaWQg KF5kZWNpc2lvbkhhbmRsZXIpKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSkpIHsKKyAgICAgICAg aWYgKFthY3Rpb24ucmVxdWVzdC5VUkwuYWJzb2x1dGVTdHJpbmcgaGFzU3VmZml4OkAiaWdub3Jl Lmh0bWwiXSkgeworICAgICAgICAgICAgZGVjaXNpb25IYW5kbGVyKFdLTmF2aWdhdGlvbkFjdGlv blBvbGljeUNhbmNlbCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAg ZGVjaXNpb25IYW5kbGVyKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeUFsbG93KTsKKyAgICB9Owor CisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVS TDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwi XV07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0 QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKyAgICBhdXRvIHBpZEFm dGVyRmlyc3RMb2FkID0gW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKworICAgIEVY UEVDVF9FUSgxLCBudW1iZXJPZkRlY2lkZVBvbGljeUNhbGxzKTsKKworICAgIFt3ZWJWaWV3IGV2 YWx1YXRlSmF2YVNjcmlwdDpAInRlc3RMaW5rLmNsaWNrKCkiIGNvbXBsZXRpb25IYW5kbGVyOm5p bF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmZhaWxlZCk7CisgICAgZmFpbGVk ID0gZmFsc2U7CisgICAgZG9uZSA9IGZhbHNlOworCisgICAgRVhQRUNUX0VRKDMsIG51bWJlck9m RGVjaWRlUG9saWN5Q2FsbHMpOworCisgICAgLy8gV2Ugc2hvdWxkIHN0aWxsIGJlIG9uIGdvb2ds ZS5jb20uCisgICAgRVhQRUNUX0VRKHBpZEFmdGVyRmlyc3RMb2FkLCBbd2ViVmlldyBfd2ViUHJv Y2Vzc0lkZW50aWZpZXJdKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lmdvb2ds ZS5jb20vbWFpbi5odG1sIiwgW1t3ZWJWaWV3IFVSTF0gYWJzb2x1dGVTdHJpbmddKTsKKworICAg IFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAInRlc3RMaW5rLmlubmVyVGV4dCIgY29tcGxl dGlvbkhhbmRsZXI6IFsmXSAoaWQgaW5uZXJUZXh0LCBOU0Vycm9yICplcnJvcikgeworICAgICAg ICBFWFBFQ1RfV0tfU1RSRVEoQCJMaW5rIiwgaW5uZXJUZXh0KTsKKyAgICAgICAgZG9uZSA9IHRy dWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBk b25lID0gZmFsc2U7Cit9CisKK1RFU1QoUHJvY2Vzc1N3YXAsIENyb3NzU2l0ZURvd25sb2FkKQor eworICAgIGF1dG8gcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW19XS1Byb2Nl c3NQb29sQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIHByb2Nlc3NQb29sQ29uZmln dXJhdGlvbi5nZXQoKS5wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb24gPSBZRVM7CisgICAgYXV0byBw cm9jZXNzUG9vbCA9IGFkb3B0TlMoW1tXS1Byb2Nlc3NQb29sIGFsbG9jXSBfaW5pdFdpdGhDb25m aWd1cmF0aW9uOnByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKV0pOworCisgICAgYXV0byB3 ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFs bG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFByb2Nlc3NQb29sOnBy b2Nlc3NQb29sLmdldCgpXTsKKyAgICBhdXRvIGhhbmRsZXIgPSBhZG9wdE5TKFtbUFNPTlNjaGVt ZSBhbGxvY10gaW5pdF0pOworICAgIFtoYW5kbGVyIGFkZE1hcHBpbmdGcm9tVVJMU3RyaW5nOkAi cHNvbjovL3d3dy5nb29nbGUuY29tL21haW4uaHRtbCIgdG9EYXRhOmxpbmtUb1dlYktpdEJ5dGVz XTsKKyAgICBbaGFuZGxlciBhZGRNYXBwaW5nRnJvbVVSTFN0cmluZzpAInBzb246Ly93d3cud2Vi a2l0Lm9yZy9tYWluLmh0bWwiIHRvRGF0YToiSGVsbG8iXTsKKyAgICBbd2ViVmlld0NvbmZpZ3Vy YXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAInBz b24iXTsKKworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGlu aXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3ZWJW aWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIGF1dG8gbmF2aWdhdGlvbkRlbGVnYXRlID0g YWRvcHROUyhbW1BTT05OYXZpZ2F0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2Vi VmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6bmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpXTsKKwor ICAgIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6 W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1sIl1d OworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworCisgICAgVGVzdFdlYktpdEFQ STo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisgICAgYXV0byBwaWRBZnRl ckZpcnN0TG9hZCA9IFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl07CisKKyAgICBzaG91 bGRDb252ZXJ0VG9Eb3dubG9hZCA9IHRydWU7CisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2Ny aXB0OkAidGVzdExpbmsuY2xpY2soKSIgY29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKworICAgIFRl c3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmFpbGVkKTsKKyAgICBmYWlsZWQgPSBmYWxzZTsKKyAg ICBzaG91bGRDb252ZXJ0VG9Eb3dubG9hZCA9IGZhbHNlOworCisgICAgLy8gV2Ugc2hvdWxkIHN0 aWxsIGJlIG9uIGdvb2dsZS5jb20uCisgICAgRVhQRUNUX0VRKHBpZEFmdGVyRmlyc3RMb2FkLCBb d2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJw c29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1sIiwgW1t3ZWJWaWV3IFVSTF0gYWJzb2x1dGVT dHJpbmddKTsKKworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAInRlc3RMaW5rLmlu bmVyVGV4dCIgY29tcGxldGlvbkhhbmRsZXI6IFsmXSAoaWQgaW5uZXJUZXh0LCBOU0Vycm9yICpl cnJvcikgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJMaW5rIiwgaW5uZXJUZXh0KTsKKyAg ICAgICAgZG9uZSA9IHRydWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVu KCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7Cit9CisKIGVudW0gY2xhc3MgU2hvdWxkRW5hYmxl UFNPTiB7IE5vLCBZZXMgfTsKIHN0YXRpYyB2b2lkIHJ1bkNsaWVudFNpZGVSZWRpcmVjdFRlc3Qo U2hvdWxkRW5hYmxlUFNPTiBzaG91bGRFbmFibGVQU09OKQogewpAQCAtMjIzMiwxMiArMjM0MSwy NyBAQCBURVNUKFByb2Nlc3NTd2FwLCBQYWdlU2hvd0hpZGUpCiAKICAgICBFWFBFQ1RfRVEoN3Us IFtyZWNlaXZlZE1lc3NhZ2VzIGNvdW50XSk7CiAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjov L3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IE5PVCBwZXJzaXN0ZWQiLCByZWNl aXZlZE1lc3NhZ2VzLmdldCgpWzBdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3 LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNz YWdlcy5nZXQoKVsxXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5j b20vbWFpbi5odG1sIC0gcGFnZXNob3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMu Z2V0KClbMl0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21h aW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10p OwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwg LSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKLSAgICBF WFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhp ZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7Ci0gICAgRVhQRUNUX1dL X1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lz dGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7CisgICAgaWYgKFtyZWNlaXZlZE1lc3Nh Z2VzLmdldCgpWzFdIGhhc1ByZWZpeDpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwi XSkgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFp bi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7 CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRt bCAtIHBhZ2VzaG93IE5PVCBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsK KyAgICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxl LmNvbS9tYWluLmh0bWwgLSBwYWdlc2hvdyBOT1QgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdl cy5nZXQoKVsxXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0 Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdl dCgpWzJdKTsKKyAgICB9CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdIGhhc1By ZWZpeDpAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVD VF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBl cnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10pOworICAgICAgICBFWFBFQ1RfV0tf U1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lz dGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs0XSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAg RVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2Vz aG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10pOworICAgICAgICBFWFBF Q1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlaGlkZSBw ZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKKyAgICB9CisgICAgaWYgKFty ZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdIGhhc1ByZWZpeDpAInBzb246Ly93d3cud2Via2l0Lm9y Zy9tYWluLmh0bWwiXSkgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lndl YmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdl cy5nZXQoKVs1XSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUu Y29tL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0 KClbNl0pOworICAgIH0gZWxzZSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93 d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVz c2FnZXMuZ2V0KClbNV0pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lndl YmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdl cy5nZXQoKVs2XSk7CisgICAgfQogfQogCiAvLyBEaXNhYmxpbmcgdGhlIHBhZ2UgY2FjaGUgZXhw bGljaXRseSBpcyAoZm9yIHNvbWUgcmVhc29uKSBub3QgYXZhaWxhYmxlIG9uIGlPUy4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCAwNGE4Njg2NmVhNjAwZDIwMTAyOTFhYmZiYjk0YjM3MjFkNTlkYTU0Li4zNGM1Mjg2ZDMwNWEz YWZkNjg1NTI1MjA4MWUyODRjNDU3NDEwNTAzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTkt MDEtMTUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZWdyZXNz aW9uKFBTT04pIFZpZXcgYmVjb21lcyBibGFuayBhZnRlciBjbGljayBhIGNyb3NzLXNpdGUgZG93 bmxvYWQgbGluaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTkzMzYxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NzA5OTU3Mz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTa2lwIHRlc3QgdGVzdGluZyB0 aGUgY3Jvc3MtcHJvY2VzcyBET01XaW5kb3cgQVBJIGFzIEkgYnJva2UgaXQgd2l0aCB0aGlzIHBh dGNoLgorICAgICAgICBUaGUgZmVhdHVyZSBpcyBmYXIgZnJvbSByZWFkeSBhbmQgb2ZmIGJ5IGRl ZmF1bHQgYW55d2F5LiBJIHdpbGwgYWRkIHN1cHBvcnQgYmFjaworICAgICAgICBpbiBhIGZvbGxv dy11cC4KKworICAgICAgICAqIHBsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDE5 LTAxLTE1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIg SW5zcGVjdG9yOiBBdWRpdDogcHJvdmlkZSBhIHdheSB0byBkZXRlcm1pbmUgd2hldGhlciBhIGdp dmUgbm9kZSBoYXMgZXZlbnQgbGlzdGVuZXJzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0 RXhwZWN0YXRpb25zCmluZGV4IDhlOTU5ZWRhZmZkODkyN2VmOWMyYWFjMzE2ZTllMzEwMGNkMTQw Y2IuLjlkOTBiZThiNDhlNTdjOTYwYmNkYTY4NmNlMjQ0MGQ3MTM4YmIwZjYgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRl c3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zCkBAIC03MzMsOCArNzMzLDggQEAgaHR0 cC90ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL3JlbW92ZS1ibG9ja2luZy1pbi1yZWRpcmVj dC5odG1sIFsgU2tpcCBdCiBodHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0YXRpc3RpY3Mvbm9uLXBy ZXZhbGVudC1yZXNvdXJjZXMtY2FuLWFjY2Vzcy1jb29raWVzLWluLWEtdGhpcmQtcGFydHktY29u dGV4dC5odG1sIFsgU2tpcCBdCiBodHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0YXRpc3RpY3MvY2Fw LWNhY2hlLW1heC1hZ2UtZm9yLXByZXZhbGVudC1yZXNvdXJjZS5odG1sIFsgU2tpcCBdCiAKLSMg UHJvY2VzcyBzd2FwcGluZyBpcyBvbmx5IGltcGxlbWVudGVkIG9uIFdlYktpdDIuCi1odHRwL3Rl c3RzL25hdmlnYXRpb24vcHJvY2Vzcy1zd2FwLXdpbmRvdy1vcGVuLmh0bWwgWyBQYXNzIF0KKyMg VGhpcyBmZWF0dXJlIGlzIGN1cnJlbnRseSBkaXNhYmxlZCBieSBkZWZhdWx0IGFuZCB1bmZpbmlz aGVkIDxyZGFyOi8vcHJvYmxlbS8zODkyNTA3Nz4uCitodHRwL3Rlc3RzL25hdmlnYXRpb24vcHJv Y2Vzcy1zd2FwLXdpbmRvdy1vcGVuLmh0bWwgWyBTa2lwIF0KIAogIyBDcm9zcy1PcmlnaW4tUmVz b3VyY2UtUG9saWN5IHJlc3BvbnNlIGhlYWRlciBpcyBvbmx5IGltcGxlbWVudGVkIGluIFdlYktp dDIuCiBodHRwL3dwdC9jcm9zcy1vcmlnaW4tcmVzb3VyY2UtcG9saWN5LyBbIFBhc3MgXQo= 359166 2019-01-15 09:37:12 -0800 2019-01-15 09:44:49 -0800 Patch bug-193361-20190115093711.patch text/plain 106426 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5OTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQzNGM2ZGZkZDNhNWQ5 YmMxZjQ2MjZkNTVmOWY0OTg3MWNhNDA1Yi4uOGY3NjUzMTJiNmNhOWY2MzY2Zjc5YzRhY2Q4ZGYy YmYyODhkY2JiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAxLTE1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBW aWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAg ICAgIFdoZW4gcmVzdG9yaW5nIGZyb20gUGFnZUNhY2hlLCBtYWtlIHN1cmUgd2Ugbm90aWZ5IHRo ZSBjbGllbnQgdGhhdCB0aGUgbG9hZCB3YXMgY29tbWl0dGVkCisgICAgICAgICpiZWZvcmUqIHdl IHRlbGwgaXQgdGhhdCB0aGUgbmF2aWdhdGlvbiBpcyBjb21wbGV0ZS4gVGhpcyB3b3VsZCBjb25m dXNlIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eQorICAgICAgICBsb2dpYyBpbiB0aGUgVUlQcm9j ZXNzLgorCiAyMDE5LTAxLTE1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBBdWRpdDogcHJvdmlkZSBhIHdheSB0byBkZXRlcm1pbmUg d2hldGhlciBhIGdpdmUgbm9kZSBoYXMgZXZlbnQgbGlzdGVuZXJzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIxNTgw ZmMwNThiNTM3ZWQxYWRlNWY3NTJlMzE3NjZmY2UzYmQ0MDEuLjQxYjI4MmZiZGM1YmVkZTBiNWU1 YjE3ZDA5NTlkNjI3ZmQxMjFlN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAwIEBACisyMDE5LTAx LTE1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lv bihQU09OKSBWaWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25s b2FkIGxpbmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5MzM2MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGlzc3VlIHRyYWNrZWQgYnkg cmRhcjovL3Byb2JsZW0vNDcwOTk1NzMgaXMgdGhhdCBhIHByb3Zpc2lvbmFsIGxvYWQgbWF5IGdl dAorICAgICAgICBjYW5jZWxlZCAob3IgY29udmVydGVkIGludG8gYSBkb3dubG9hZCkgKmFmdGVy KiB3ZSd2ZSBkZWNpZGVkIHRvIHByb2Nlc3Mtc3dhcC4KKyAgICAgICAgSW4gc3VjaCBjYXNlcywg dGhlIHZpZXcgc2hvdWxkIGtlZXAgZGlzcGxheWluZyB0aGUgY3VycmVudCBzaXRlIGFuZCBpdCBz aG91bGQKKyAgICAgICAgc3RpbGwgYmUgaW50ZXJhY3RpdmUuIEhvd2V2ZXIsIHdpdGggdGhlIHBy ZXZpb3VzIFBTT04gbW9kZWwsIHRoZSB2aWV3IChwYWdlUHJveHkpCisgICAgICAgIHdvdWxkIGhh dmUgYWxyZWFkeSBzd2FwcGVkIHRvIHRoZSBuZXcgcHJvY2VzcyBhbmQgd291bGQgZW5kIHVwIGRp c3BsYXlpbmcgdGhlCisgICAgICAgIGluaXRpYWxseSBlbXB0eSBkb2N1bWVudC4KKworICAgICAg ICBUbyBhZGRyZXNzIHRoZSBpc3N1ZSwgdGhpcyBwYXRjaCBpbnRyb2R1Y2VzIHRoZSBjb25jZXB0 IG9mIGEgcHJvdmlzaW9uYWwgbG9hZAorICAgICAgICBpbiB0aGUgVUlQcm9jZXNzLCBoYW5kbGVk IGJ5IGEgUHJvdmlzaW9uYWxQYWdlUHJveHkgd2hpY2ggaGFzIGl0cyBvd24gcHJpdmlzaW9uYWwK KyAgICAgICAgcHJvY2Vzcy4gVGhlIFdlYlBhZ2VQcm94eSBvd25zIHRoZSBQcm92aXNpb25hbFBh Z2VQcm94eSBidXQgd2UgZG8gbm90IGNvbW1pdCB0aGUKKyAgICAgICAgcHJvdmlzaW9uYWwgcGFn ZSB1bnRpbCBhZnRlciB0aGUgbG9hZCB3YXMgY29tbWl0dGVkIGluIHRoZSBuZXcgcHJvY2Vzcy4g VGhpcyBtZWFucworICAgICAgICB0aGF0IHRoZSB2aWV3IC8gV2ViUGFnZVByb3h5IGtlZXBzIHVz aW5nIHRoZSBvbGQgcHJvY2VzcyBhbmQgZGlzcGxheXMgdGhlIGN1cnJlbnQKKyAgICAgICAgY29u dGVudCB1bnRpbCBhIGxvYWQgaGFzIGNvbW1pdHRlZCBpbiB0aGUgcHJvdmlzaW9uYWwgcGFnZS4g SWYgbm8gbG9hZCBjb21taXRzCisgICAgICAgIGluIHRoZSBwcm92aXNpb25hbCBwcm9jZXNzIChl LmcuIGJlY2F1c2UgdGhlIGxvYWQgaXMgY2FuY2VsbGVkIG9yIGNvbnZlcnRlZCBpbnRvCisgICAg ICAgIGEgZG93bmxvYWQpLCB0aGVuIHdlIG1lcmVseSBkZXN0cm95IHRoZSBQcm92aXNpb25hbFBh Z2VQcm94eSBhbmQgdGVybWluYXRlIGl0cworICAgICAgICBwcm9jZXNzLCB3aXRob3V0IGltcGFj dGluZyB0aGUgV2ViUGFnZVByb3h5LgorCisgICAgICAgICogU2hhcmVkL1dlYlBhZ2VDcmVhdGlv blBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJh bWV0ZXJzOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzLmg6CisgICAgICAgIFJlbmFtZSBpc1N3YXBGcm9tU3VzcGVuZGVkIHRvIGlzUHJvY2Vzc1N3 YXAgZm9yIGNsYXJpdHkgYXMgd2UgYWx3YXlzIHdhbnQgdG8KKyAgICAgICAgZGVsYXkgYXR0YWNo aW5nIHRoZSBkcmF3aW5nIGFyZWEgaW4gY2FzZSBvZiBhIHByb2Nlc3Mtc3dhcCwgbm8gbWF0dGVy IHdoYXQKKyAgICAgICAgbm93IHRoYXQgdGhlIHByZXZpb3VzIHByb2Nlc3MgaXMga2VwdCBhbGl2 ZSB1bnRpbCB0aGUgcHJvdmlzaW9uYWwgbG9hZCBpcworICAgICAgICBjb21taXR0ZWQgaW4gdGhl IG5ldyBwcm9jZXNzLgorCisgICAgICAgICogU2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oOgorICAg ICAgICBEcm9wIFN1c3BlbmQgcG9saWN5IGFjdGlvbi4gQXQgZGVjaWRlUG9saWN5Rm9yTmF2aWdh dGlvbkFjdGlvbiB0aW1lLCBpbiBjYXNlIG9mCisgICAgICAgIHByb2Nlc3Mtc3dhcCwgd2Ugbm93 IHRlbGwgdGhlIHByZXZpb3VzIHByb2Nlc3MgdG8gc2ltcGx5IGlnbm9yZSB0aGUgbG9hZCwgd2hp bGUKKyAgICAgICAgd2UgY3JlYXRlIGEgUHJvdmlzaW9uYWxQYWdlUHJveHkgdG8gZG8gdGhlIG5l dyBsb2FkIGluIGEgbmV3IHByb2Nlc3MuCisgICAgICAgIFN1c3BlbnNpb24gb2YgdGhlIHByZXZp b3VzIHBhZ2UgaW4gdGhlIG9sZCBwcm9jZXNzLCBoYXBwZW5zIGxhdGVyLCB3aGVuIGEgbG9hZAor ICAgICAgICBpcyBhY3R1YWxseSBjb21taXR0ZWQgaW4gdGhlIG5ldyBwcm9jZXNzLgorCisgICAg ICAgICogU291cmNlcy50eHQ6CisgICAgICAgIEFkZCBuZXcgUHJvdmlzaW9uYWxQYWdlUHJveHkg ZmlsZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAg ICAgICAoLVtXS1dlYlZpZXcgX2tpbGxXZWJDb250ZW50UHJvY2Vzc0FuZFJlc2V0U3RhdGVdKToK KyAgICAgICAgV2hlbiBjYWxsaW5nIF9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0YXRl IG9uIGEgV0tXZWJWaWV3LCBraWxsIGJvdGggdGhlIGN1cnJlbnQKKyAgICAgICAgcHJvY2VzcyBh bmQgdGhlIHByb3Zpc2lvbmFsIG9uZSwgdG8gbWFpbnRhaW4gcHJldmlvdXMgYmVoYXZpb3IgaW4g b3VyIEFQSSB0ZXN0cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlQ2xpZW50Lmg6CisgICAg ICAgIFRpbnkgYnVpbGQgZml4LgorCisgICAgICAgICogVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFn ZVByb3h5LmNwcDogQWRkZWQuCisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5 OjpQcm92aXNpb25hbFBhZ2VQcm94eSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFn ZVByb3h5Ojp+UHJvdmlzaW9uYWxQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6dGFrZURyYXdpbmdBcmVhKToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlz aW9uYWxQYWdlUHJveHk6OmNhbmNlbCk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFn ZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFs UGFnZVByb3h5Ojpsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24pOgorICAgICAgICAo V2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6Z29Ub0JhY2tGb3J3YXJkSXRlbSk6CisgICAg ICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOgor ICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25h bExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5Ojpk aWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6 UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKToKKyAgICAgICAgKFdlYktp dDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVTeW5jTWVzc2FnZSk6CisgICAgICAg ICogVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5Lmg6IEFkZGVkLgorICAgICAgICAoV2Vi S2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6cGFnZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zp c2lvbmFsUGFnZVByb3h5OjptYWluRnJhbWUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpQcm92 aXNpb25hbFBhZ2VQcm94eTo6cHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFs UGFnZVByb3h5Ojpwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IGNvbnN0KToKKyAgICAgICAg KFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6Om5hdmlnYXRpb25JRCBjb25zdCk6CisgICAg ICAgIEFkZCBuZXcgUHJvdmlzaW9uYWxQYWdlUHJveHkgY2xhc3MgdG8gd3JhcCB0aGUgcHJvdmlz aW9uYWwgbG9hZCBpbiB0aGUgbmV3IHByb2Nlc3MKKyAgICAgICAgYWZ0ZXIgYSBzd2FwLiBUaGUg cHJvdmlzaW9uYWwgcGFnZSBpcyBvd25lZCBieSB0aGUgV2ViUGFnZVByb3h5IGFuZCB3ZSBvbmx5 IGNvbW1pdAorICAgICAgICB0aGUgcHJvdmlzaW9uYWwgcGFnZSB3aGVuIHRoZSBsb2FkIGlzIGNv bW1pdHRlZC4gVW50aWwgdGhlbiwgdGhlIFdlYlBhZ2VQcm94eSBrZWVwcworICAgICAgICB1c2lu ZyB0aGUgb2xkIHByb2Nlc3MgYW5kIGRpc3BsYXlpbmcgdGhlIGN1cnJlbnQgY29udGVudC4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6On5TdXNwZW5kZWRQYWdlUHJveHkpOgorICAgICAgICAo V2ViS2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6OnVuc3VzcGVuZCk6CisgICAgICAgIChXZWJLaXQ6 OlN1c3BlbmRlZFBhZ2VQcm94eTo6ZGlkUHJvY2Vzc1JlcXVlc3RUb1N1c3BlbmQpOgorICAgICAg ICBVbnJlZ2lzdGVyIHRoZSBTdXNwZW5kZWRQYWdlUHJveHkgYXMgYW4gSVBDIG1lc3NhZ2UgcmVj ZWl2ZXIgYSBsaXR0bGUgYml0IGVhcmxpZXIKKyAgICAgICAgd2hlbiB3ZSdyZSBnb2luZyB0byB1 bnN1c3BlbmQgaXQuIFRoaXMgYXZvaWRzIGNvbmZsaWN0aW5nIHdpdGggdGhlIFByb3Zpc2lvbmFs UGFnZVByb3h5CisgICAgICAgIHdoaWNoIHRyaWVzIHRvIHJlZ2lzdGVyIGl0c2VsZiBhcyBhbiBJ UEMgbWVzc2FnZSByZWNlaXZlciBmb3IgdGhlIHNhbWUgcGFnZUlEIHdoZW4KKyAgICAgICAgYSBw cm9jZXNzLXN3YXAgb2NjdXJzIGFuZCB3ZSdyZSBzd2l0Y2hpbmcgdG8gYSBzdXNwZW5kZWQgcGFn ZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViRnJhbWVQcm94eTo6aXNNYWluRnJhbWUgY29uc3QpOgorICAgICAgICBXZWJGcmFt ZVByb3h5Ojppc01haW5GcmFtZSgpIHJlbGllcyBvbiBjaGVja2luZyB0aGF0IHRoZSBmcmFtZSBp cyB0aGUgV2ViUGFnZVByb3h5J3MgbV9tYWluRnJhbWUuCisgICAgICAgIE5vdyB0aGF0IHRoZSBX ZWJQYWdlUHJveHkgY2FuIGhhdmUgYSBQcm92aXNpb25hbFBhZ2VQcm94eSwgYWxzbyBjaGVjayBp ZiBpdCBpcyB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkncworICAgICAgICBtX21haW5GcmFtZSB0 byBtYWludGFpbiBwcmV2aW91cyBiZWhhdmlvci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnN3YXBUb1dlYlBy b2Nlc3MpOgorICAgICAgICBzd2FwVG9XZWJQcm9jZXNzKCkgbm8gbG9uZ2VyIHRha2VzIGNhcmUg b2YgdW5zdXNwZW5kaW5nIHRoZSBTdXNwZW5kZWRQYWdlIGJlY2F1c2Ugd2Ugbm93IGNhbGwgc3dh cFRvV2ViUHJvY2VzcygpCisgICAgICAgIGxhdGVyLCB3aGVuIGEgbG9hZCBpcyBhY3R1YWxseSBj b21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHBhZ2UgLyBwcm9jZXNzLiBzd2FwVG9XZWJQcm9j ZXNzKCkgbm93IGFsc28gbmVlZHMKKyAgICAgICAgdG8gaW5pdGlhbGl6ZSBzb21lIGRhdGEgbWVt YmVycyBzdWNoIGFzIHRoZSBkcmF3aW5nIGFyZWEgYW5kIHRoZSBtYWluIGZyYW1lIGFzIGl0IGlz IHRyYW5zZmVycmluZyB0aGVtIG92ZXIgZnJvbQorICAgICAgICB0aGUgUHJvdmlzaW9uYWxQYWdl UHJveHkgd2hpY2ggc3RhcnRlZCB0aGUgcHJvdmlzaW9uYWwgbG9hZC4KKworICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2Vzcyk6CisgICAgICAg IFdlIG5vIGxvbmdlciBuZWVkIElzU3dhcEZyb21TdXNwZW5kZWQgcGFyYW1ldGVyIGFzIHRoaXMg aXMgY2FsbGVkIGxhdGVyIG5vdywgYWZ0ZXIgYSBsb2FkIGhhcyBhY3R1YWxseSBiZWVuCisgICAg ICAgIGNvbW1pdHRlZCBpbiB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vzcy4KKworICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKToKKyAgICAgICAgLSBXZSBubyBs b25nZXIgbmVlZCBJc1N3YXBGcm9tU3VzcGVuZGVkIHBhcmFtZXRlciBhcyB0aGlzIGlzIGNhbGxl ZCBsYXRlciBub3csIGFmdGVyIGEgbG9hZCBoYXMgYWN0dWFsbHkgYmVlbgorICAgICAgICAgIGNv bW1pdHRlZCBpbiB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vzcy4KKyAgICAgICAgLSBGYWN0b3Igc29t ZSBjb2RlIG91dCB0byBXZWJQYWdlUHJveHk6OnNldERyYXdpbmdBcmVhKCkgc28gdGhhdCBpdCBj YW4gYmUgc2hhcmVkIHdpdGggc3dhcFRvV2ViUHJvY2VzcygpLgorCisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbik6CisgICAgICAgIE9ubHkg Y2FsbCBzZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCgpIGluIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRp b24oKSBvbmx5IGlmIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCBpcyBub3QKKyAgICAgICAg WWVzLiBUaGlzIGF2b2lkcyBoaXR0aW5nIHNvbWUgYXNzZXJ0aW9ucyBhcyB0aGlzIHdhcyBhbHJl YWR5IGNhbGxlZCBkdXJpbmcgdGhlIGZpcnN0IEFQSSBjYWxsIGlmIG5lZWRlZC4KKworICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9u KToKKyAgICAgICAgSW4gY2FzZSBvZiBwcm9jZXNzIHN3YXAsIHRlbGwgdGhlIHByZXZpb3VzIHBy b2Nlc3MgdG8gaWdub3JlIHRoZSBsb2FkIGluc3RlYWQgb2Ygc3VzcGVuZGluZyBpdCByaWdodCBh d2F5LgorICAgICAgICBTdXNwZW5zaW9uIG5vdyBoYXBwZW5zIGxhdGVyLCBvbmx5IGlmIHdlIGVu ZCB1cCBjb21taXR0aW5nIHRoZSBwcm92aXNpb25hbCBsb2FkIGluIHRoZSBuZXcgcHJvY2Vzcy4K KyAgICAgICAgQWxzbyBkaXNjYXJkIHRoZSBTdXNwZW5kZWRQYWdlIGlmIGl0IGZhaWxlZCB0byBz dXNwZW5kICh3ZSBvbmx5IHJldXNlIGl0cyBwcm9jZXNzIGluIHRoaXMgY2FzZSkuIFRoaXMgdXNl ZAorICAgICAgICB0byBoYXBwZW4gYSBiaXQgbGF0ZXIgYnV0IGl0IGlzIGNsZWFyZXIgaWYgd2Ug ZG8gdGhpcyBhcyBlYXJseSBhcyBwb3NzaWJsZSBJIHRoaW5rLgorCisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKToKKyAgICAgICAgV2hlbiB0aGUg bG9hZCBpcyBjb21taXR0ZWQgaW4gdGhlIG5ldyBwcm9jZXNzLCB3ZSBjYWxsIFdlYlBhZ2VQcm94 eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKCkuIEl0IHRha2VzIGNhcmUgb2Y6CisgICAgICAgIC0g QWN0dWFsbHkgc3dhcHBpbmcgdGhlIFdlYlBhZ2VQcm94eSB0byB0aGUgbmV3IHByb2Nlc3MgYnkg Y2FsbGluZyBwcm9jZXNzRGlkVGVybWluYXRlKCkgLyBzd2FwVG9XZWJQcm9jZXNzKCkuCisgICAg ICAgIC0gU3VzcGVuZGluZyB0aGUgY3VycmVudCBwYWdlLgorICAgICAgICAtIExldHRpbmcgdGhl IGNsaWVudCBrbm93IHRoZSBsb2FkIGlzIGNvbWl0dGVkCisgICAgICAgIC0gRGVzdHJveSB0aGUg UHJvdmlzaW9uYWxQYWdlUHJveHkuCisgICAgICAgIFRoaXMgd29yayB1c2VkIHRvIGhhcHBlbiBl YXJsaWVyIGluIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcygpLgorCisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKToKKyAg ICAgICAgTW92ZWQgc29tZSBvZiB0aGUgbG9naWMgdG8gY29tbWl0UHJvdmlzaW9uYWxQYWdlKCku IFdlIG5vdyBtZXJlbHkgc3RhcnQgdGhlIGxvYWQgaW4gYSBuZXcgUHJvdmlzaW9uYWxQYWdlUHJv eHksCisgICAgICAgIHdpdGhvdXQgYWN0dWFsbHkgaGF2aW5nIHRoZSBXZWJQYWdlUHJveHkgc3dp dGNoIHRvIHRoZSBuZXcgcHJvY2VzcyB5ZXQuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OmRpZENyZWF0ZVdpbmRvdyk6CisgICAgICAgIERyb3Agc29tZSBjb2RlIHRoYXQgaXMgbm8gbG9u Z2VyIG5lZWRlZCwgbm93IHRoYXQgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IHRha2VzIGNhcmUg b2YgdGhpcy4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZERlc3Ryb3lOYXZp Z2F0aW9uKToKKyAgICAgICAgT24gcHJvY2Vzcy1zd2FwLCB3aGVuIHRlbGxpbmcgdGhlIHByZXZp b3VzIHByb2Nlc3MgdG8gaWdub3JlIHRoZSBsb2FkIGFuZCBzdGFydGluZyB0aGUgbmV3IGxvYWQg aW4gYSBuZXcKKyAgICAgICAgUHJvdmlzaW9uYWxQYWdlUHJveHksIHRoZSBwcmV2aW91cyBXZWJQ YWdlIGF0dGVtcHRzIHRvIGRlc3Ryb3kgdGhlIG5hdmlnYXRpb24uIEluIHRoaXMgY2FzZSwgd2Ug aWdub3JlCisgICAgICAgIHRoZSBjYWxsIHNpbmNlIHRoZSBuYXZpZ2F0aW9uIGlzIG1lcmVseSB0 YWtlbiBvdmVyIGJ5IHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eS4KKworICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAg ICBNb3ZlZCBzb21lIFBTT04gbG9naWMgdG8gdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGluc3Rl YWQuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxM b2FkRm9yRnJhbWUpOgorICAgICAgICBXaGVuIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFt ZSgpIGlzIGNhbGxlZCBmb3IgYSBQcm92aXNpb25hbFBhZ2VQcm94eSwgZGVzdHJveSBpdC4KKwor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb25Bc3luYyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5 Rm9yUmVzcG9uc2UpOgorICAgICAgICBDYXB0dXJlIHRoZSBwcm9jZXNzIGluIHRoZSBsYW1iZGEs IHRvIG1ha2Ugc3VyZSB3ZSBzZW5kIHRoZSBwb2xpY3kgZGVjaXNpb24gdG8gdGhlIHNhbWUgcHJv Y2VzcyB0aGF0CisgICAgICAgIGFza2VkIGZvciBpdCwgc28gYXMgdG8gbm90IGdldCBjb25mdXNl ZCBieSBwcm9jZXNzIHN3YXBzLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVz ZXRTdGF0ZSk6CisgICAgICAgIERyb3Agc29tZSBjb2RlIHRoYXQgaXMgbm8gbG9uZ2VyIG5lZWRl ZC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycyk6 CisgICAgICAgIE1vdmUgdGhlIGhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyBmbGFnIGluaXRp YWxpemF0aW9uIGZyb20gdGhlIGNhbGwgc2l0ZSB0byBoZXJlIG5vdyB0aGF0IHdlIGhhdmUKKyAg ICAgICAgbW9yZSB0aGFuIG9uZSBjYWxsIHNpdGUuIFRoaXMgd2FzIGp1c3Qgc29tZSBiYWQgZmFj dG9yaW5nLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVy cmlkZTo6UGFnZVByb2Nlc3NPdmVycmlkZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6flBhZ2VQcm9jZXNzT3ZlcnJpZGUpOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 Ojp0ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2Vzcyk6CisgICAgICAgIEFkZCB1dGlsaXR5IGNsYXNz IHRvIHRlbXBvcmFyaWx5IG92ZXJyaWRlIHRoZSBXZWJQYWdlUHJveHkncyBtX3Byb2Nlc3Mgd2l0 aCB0aGUgcHJvdmlzaW9uYWwgb25lIHdoZW4KKyAgICAgICAgdGhlIFByb3Zpc2lvbmFsUGFnZVBy b3h5IGludGVyYWN0cyB3aXRoIHRoZSBXZWJQYWdlUHJveHkuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5 OjpoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ cm9jZXNzUHJveHk6OnVwZGF0ZUJhY2tGb3J3YXJkSXRlbSk6CisgICAgICAgIEJlZm9yZSB1cGRh dGluZyBhIEJhY2tGb3J3YXJkTGlzdEl0ZW0sIHdlIG5vcm1hbGx5IG1ha2Ugc3VyZSB0aGUgcHJv Y2VzcyBoYXMgYSBXZWJQYWdlUHJveHkgd2l0aCB0aGUKKyAgICAgICAgaXRlbSdzIHBhZ2VJRC4g V2UgaGF2ZSB0byB0d2VhayB0aGUgbG9naWMgYmVjYXVzZSB0aGVyZSBtYXkgbm93IGJlIG5vIFdl YlBhZ2VQcm94eSB3aXRoIHRoaXMgcGFnZUlECisgICAgICAgIGFzc29jaWF0ZWQgd2l0aCB0aGlz IHByb2Nlc3MgeWV0LCBiZWNhdXNlIGl0IGlzIHN0aWxsIGEgUHJvdmlzaW9uYWxQYWdlUHJveHku CisKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpjYW5UZXJtaW5hdGVDaGlsZFBy b2Nlc3MpOgorICAgICAgICBEbyBub3QgdGVybWluYXRlIHRoZSBXZWJQcm9jZXNzIGlmIHRoZXJl IGFyZSBQcm92aXNpb25hbFBhZ2VQcm94eSBvYmplY3RzIHVzaW5nIGl0LgorCisgICAgICAgICog VUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNz UHJveHk6OmFkZFByb3Zpc2lvbmFsUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzc1Byb3h5OjpyZW1vdmVQcm92aXNpb25hbFBhZ2VQcm94eSk6CisKKyAgICAgICAgKiBXZWJL aXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKworICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9XZWJGcmFtZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OnRvUG9saWN5QWN0aW9uKToKKyAg ICAgICAgKFdlYktpdDo6V2ViRnJhbWU6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbik6CisgICAg ICAgIFN0b3AgZGVhbGluZyB3aXRoIFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZCBhcyBpdCBubyBs b25nZXIgZXhpc3RzLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpyZWluaXRpYWxpemVXZWJQYWdlKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKToKKworICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRJc1N1c3BlbmRlZCk6CisgICAgICAgIFN1c3BlbmQgdGhl IFBhZ2Ugd2hlbiBzZXRJc1N1c3BlbmRlZCh0cnVlKSBpcyBjYWxsZWQsIG5vdyB0aGF0IHRoZXJl IGlzIG5vIGxvbmdlciBhIFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZC4KKyAgICAgICAgc2V0SXNT dXNwZW5kZWQodHJ1ZSkgSVBDIGlzIHNlbnQgd2hlbiB3ZSBhY3R1YWxseSBjb21taXQgdGhlIHBy b3Zpc2lvbmFsIHBhZ2UuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tOgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVB bmltYXRpb25EcmF3aW5nQXJlYTo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEpOgorCiAy MDE5LTAxLTE0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgU3BsaXQgaGVhZGVyVmFsdWVGb3JWYXJ5IGludG8gc3BlY2lhbGl6ZWQgZnVuY3Rp b25zIGZvciBOZXR3b3JrUHJvY2VzcyBhbmQgV2ViUHJvY2Vzcy9XZWJLaXRMZWdhY3kKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDRjMjZhNjk4MWI0NjRkYTU5MTZmMDVl YjczNTk2NjkxNTdlZTlmZmUuLmViZjk1MGJhNmMyZWQ5MWY2MjMyYmQyYjVlZmI5Zjc5NTU3YWI1 OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMjAzMiwxMSArMjAz MiwxMSBAQCB2b2lkIEZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQoKQogCiAgICAg ICAgIE9wdGlvbmFsPEhhc0luc2VjdXJlQ29udGVudD4gaGFzSW5zZWN1cmVDb250ZW50ID0gY2Fj aGVkUGFnZS0+Y2FjaGVkTWFpbkZyYW1lKCktPmhhc0luc2VjdXJlQ29udGVudCgpOwogCisgICAg ICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOworCiAgICAgICAg IC8vIEZJWE1FOiBUaGlzIEFQSSBzaG91bGQgYmUgdHVybmVkIGFyb3VuZCBzbyB0aGF0IHdlIGdy b3VuZCBDYWNoZWRQYWdlIGludG8gdGhlIFBhZ2UuCiAgICAgICAgIGNhY2hlZFBhZ2UtPnJlc3Rv cmUoKm1fZnJhbWUucGFnZSgpKTsKIAotICAgICAgICBkaXNwYXRjaERpZENvbW1pdExvYWQoaGFz SW5zZWN1cmVDb250ZW50KTsKLQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgICAgIG1f ZnJhbWUucGFnZSgpLT5jaHJvbWUoKS5zZXREaXNwYXRjaFZpZXdwb3J0RGF0YURpZENoYW5nZVN1 cHByZXNzZWQoZmFsc2UpOwogICAgICAgICBtX2ZyYW1lLnBhZ2UoKS0+Y2hyb21lKCkuZGlzcGF0 Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UobV9mcmFtZS5wYWdlKCktPnZpZXdwb3J0QXJn dW1lbnRzKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzLmNwcAppbmRleCBjYTJkZjQwZWUxZGQyY2EzNmYzYTQ4YTA0NzU3Zjk3YmRiYjYz NjQ3Li42ZDA3YzAzYWQ4YzkyN2U1NDUzYzVmZGE5NTk2NzA5YTc3MjYxZTJiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcApAQCAt NzMsNyArNzMsNyBAQCB2b2lkIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZShJUEM6 OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2Rlci5lbmNvZGVFbnVtKGxheWVySG9z dGluZ01vZGUpOwogICAgIGVuY29kZXIgPDwgbWltZVR5cGVzV2l0aEN1c3RvbUNvbnRlbnRQcm92 aWRlcnM7CiAgICAgZW5jb2RlciA8PCBjb250cm9sbGVkQnlBdXRvbWF0aW9uOwotICAgIGVuY29k ZXIgPDwgaXNTd2FwRnJvbVN1c3BlbmRlZDsKKyAgICBlbmNvZGVyIDw8IGlzUHJvY2Vzc1N3YXA7 CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgZW5jb2RlciA8PCBjb2xvclNwYWNlOwpAQCAtMjI3 LDcgKzIyNyw3IEBAIE9wdGlvbmFsPFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM+IFdlYlBhZ2VD cmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkRlY29kCiAgICAgICAgIHJldHVybiBXVEY6 Om51bGxvcHQ7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmNvbnRyb2xsZWRC eUF1dG9tYXRpb24pKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotICAgIGlmICghZGVj b2Rlci5kZWNvZGUocGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKSkKKyAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkpCiAgICAgICAgIHJldHVybiBX VEY6Om51bGxvcHQ7CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmggYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgKaW5kZXggYWU0MzI1Y2JkNWYxZTU2NzYx NjU4NmY1ZTlmYTczZWU1YjM1YjkzNy4uYjM4MmNlZWRkNDQ5YThkOWEwZjg2OTQ3MzVmMjZjMDU5 NWRkZWNkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBh cmFtZXRlcnMuaApAQCAtMTI5LDcgKzEyOSw3IEBAIHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJh bWV0ZXJzIHsKICAgICBWZWN0b3I8U3RyaW5nPiBtaW1lVHlwZXNXaXRoQ3VzdG9tQ29udGVudFBy b3ZpZGVyczsKIAogICAgIGJvb2wgY29udHJvbGxlZEJ5QXV0b21hdGlvbjsKLSAgICBib29sIGlz U3dhcEZyb21TdXNwZW5kZWQgeyBmYWxzZSB9OworICAgIGJvb2wgaXNQcm9jZXNzU3dhcCB7IGZh bHNlIH07CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgQ29sb3JTcGFjZURhdGEgY29sb3JTcGFj ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oIGIv U291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKaW5kZXggMTQyYTUxOGRmMDk3 ZTVlZjJmYTE4MDQ4NGUwOWQwMzMzYzEwNWI4MS4uMzk3MTc5NWM0NmE1MWIzODgxOGM1NWI3NmQ2 NTNhMzRiNTI4OWU5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5 QWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKQEAg LTI5LDExICsyOSwxMSBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorLy8gRklYTUU6IFJlbW92 ZSB0aGlzIHR5cGUgYW5kIHVzZSBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gaW5zdGVhZC4KIGVudW0g Y2xhc3MgV2ViUG9saWN5QWN0aW9uIDogdWludDhfdCB7CiAgICAgVXNlLAogICAgIERvd25sb2Fk LAotICAgIElnbm9yZSwKLSAgICBTdXNwZW5kCisgICAgSWdub3JlCiB9OwogCiB9CkBAIC00NSw4 ICs0NSw3IEBAIHRlbXBsYXRlPD4gc3RydWN0IEVudW1UcmFpdHM8V2ViS2l0OjpXZWJQb2xpY3lB Y3Rpb24+IHsKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb24sCiAgICAgICAgIFdlYktp dDo6V2ViUG9saWN5QWN0aW9uOjpVc2UsCiAgICAgICAgIFdlYktpdDo6V2ViUG9saWN5QWN0aW9u OjpEb3dubG9hZCwKLSAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246Oklnbm9yZSwKLSAg ICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQKKyAgICAgICAgV2ViS2l0OjpX ZWJQb2xpY3lBY3Rpb246Oklnbm9yZQogICAgID47CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1NvdXJjZXMudHh0IGIvU291cmNlL1dlYktpdC9Tb3VyY2VzLnR4dAppbmRleCBhMGI2 ZjcyODQ2MDQxYzI2M2E1NDc2NzEwZWFjOTg3ZmVkMWQxNjA0Li44YWVjYjg2NDcyNTAyZDAyN2Ez NGFmMzcxOWRkODI4YjAwN2RiMTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMu dHh0CisrKyBiL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQKQEAgLTIzMCw2ICsyMzAsNyBAQCBV SVByb2Nlc3MvSW5zcGVjdG9yVGFyZ2V0UHJveHkuY3BwCiBVSVByb2Nlc3MvUGFnZUxvYWRTdGF0 ZS5jcHAKIFVJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcAogVUlQcm9jZXNzL1Byb2Nlc3NU aHJvdHRsZXIuY3BwCitVSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCiBVSVByb2Nl c3MvUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkuY3BwCiBVSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NU aW1lci5jcHAKIFVJUHJvY2Vzcy9TZXJ2aWNlV29ya2VyUHJvY2Vzc1Byb3h5LmNwcApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMDc0Y2Rk ZmQyNzg0ZTg2OTEyOGQwMjBiZWQ1OTIxM2ExY2JkZGU2OC4uNGRmYWQ2NGUwMTU0MzU5MjgwZTYx NjhiMWYxZWQ1ZWJlNmQ3ZDliYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJWaWV3Lm1tCkBAIC00NCw2ICs0NCw3IEBACiAjaW1wb3J0ICJOYXZpZ2F0aW9u U3RhdGUuaCIKICNpbXBvcnQgIk9iakNPYmplY3RHcmFwaC5oIgogI2ltcG9ydCAiUGFnZUNsaWVu dC5oIgorI2ltcG9ydCAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbXBvcnQgIlJlbW90ZUxh eWVyVHJlZVNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YS5oIgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJU cmVlVHJhbnNhY3Rpb24uaCIKICNpbXBvcnQgIlJlbW90ZU9iamVjdFJlZ2lzdHJ5LmgiCkBAIC00 NzAwLDYgKzQ3MDEsMTEgQEAgLSAodm9pZClfa2lsbFdlYkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRT dGF0ZQogewogICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nlc3NQcm94eT4gcHJvdGVjdGVkUHJvY2Vz c1Byb3h5KF9wYWdlLT5wcm9jZXNzKCkpOwogICAgIHByb3RlY3RlZFByb2Nlc3NQcm94eS0+cmVx dWVzdFRlcm1pbmF0aW9uKFdlYktpdDo6UHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpSZXF1ZXN0 ZWRCeUNsaWVudCk7CisKKyAgICBpZiAoYXV0byogcHJvdmlzaW9uYWxQYWdlUHJveHkgPSBfcGFn ZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKSkgeworICAgICAgICBSZWY8V2ViS2l0OjpXZWJQcm9j ZXNzUHJveHk+IHByb3RlY3RlZFByb2Nlc3NQcm94eShwcm92aXNpb25hbFBhZ2VQcm94eS0+cHJv Y2VzcygpKTsKKyAgICAgICAgcHJvdGVjdGVkUHJvY2Vzc1Byb3h5LT5yZXF1ZXN0VGVybWluYXRp b24oV2ViS2l0OjpQcm9jZXNzVGVybWluYXRpb25SZWFzb246OlJlcXVlc3RlZEJ5Q2xpZW50KTsK KyAgICB9CiB9CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xp ZW50LmgKaW5kZXggMTQ5NzE0YWIxZDIyNjVhNjgzNGQ1N2VmNDdiMTE2ZWE0ZTI5ZTM1MS4uODJj NzczMjJmMmRmODdlM2FlZDVlMDA0YzYxYjJmNzkzOTUwZTM4OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1BhZ2VDbGllbnQuaApAQCAtNDgsNiArNDgsNyBAQAogCiBPQkpDX0NMQVNTIENBTGF5ZXI7 CiBPQkpDX0NMQVNTIE5TRmlsZVdyYXBwZXI7CitPQkpDX0NMQVNTIE5TTWVudTsKIE9CSkNfQ0xB U1MgTlNTZXQ7CiBPQkpDX0NMQVNTIFdLRHJhd2luZ1ZpZXc7CiBPQkpDX0NMQVNTIF9XS1JlbW90 ZU9iamVjdFJlZ2lzdHJ5OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJv dmlzaW9uYWxQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9u YWxQYWdlUHJveHkuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmY4M2I5NzgyOTI0ZmU2MTc4ZTU2MjJmYjU0YWUx ZmJhODMxYWRkNWQKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Q cm92aXNpb25hbFBhZ2VQcm94eS5jcHAKQEAgLTAsMCArMSwzMTAgQEAKKy8qCisgKiBDb3B5cmln aHQgKEMpIDIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZv bGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9m IHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4K KyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUg YWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFu ZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoK KyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRS SUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJ RVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFO VElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICog UFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJ VFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJ TkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFH RVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VC U1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7 IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkg VEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFC SUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFS SVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisj aW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKKwor I2luY2x1ZGUgIkFQSU5hdmlnYXRpb24uaCIKKyNpbmNsdWRlICJEcmF3aW5nQXJlYVByb3h5Lmgi CisjaW5jbHVkZSAiTG9nZ2luZy5oIgorI2luY2x1ZGUgIlBhZ2VDbGllbnQuaCIKKyNpbmNsdWRl ICJXZWJCYWNrRm9yd2FyZExpc3QuaCIKKyNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3RJdGVt LmgiCisjaW5jbHVkZSAiV2ViRXJyb3JzLmgiCisjaW5jbHVkZSAiV2ViTmF2aWdhdGlvblN0YXRl LmgiCisjaW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2VzLmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5 LmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5TWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQcm9j ZXNzTWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNzUHJveHkuaCIKKyNpbmNsdWRlIDxX ZWJDb3JlL1Nob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZC5oPgorCituYW1lc3BhY2UgV2ViS2l0 IHsKKworI2RlZmluZSBSRUxFQVNFX0xPR19JRl9BTExPV0VEKGNoYW5uZWwsIGZtdCwgLi4uKSBS RUxFQVNFX0xPR19JRihtX3BhZ2UuaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCksIGNoYW5uZWws ICIlcCAtIFByb3Zpc2lvbmFsUGFnZVByb3h5OjoiIGZtdCwgdGhpcywgIyNfX1ZBX0FSR1NfXykK KworUHJvdmlzaW9uYWxQYWdlUHJveHk6OlByb3Zpc2lvbmFsUGFnZVByb3h5KFdlYlBhZ2VQcm94 eSYgcGFnZSwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVuaXF1ZV9wdHI8 U3VzcGVuZGVkUGFnZVByb3h5PiBzdXNwZW5kZWRQYWdlLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQs IGJvb2wgaXNTZXJ2ZXJSZWRpcmVjdCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBy ZXF1ZXN0LCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVk QnlDbGllbnQpCisgICAgOiBtX3BhZ2UocGFnZSkKKyAgICAsIG1fcHJvY2VzcyhXVEZNb3ZlKHBy b2Nlc3MpKQorICAgICwgbV9uYXZpZ2F0aW9uSUQobmF2aWdhdGlvbklEKQorICAgICwgbV9pc1Nl cnZlclJlZGlyZWN0KGlzU2VydmVyUmVkaXJlY3QpCisgICAgLCBtX3JlcXVlc3QocmVxdWVzdCkK KyAgICAsIG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudChwcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50KQorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgLCBtX3N1c3BlbnNpb25U b2tlbihtX3Byb2Nlc3MtPnRocm90dGxlcigpLmZvcmVncm91bmRBY3Rpdml0eVRva2VuKCkpCisj ZW5kaWYKK3sKKyAgICBtX3Byb2Nlc3MtPmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSwgKnRoaXMp OworICAgIG1fcHJvY2Vzcy0+YWRkUHJvdmlzaW9uYWxQYWdlUHJveHkoKnRoaXMpOworCisgICAg Ly8gSWYgd2UgYXJlIHJlYXR0YWNoaW5nIHRvIGEgU3VzcGVuZGVkUGFnZSwgdGhlbiB0aGUgV2Vi UHJvY2VzcycgV2ViUGFnZSBhbHJlYWR5IGV4aXN0cyBhbmQKKyAgICAvLyBXZWJQYWdlUHJveHk6 OmRpZENyZWF0ZU1haW5GcmFtZSgpIHdpbGwgbm90IGJlIGNhbGxlZCB0byBpbml0aWFsaXplIG1f bWFpbkZyYW1lLiBJbiBzdWNoCisgICAgLy8gY2FzZSwgd2UgbmVlZCB0byBpbml0aWFsaXplIG1f bWFpbkZyYW1lIHRvIHJlZmxlY3QgdGhlIGZhY3QgdGhlIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdl CisgICAgLy8gYWxyZWFkeSBleGlzdHMgYW5kIGFscmVhZHkgaGFzIGEgbWFpbiBmcmFtZS4KKyAg ICBpZiAoc3VzcGVuZGVkUGFnZSkgeworICAgICAgICBBU1NFUlQoJnN1c3BlbmRlZFBhZ2UtPnBy b2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpOworICAgICAgICBzdXNwZW5kZWRQYWdlLT51bnN1 c3BlbmQoKTsKKyAgICAgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5OjpjcmVhdGUobV9w YWdlLCBzdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpKTsKKyAgICAgICAgbV9wcm9jZXNzLT5m cmFtZUNyZWF0ZWQoc3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSwgKm1fbWFpbkZyYW1lKTsK KyAgICB9CisKKyAgICBpbml0aWFsaXplV2ViUGFnZSgpOworfQorCitQcm92aXNpb25hbFBhZ2VQ cm94eTo6flByb3Zpc2lvbmFsUGFnZVByb3h5KCkKK3sKKyAgICBtX3Byb2Nlc3MtPnJlbW92ZVBy b3Zpc2lvbmFsUGFnZVByb3h5KCp0aGlzKTsKKworICAgIGlmIChtX3dhc0NvbW1pdHRlZCkKKyAg ICAgICAgcmV0dXJuOworCisgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVz c2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlE KCkpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9w YWdlLnBhZ2VJRCgpKTsKKworICAgIGlmIChtX2RyYXdpbmdBcmVhKSB7CisgICAgICAgIGF1dG8g cGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2Vzcyht X3Byb2Nlc3MpOworICAgICAgICBtX2RyYXdpbmdBcmVhID0gbnVsbHB0cjsKKyAgICB9CisKKyAg ICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3Byb2Nlc3MgPSBtX3Byb2Nlc3MuY29weVJlZigp XSB7CisgICAgICAgIHByb2Nlc3MtPm1heWJlU2h1dERvd24oKTsKKyAgICB9KTsKK30KKwordm9p ZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6cHJvY2Vzc0RpZFRlcm1pbmF0ZSgpCit7CisgICAgbV9w YWdlLnByb3Zpc2lvbmFsUHJvY2Vzc0RpZFRlcm1pbmF0ZSgpOworfQorCitzdGQ6OnVuaXF1ZV9w dHI8RHJhd2luZ0FyZWFQcm94eT4gUHJvdmlzaW9uYWxQYWdlUHJveHk6OnRha2VEcmF3aW5nQXJl YSgpCit7CisgICAgcmV0dXJuIFdURk1vdmUobV9kcmF3aW5nQXJlYSk7Cit9CisKK3ZvaWQgUHJv dmlzaW9uYWxQYWdlUHJveHk6OmNhbmNlbCgpCit7CisgICAgLy8gSWYgdGhlIHByb3Zpc2lvbmFs IGxvYWQgc3RhcnRlZCwgdGhlbiBpbmRpY2F0ZSB0aGF0IGl0IGZhaWxlZCBkdWUgdG8gY2FuY2Vs bGF0aW9uIGJ5IGNhbGxpbmcgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKCkuCisgICAg aWYgKG1fcHJvdmlzaW9uYWxMb2FkVVJMLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOworCisg ICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJjYW5jZWw6IFNpbXVs YXRpbmcgYSBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUgZm9yIHBhZ2VJRCA9ICUiIFBS SXU2NCwgbV9wYWdlLnBhZ2VJRCgpKTsKKyAgICBBU1NFUlQobV9tYWluRnJhbWUpOworICAgIGF1 dG8gZXJyb3IgPSBXZWJLaXQ6OmNhbmNlbGxlZEVycm9yKG1fcmVxdWVzdCk7CisgICAgZXJyb3Iu c2V0VHlwZShXZWJDb3JlOjpSZXNvdXJjZUVycm9yOjpUeXBlOjpDYW5jZWxsYXRpb24pOworICAg IGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZShtX21haW5GcmFtZS0+ZnJhbWVJRCgpLCB7 IH0sIG1fbmF2aWdhdGlvbklELCBtX3Byb3Zpc2lvbmFsTG9hZFVSTCwgZXJyb3IsIFVzZXJEYXRh IHsgfSk7IC8vIFdpbGwgZGVsZXRlIHx0aGlzfC4KK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQ cm94eTo6cHJvY2Vzc0RpZEZpbmlzaExhdW5jaGluZygpCit7CisgICAgZmluaXNoSW5pdGlhbGl6 aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCgpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFn ZVByb3h5OjpmaW5pc2hJbml0aWFsaXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNoKCkKK3sK KyAgICBBU1NFUlQobV9wcm9jZXNzLT5zdGF0ZSgpID09IFdlYlByb2Nlc3NQcm94eTo6U3RhdGU6 OlJ1bm5pbmcpOworCisgICAgLy8gRklYTUU6IFRoZSBXZWJQYWdlUHJveHkgZGVsYXlzIGFkZGlu ZyB0aGUgdmlzaXRlZCBsaW5rIHN0b3JlIHVudGlsIGFmdGVyIHRoZSBwcm9jZXNzIGhhcyBsYXVu Y2hlZAorICAgIC8vIHNvIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eSBkb2VzIHRoZSBzYW1lLiBI b3dldmVyLCBkbyB3ZSByZWFsbHkgbmVlZCB0bz8KKyAgICBtX3Byb2Nlc3MtPmFkZFZpc2l0ZWRM aW5rU3RvcmUobV9wYWdlLnZpc2l0ZWRMaW5rU3RvcmUoKSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9u YWxQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKCkKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNz T3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsK KyAgICBtX2RyYXdpbmdBcmVhID0gbV9wYWdlLnBhZ2VDbGllbnQoKS5jcmVhdGVEcmF3aW5nQXJl YVByb3h5KCk7CisKKyAgICBhdXRvIHBhcmFtZXRlcnMgPSBtX3BhZ2UuY3JlYXRpb25QYXJhbWV0 ZXJzKCk7CisgICAgcGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwID0gdHJ1ZTsKKyAgICBtX3Byb2Nl c3MtPnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OkNyZWF0ZVdlYlBhZ2UobV9wYWdlLnBhZ2VJ RCgpLCBwYXJhbWV0ZXJzKSwgMCk7CisKKyAgICBpZiAobV9wcm9jZXNzLT5zdGF0ZSgpID09IFdl YlByb2Nlc3NQcm94eTo6U3RhdGU6OlJ1bm5pbmcpCisgICAgICAgIGZpbmlzaEluaXRpYWxpemlu Z1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2goKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQ cm94eTo6bG9hZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24s IGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgZGF0YSwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwg Y29uc3QgU3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVj dCogdXNlckRhdGEsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGlj aWVzKQoreworICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3Jhcmls eU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgIG1fcGFnZS5sb2FkRGF0YVdpdGhOYXZp Z2F0aW9uKG5hdmlnYXRpb24sIGRhdGEsIE1JTUVUeXBlLCBlbmNvZGluZywgYmFzZVVSTCwgdXNl ckRhdGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3Zl KHdlYnNpdGVQb2xpY2llcykpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2Fk UmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFs VVJMc1BvbGljeSBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNl ckRhdGEsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQor eworICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJy aWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgIG1fcGFnZS5sb2FkUmVxdWVzdFdpdGhOYXZpZ2F0 aW9uKG5hdmlnYXRpb24sIFdURk1vdmUocmVxdWVzdCksIHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQ b2xpY3ksIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6Olll cywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQ cm94eTo6Z29Ub0JhY2tGb3J3YXJkSXRlbShBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIFdl YkJhY2tGb3J3YXJkTGlzdEl0ZW0mIGl0ZW0sIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+ JiYgd2Vic2l0ZVBvbGljaWVzKQoreworICAgIGF1dG8gaXRlbVN0YXRlcyA9IG1fcGFnZS5iYWNr Rm9yd2FyZExpc3QoKS5maWx0ZXJlZEl0ZW1TdGF0ZXMoW3RoaXMsIHRhcmdldEl0ZW0gPSAmaXRl bV0oYXV0byYgaXRlbSkgeworICAgICAgICBpZiAoYXV0byogcGFnZSA9IGl0ZW0uc3VzcGVuZGVk UGFnZSgpKSB7CisgICAgICAgICAgICBpZiAoJnBhZ2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nlc3Mu cHRyKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CisgICAgICAg IHJldHVybiAmaXRlbSAhPSB0YXJnZXRJdGVtOworICAgIH0pOworICAgIG1fcHJvY2Vzcy0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6VXBkYXRlQmFja0ZvcndhcmRMaXN0Rm9yUmVhdHRhY2goV1RG TW92ZShpdGVtU3RhdGVzKSksIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgbV9wcm9jZXNzLT5zZW5k KE1lc3NhZ2VzOjpXZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtKG5hdmlnYXRpb24ubmF2aWdh dGlvbklEKCksIGl0ZW0uaXRlbUlEKCksICpuYXZpZ2F0aW9uLmJhY2tGb3J3YXJkRnJhbWVMb2Fk VHlwZSgpLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92 ZSh3ZWJzaXRlUG9saWNpZXMpKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKyAgICBtX3Byb2Nlc3MtPnJl c3BvbnNpdmVuZXNzVGltZXIoKS5zdGFydCgpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVBy b3h5OjpkaWRDcmVhdGVNYWluRnJhbWUodWludDY0X3QgZnJhbWVJRCkKK3sKKyAgICBSRUxFQVNF X0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZENyZWF0ZU1haW5GcmFtZTogcGFn ZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSwg ZnJhbWVJRCk7CisgICAgQVNTRVJUKCFtX21haW5GcmFtZSk7CisKKyAgICBtX21haW5GcmFtZSA9 IFdlYkZyYW1lUHJveHk6OmNyZWF0ZShtX3BhZ2UsIGZyYW1lSUQpOworCisgICAgLy8gQWRkIHRo ZSBmcmFtZSB0byB0aGUgcHJvY2VzcyB3aWRlIG1hcC4KKyAgICBtX3Byb2Nlc3MtPmZyYW1lQ3Jl YXRlZChmcmFtZUlELCAqbV9tYWluRnJhbWUpOworCisgICAgLy8gVGhpcyBuYXZpZ2F0aW9uIHdh cyBkZXN0cm95ZWQgc28gbm8gbmVlZCB0byBub3RpZnkgb2YgcmVkaXJlY3QuCisgICAgaWYgKCFt X3BhZ2UubmF2aWdhdGlvblN0YXRlKCkuaGFzTmF2aWdhdGlvbihtX25hdmlnYXRpb25JRCkpCisg ICAgICAgIHJldHVybjsKKworICAgIC8vIFJlc3RvcmUgdGhlIG1haW4gZnJhbWUncyBjb21taXR0 ZWQgVVJMIGFzIHNvbWUgY2xpZW50cyBtYXkgcmVseSBvbiBpdCB1bnRpbCB0aGUgbmV4dCBsb2Fk IGlzIGNvbW1pdHRlZC4KKyAgICBpZiAoYXV0byogbWFpbkZyYW1lID0gbV9wYWdlLm1haW5GcmFt ZSgpKQorICAgICAgICBtX21haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5zZXRVUkwobWFpbkZy YW1lLT5mcmFtZUxvYWRTdGF0ZSgpLnVybCgpKTsKKworICAgIC8vIE5vcm1hbGx5LCBub3RpZmlj YXRpb24gb2YgYSBzZXJ2ZXIgcmVkaXJlY3QgY29tZXMgZnJvbSB0aGUgV2ViQ29udGVudCBwcm9j ZXNzLgorICAgIC8vIElmIHdlIGFyZSBwcm9jZXNzIHN3YXBwaW5nIGluIHJlc3BvbnNlIHRvIGEg c2VydmVyIHJlZGlyZWN0IHRoZW4gdGhhdCBub3RpZmljYXRpb24gd2lsbCBub3QgY29tZSBmcm9t IHRoZSBuZXcgV2ViQ29udGVudCBwcm9jZXNzLgorICAgIC8vIEluIHRoaXMgY2FzZSB3ZSBoYXZl IHRoZSBVSVByb2Nlc3Mgc3ludGhlc2l6ZSB0aGUgcmVkaXJlY3Qgbm90aWZpY2F0aW9uIGF0IHRo ZSBhcHByb3ByaWF0ZSB0aW1lLgorICAgIGlmIChtX2lzU2VydmVyUmVkaXJlY3QpIHsKKyAgICAg ICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkuZGlkU3RhcnRQcm92aXNpb25hbExvYWQo bV9yZXF1ZXN0LnVybCgpKTsKKworICAgICAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBt X3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICAgICAgbV9w YWdlLmRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKG1f bWFpbkZyYW1lLT5mcmFtZUlEKCksIG1fbmF2aWdhdGlvbklELCBXVEZNb3ZlKG1fcmVxdWVzdCks IHsgfSk7CisgICAgfQorfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRTdGFydFBy b3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRp b25JRCwgVVJMJiYgdXJsLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmIHVz ZXJEYXRhKQoreworICAgIC8vIElmIHRoZSBwcmV2aW91cyBwcm92aXNpb25hbCBsb2FkIHVzZWQg dGhlIHNhbWUgcHJvY2Vzcywgd2UgbWF5IHJlY2VpdmUgSVBDIGZvciB0aGlzIHByZXZpb3VzIHBy b3Zpc2lvbmFsJ3MgbWFpbiBmcmFtZSB0aGF0IHdlIG5lZWQgdG8gaWdub3JlLgorICAgIGlmICgh bV9tYWluRnJhbWUgfHwgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSAhPSBmcmFtZUlEKQorICAgICAg ICByZXR1cm47CisKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywg ImRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBm cmFtZUlEID0gJSIgUFJJdTY0ICIsIG5hdmlnYXRpb25JRCA9ICUiIFBSSXU2NCwgbV9wYWdlLnBh Z2VJRCgpLCBmcmFtZUlELCBuYXZpZ2F0aW9uSUQpOworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFs TG9hZFVSTC5pc051bGwoKSk7CisgICAgbV9wcm92aXNpb25hbExvYWRVUkwgPSB1cmw7CisKKyAg ICAvLyBNZXJlbHkgZm9sbG93aW5nIGEgc2VydmVyIHNpZGUgcmVkaXJlY3Qgc28gdGhlcmUgaXMg bm8gbmVlZCB0byBzZW5kIGEgZGlkU3RhcnRQcm92aXNpb25hbExvYWQgYWdhaW4uCisgICAgaWYg KG1faXNTZXJ2ZXJSZWRpcmVjdCkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gQ2xpZW50cyBl eHBlY3QgdGhlIFBhZ2UncyBtYWluIGZyYW1lJ3MgZXhwZWN0ZWRVUkwgdG8gYmUgdGhlIHByb3Zp c2lvbmFsIG9uZSB3aGVuIGEgcHJvdmlzaW9uYWwgbG9hZCBpcyBzdGFydGVkLgorICAgIGlmIChh dXRvKiBwYWdlTWFpbkZyYW1lID0gbV9wYWdlLm1haW5GcmFtZSgpKQorICAgICAgICBwYWdlTWFp bkZyYW1lLT5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZCh1cmwpOworCisgICAgYXV0byBwYWdlUHJv Y2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vz cyk7CisgICAgbV9wYWdlLmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoZnJhbWVJRCwg bmF2aWdhdGlvbklELCBXVEZNb3ZlKHVybCksIFdURk1vdmUodW5yZWFjaGFibGVVUkwpLCB1c2Vy RGF0YSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25h bExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9y aWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29u c3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYg ZXJyb3IsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNz T3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsK KworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiZGlkRmFpbFBy b3Zpc2lvbmFsTG9hZEZvckZyYW1lOiBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUi IFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSwgZnJh bWVJRCwgbmF2aWdhdGlvbklEKTsKKyAgICBtX3Byb3Zpc2lvbmFsTG9hZFVSTCA9IHsgfTsKKwor ICAgIC8vIE1ha2Ugc3VyZSB0aGUgUGFnZSdzIG1haW4gZnJhbWUncyBleHBlY3RlZFVSTCBnZXRz IGNsZWFyZWQgc2luY2Ugd2UgdXBkYXRlZCBpdCBpbiBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZC4K KyAgICBpZiAoYXV0byogcGFnZU1haW5GcmFtZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAg ICAgcGFnZU1haW5GcmFtZS0+ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZCgpOworCisgICAgbV9wYWdl LmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZShmcmFtZUlELCBmcmFtZVNlY3VyaXR5T3Jp Z2luLCBuYXZpZ2F0aW9uSUQsIHByb3Zpc2lvbmFsVVJMLCBlcnJvciwgdXNlckRhdGEpOyAvLyBX aWxsIGRlbGV0ZSB8dGhpc3wuCit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZENv bW1pdExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQs IGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlk ZXIsIHVpbnQzMl90IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5m byYgY2VydGlmaWNhdGVJbmZvLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFs PFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBj b25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCit7CisgICAgLy8gSWYgdGhlIHByZXZpb3VzIHByb3Zp c2lvbmFsIGxvYWQgdXNlZCB0aGUgc2FtZSBwcm9jZXNzLCB3ZSBtYXkgcmVjZWl2ZSBJUEMgZm9y IHRoaXMgcHJldmlvdXMgcHJvdmlzaW9uYWwncyBtYWluIGZyYW1lIHRoYXQgd2UgbmVlZCB0byBp Z25vcmUuCisgICAgaWYgKCFtX21haW5GcmFtZSB8fCBtX21haW5GcmFtZS0+ZnJhbWVJRCgpICE9 IGZyYW1lSUQpCisgICAgICAgIHJldHVybjsKKworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQo UHJvY2Vzc1N3YXBwaW5nLCAiZGlkQ29tbWl0TG9hZEZvckZyYW1lOiBwYWdlSUQgPSAlIiBQUkl1 NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgPSAlIiBQUkl1NjQsIG1f cGFnZS5wYWdlSUQoKSwgZnJhbWVJRCwgbmF2aWdhdGlvbklEKTsKKyAgICBtX3Byb3Zpc2lvbmFs TG9hZFVSTCA9IHsgfTsKKyAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNz YWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQo KSk7CisKKyAgICBtX3dhc0NvbW1pdHRlZCA9IHRydWU7CisgICAgbV9wYWdlLmNvbW1pdFByb3Zp c2lvbmFsUGFnZShmcmFtZUlELCBuYXZpZ2F0aW9uSUQsIG1pbWVUeXBlLCBmcmFtZUhhc0N1c3Rv bUNvbnRlbnRQcm92aWRlciwgZnJhbWVMb2FkVHlwZSwgY2VydGlmaWNhdGVJbmZvLCBjb250YWlu c1BsdWdpbkRvY3VtZW50LCBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIHVzZXJEYXRhKTsgLy8g V2lsbCBkZWxldGUgfHRoaXN8LgorfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRS ZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIElQQzo6RGVjb2RlciYg ZGVjb2RlcikKK3sKKyAgICBBU1NFUlQoZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkgPT0g TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpKTsKKworICAgIGlm IChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU3Rh cnRQcm9ncmVzczo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBN ZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDaGFuZ2VQcm9ncmVzczo6bmFtZSgpCisgICAgICAg IHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpCYWNr Rm9yd2FyZEFkZEl0ZW06Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkg PT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6TG9nRGlhZ25vc3RpY01lc3NhZ2U6Om5hbWUoKQor ICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6TG9nRGlhZ25vc3RpY01lc3NhZ2VXaXRoRW5oYW5jZWRQcml2YWN5OjpuYW1lKCkKKyAgICAg ICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNl dE5ldHdvcmtSZXF1ZXN0c0luUHJvZ3Jlc3M6Om5hbWUoKQorI2lmIFBMQVRGT1JNKENPQ09BKQor ICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6UmVnaXN0ZXJXZWJQcm9jZXNzQWNjZXNzaWJpbGl0eVRva2VuOjpuYW1lKCkKKyNlbmRpZgor ICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jOjpuYW1lKCkKKyAgICAgICAg fHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlN0YXJ0 VVJMU2NoZW1lVGFzazo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9 PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEZWNpZGVQb2xpY3lGb3JSZXNwb25zZTo6bmFtZSgp CisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpEaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3Q6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVy Lm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ2hhbmdlUHJvdmlz aW9uYWxVUkxGb3JGcmFtZTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUo KSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0 YTo6bmFtZSgpKQorICAgIHsKKyAgICAgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9w YWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgICAgIG1fcGFn ZS5kaWRSZWNlaXZlTWVzc2FnZShjb25uZWN0aW9uLCBkZWNvZGVyKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6RGlkQ3JlYXRlTWFpbkZyYW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpo YW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENyZWF0ZU1haW5GcmFtZT4o ZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUp OworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUo KSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQ YWdlUHJveHk6OkRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMs ICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgp ID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFt ZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjpEaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQ cm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKTsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0g TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ29tbWl0TG9hZEZvckZyYW1lOjpuYW1lKCkpIHsK KyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENv bW1pdExvYWRGb3JGcmFtZT4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5Ojpk aWRDb21taXRMb2FkRm9yRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgTE9H KFByb2Nlc3NTd2FwcGluZywgIlVuaGFuZGxlZCBtZXNzYWdlICVzOjolcyBmcm9tIHByb3Zpc2lv bmFsIHByb2Nlc3MiLCBkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKS50b1N0cmluZygpLmRh dGEoKSwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgpKTsKK30KKwordm9p ZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVj dGlvbiYgY29ubmVjdGlvbiwgSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBzdGQ6OnVuaXF1ZV9wdHI8 SVBDOjpFbmNvZGVyPiYgZW5jb2RlcikKK3sKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgp ID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkJhY2tGb3J3YXJkSXRlbUF0SW5kZXg6Om5hbWUo KSB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6QmFj a0ZvcndhcmRHb1RvSXRlbTo6bmFtZSgpKSB7CisgICAgICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVy cmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAg ICAgICBtX3BhZ2UuZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKGNvbm5lY3Rpb24sIGRlY29kZXIsIGVu Y29kZXIpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgTE9HKFByb2Nlc3NTd2FwcGlu ZywgIlVuaGFuZGxlZCBzeW5jIG1lc3NhZ2UgJXM6OiVzIGZyb20gcHJvdmlzaW9uYWwgcHJvY2Vz cyIsIGRlY29kZXIubWVzc2FnZVJlY2VpdmVyTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgpLCBkZWNv ZGVyLm1lc3NhZ2VOYW1lKCkudG9TdHJpbmcoKS5kYXRhKCkpOworfQorCit9IC8vIG5hbWVzcGFj ZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFs UGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94 eS5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLjhhMGY3MWRmOGNiNGM3NjI0MjUxZTQxZGM5M2FjZTE4MzY0OTFjM2UK LS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBh Z2VQcm94eS5oCkBAIC0wLDAgKzEsOTUgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTkgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11 c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJp YnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0 CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRl cmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdB UkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElT JycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFO VEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElT Q0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JT CisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVD SUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBP UiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisg KiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJ TElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQg KElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdB WSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAq IFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjcHJhZ21hIG9uY2UKKwor I2luY2x1ZGUgIk1lc3NhZ2VSZWNlaXZlci5oIgorI2luY2x1ZGUgPHd0Zi9XZWFrUHRyLmg+CisK K25hbWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNzIFJlc291cmNlUmVxdWVzdDsKK30KKworbmFtZXNw YWNlIFdlYktpdCB7CisKK2NsYXNzIERyYXdpbmdBcmVhUHJveHk7CitjbGFzcyBTdXNwZW5kZWRQ YWdlUHJveHk7CitjbGFzcyBXZWJGcmFtZVByb3h5OworY2xhc3MgV2ViUGFnZVByb3h5OworY2xh c3MgV2ViUHJvY2Vzc1Byb3h5OworCitjbGFzcyBQcm92aXNpb25hbFBhZ2VQcm94eSA6IHB1Ymxp YyBJUEM6Ok1lc3NhZ2VSZWNlaXZlciwgcHVibGljIENhbk1ha2VXZWFrUHRyPFByb3Zpc2lvbmFs UGFnZVByb3h5PiB7CisgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CitwdWJsaWM6CisgICAg UHJvdmlzaW9uYWxQYWdlUHJveHkoV2ViUGFnZVByb3h5JiwgUmVmPFdlYlByb2Nlc3NQcm94eT4m Jiwgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4sIHVpbnQ2NF90IG5hdmlnYXRp b25JRCwgYm9vbCBpc1NlcnZlclJlZGlyZWN0LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QmLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KTsKKyAgICB+UHJvdmlzaW9uYWxQYWdl UHJveHkoKTsKKworICAgIFdlYlBhZ2VQcm94eSYgcGFnZSgpIHsgcmV0dXJuIG1fcGFnZTsgfQor ICAgIFdlYkZyYW1lUHJveHkqIG1haW5GcmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fbWFpbkZyYW1l LmdldCgpOyB9CisgICAgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKCkgeyByZXR1cm4gbV9wcm9j ZXNzLmdldCgpOyB9CisgICAgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dh cFJlcXVlc3RlZEJ5Q2xpZW50KCkgY29uc3QgeyByZXR1cm4gbV9wcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50OyB9CisgICAgdWludDY0X3QgbmF2aWdhdGlvbklEKCkgY29uc3QgeyByZXR1cm4g bV9uYXZpZ2F0aW9uSUQ7IH0KKworICAgIERyYXdpbmdBcmVhUHJveHkqIGRyYXdpbmdBcmVhKCkg Y29uc3QgeyByZXR1cm4gbV9kcmF3aW5nQXJlYS5nZXQoKTsgfQorICAgIHN0ZDo6dW5pcXVlX3B0 cjxEcmF3aW5nQXJlYVByb3h5PiB0YWtlRHJhd2luZ0FyZWEoKTsKKworICAgIHZvaWQgbG9hZERh dGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVu Y2UmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25z dCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0aW9uYWw8V2Vic2l0 ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7CisgICAgdm9pZCBsb2FkUmVxdWVzdFdp dGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYm LCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNl ckRhdGEsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOwor ICAgIHZvaWQgZ29Ub0JhY2tGb3J3YXJkSXRlbShBUEk6Ok5hdmlnYXRpb24mLCBXZWJCYWNrRm9y d2FyZExpc3RJdGVtJiwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJik7CisgICAgdm9p ZCBjYW5jZWwoKTsKKworICAgIHZvaWQgcHJvY2Vzc0RpZEZpbmlzaExhdW5jaGluZygpOworICAg IHZvaWQgcHJvY2Vzc0RpZFRlcm1pbmF0ZSgpOworCitwcml2YXRlOgorICAgIC8vIElQQzo6TWVz c2FnZVJlY2VpdmVyCisgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24m LCBJUEM6OkRlY29kZXImKSBmaW5hbDsKKyAgICB2b2lkIGRpZFJlY2VpdmVTeW5jTWVzc2FnZShJ UEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImLCBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNv ZGVyPiYpIGZpbmFsOworCisgICAgdm9pZCBkaWRDcmVhdGVNYWluRnJhbWUodWludDY0X3QgZnJh bWVJRCk7CisgICAgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90 IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYsIFVSTCYmIHVucmVhY2hhYmxl VVJMLCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVp bnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1l VHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVM b2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiwgYm9vbCBjb250YWluc1Bs dWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNl ZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2b2lkIGRpZEZhaWxQ cm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpT ZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRp b25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3Vy Y2VFcnJvciYsIGNvbnN0IFVzZXJEYXRhJik7CisKKyAgICB2b2lkIGluaXRpYWxpemVXZWJQYWdl KCk7CisgICAgdm9pZCBmaW5pc2hJbml0aWFsaXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNo KCk7CisKKyAgICBXZWJQYWdlUHJveHkmIG1fcGFnZTsKKyAgICBSZWY8V2ViUHJvY2Vzc1Byb3h5 PiBtX3Byb2Nlc3M7CisgICAgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IG1fZHJh d2luZ0FyZWE7CisgICAgUmVmUHRyPFdlYkZyYW1lUHJveHk+IG1fbWFpbkZyYW1lOworICAgIHVp bnQ2NF90IG1fbmF2aWdhdGlvbklEOworICAgIGJvb2wgbV9pc1NlcnZlclJlZGlyZWN0OworICAg IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCBtX3JlcXVlc3Q7CisgICAgUHJvY2Vzc1N3YXBSZXF1 ZXN0ZWRCeUNsaWVudCBtX3Byb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQ7CisgICAgYm9vbCBt X3dhc0NvbW1pdHRlZCB7IGZhbHNlIH07CisgICAgVVJMIG1fcHJvdmlzaW9uYWxMb2FkVVJMOwor CisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAgICBQcm9jZXNzVGhyb3R0bGVyOjpCYWNrZ3Jv dW5kQWN0aXZpdHlUb2tlbiBtX3N1c3BlbnNpb25Ub2tlbjsKKyNlbmRpZgorfTsKKworfSAvLyBu YW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNw ZW5kZWRQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFn ZVByb3h5LmNwcAppbmRleCBmMTk4YTgxNTMzZjc2YjJlOGUyYmY3MWQ0YTNiOWQyNzQwYzk1MDc4 Li5mZjc2ZDlmN2Y5N2FjNmZhNGZiYjMwMmY2NDY2NjFkMTY3OGFlMjU3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAKQEAgLTEwMCw3ICsxMDAs OSBAQCBTdXNwZW5kZWRQYWdlUHJveHk6On5TdXNwZW5kZWRQYWdlUHJveHkoKQogICAgIC8vIElm IHRoZSBzdXNwZW5kZWQgcGFnZSB3YXMgbm90IGNvbnN1bWVkIGJlZm9yZSBnZXR0aW5nIGRlc3Ry b3llZCwgdGhlbiBjbG9zZSB0aGUgY29ycmVzcG9uZGluZyBwYWdlCiAgICAgLy8gb24gdGhlIFdl YlByb2Nlc3Mgc2lkZS4KICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNs b3NlKCksIG1fcGFnZS5wYWdlSUQoKSk7Ci0gICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVj ZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3Bh Z2UucGFnZUlEKCkpOworCisgICAgaWYgKG1fc3VzcGVuc2lvblN0YXRlID09IFN1c3BlbnNpb25T dGF0ZTo6U3VzcGVuZGluZykKKyAgICAgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2 ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2Uu cGFnZUlEKCkpOwogCiAgICAgLy8gV2UgY2FsbCBtYXliZVNodXREb3duKCkgYXN5bmNocm9ub3Vz bHkgc2luY2UgdGhlIFN1c3BlbmRlZFBhZ2UgaXMgY3VycmVudGx5IGJlaW5nIHJlbW92ZWQgZnJv bSB0aGUgV2ViUHJvY2Vzc1Bvb2wKICAgICAvLyBhbmQgd2Ugd2FudCB0byBhdm9pZCByZS1lbnRl cmluZyBXZWJQcm9jZXNzUG9vbCBtZXRob2RzLgpAQCAtMTM0LDcgKzEzNiw2IEBAIHZvaWQgU3Vz cGVuZGVkUGFnZVByb3h5Ojp1bnN1c3BlbmQoKQogICAgIEFTU0VSVChtX3N1c3BlbnNpb25TdGF0 ZSA9PSBTdXNwZW5zaW9uU3RhdGU6OlN1c3BlbmRlZCk7CiAKICAgICBtX3N1c3BlbnNpb25TdGF0 ZSA9IFN1c3BlbnNpb25TdGF0ZTo6UmVzdW1lZDsKLSAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3Nh Z2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCks IG1fcGFnZS5wYWdlSUQoKSk7CiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdl OjpTZXRJc1N1c3BlbmRlZChmYWxzZSksIG1fcGFnZS5wYWdlSUQoKSk7CiB9CiAKQEAgLTE1MSw2 ICsxNTIsOCBAQCB2b2lkIFN1c3BlbmRlZFBhZ2VQcm94eTo6ZGlkUHJvY2Vzc1JlcXVlc3RUb1N1 c3BlbmQoU3VzcGVuc2lvblN0YXRlIG5ld1N1c3BlbnNpbwogICAgIG1fc3VzcGVuc2lvblRva2Vu ID0gbnVsbHB0cjsKICNlbmRpZgogCisgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2 ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2Uu cGFnZUlEKCkpOworCiAgICAgaWYgKG1fcmVhZHlUb1Vuc3VzcGVuZEhhbmRsZXIpCiAgICAgICAg IG1fcmVhZHlUb1Vuc3VzcGVuZEhhbmRsZXIodGhpcyk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYkZyYW1lUHJveHkuY3BwCmluZGV4IGM3N2EyNmI3NDI3YzMxYzgyOGUyZWFhMjIxZjgw NzBiNzdhZGQyNjIuLjUzYzcxOTZjMmFhMGEzM2QyMjA3NTgxOTBjZDRiZDk1YTVjZDAyNWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCkBAIC0yNyw2ICsyNyw3 IEBACiAjaW5jbHVkZSAiV2ViRnJhbWVQcm94eS5oIgogCiAjaW5jbHVkZSAiQVBJTmF2aWdhdGlv bi5oIgorI2luY2x1ZGUgIlByb3Zpc2lvbmFsUGFnZVByb3h5LmgiCiAjaW5jbHVkZSAiV2ViQ2Vy dGlmaWNhdGVJbmZvLmgiCiAjaW5jbHVkZSAiV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5Lmgi CiAjaW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2VzLmgiCkBAIC03NCw3ICs3NSw3IEBAIGJvb2wgV2Vi RnJhbWVQcm94eTo6aXNNYWluRnJhbWUoKSBjb25zdAogICAgIGlmICghbV9wYWdlKQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAKLSAgICByZXR1cm4gdGhpcyA9PSBtX3BhZ2UtPm1haW5GcmFtZSgp OworICAgIHJldHVybiB0aGlzID09IG1fcGFnZS0+bWFpbkZyYW1lKCkgfHwgKG1fcGFnZS0+cHJv dmlzaW9uYWxQYWdlUHJveHkoKSAmJiB0aGlzID09IG1fcGFnZS0+cHJvdmlzaW9uYWxQYWdlUHJv eHkoKS0+bWFpbkZyYW1lKCkpOwogfQogCiB2b2lkIFdlYkZyYW1lUHJveHk6OmxvYWRVUkwoY29u c3QgVVJMJiB1cmwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRl eCBjOGFiNzAzMzNiNDAzOWE4Nzc5YzRjYTNmMzFlMTkwNzU2M2EzMzY5Li4yNjdlNWNkM2ZjZDAy OGI0ZTJmOTJjZDhiOTAwYTE3OTdlNWUwN2ZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAKQEAgLTc3LDYgKzc3LDcgQEAKICNpbmNsdWRlICJQbHVnaW5JbmZvcm1h dGlvbi5oIgogI2luY2x1ZGUgIlBsdWdpblByb2Nlc3NNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiUHJp bnRJbmZvLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbmNsdWRlICJT YWZlQnJvd3NpbmdXYXJuaW5nLmgiCiAjaW5jbHVkZSAiU2hhcmVTaGVldENhbGxiYWNrSUQuaCIK ICNpbmNsdWRlICJTaGFyZWRCdWZmZXJEYXRhUmVmZXJlbmNlLmgiCkBAIC01NDUsNiArNTQ2LDEz IEBAIFBBTDo6U2Vzc2lvbklEIFdlYlBhZ2VQcm94eTo6c2Vzc2lvbklEKCkgY29uc3QKICAgICBy ZXR1cm4gbV93ZWJzaXRlRGF0YVN0b3JlLT5zZXNzaW9uSUQoKTsKIH0KIAorRHJhd2luZ0FyZWFQ cm94eSogV2ViUGFnZVByb3h5OjpkcmF3aW5nQXJlYSgpIGNvbnN0Cit7CisgICAgaWYgKG1fcHJv dmlzaW9uYWxQYWdlICYmIG1fcHJvY2Vzcy5wdHIoKSA9PSAmbV9wcm92aXNpb25hbFBhZ2UtPnBy b2Nlc3MoKSAmJiBtX3Byb3Zpc2lvbmFsUGFnZS0+ZHJhd2luZ0FyZWEoKSkKKyAgICAgICAgcmV0 dXJuIG1fcHJvdmlzaW9uYWxQYWdlLT5kcmF3aW5nQXJlYSgpOworICAgIHJldHVybiBtX2RyYXdp bmdBcmVhLmdldCgpOworfQorCiB2b2lkIFdlYlBhZ2VQcm94eTo6Y2hhbmdlV2Vic2l0ZURhdGFT dG9yZShXZWJzaXRlRGF0YVN0b3JlJiB3ZWJzaXRlRGF0YVN0b3JlKQogewogICAgIG1fcHJvY2Vz cy0+cHJvY2Vzc1Bvb2woKS5wYWdlRW5kVXNpbmdXZWJzaXRlRGF0YVN0b3JlKCp0aGlzKTsKQEAg LTc2OCwzOCArNzc2LDI2IEBAIGJvb2wgV2ViUGFnZVByb3h5OjpzdXNwZW5kQ3VycmVudFBhZ2VJ ZlBvc3NpYmxlKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgT3B0CiAgICAgcmV0dXJuIHRy dWU7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojpzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9j ZXNzUHJveHk+JiYgcHJvY2Vzcywgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4m JiBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UsIElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJv bVN1c3BlbmRlZCkKK3ZvaWQgV2ViUGFnZVByb3h5Ojpzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQ cm9jZXNzUHJveHk+JiYgcHJvY2Vzcywgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+ JiYgZHJhd2luZ0FyZWEsIFJlZlB0cjxXZWJGcmFtZVByb3h5PiYmIG1haW5GcmFtZSkKIHsKICAg ICBBU1NFUlQoIW1faXNDbG9zZWQpOwogICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGlu ZywgInN3YXBUb1dlYlByb2Nlc3M6IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQsIG1f cHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQpOwogCiAgICAgbV9wcm9jZXNz ID0gV1RGTW92ZShwcm9jZXNzKTsKKyAgICBBU1NFUlQoIW1fZHJhd2luZ0FyZWEpOworICAgIHNl dERyYXdpbmdBcmVhKFdURk1vdmUoZHJhd2luZ0FyZWEpKTsKKyAgICBBU1NFUlQoIW1fbWFpbkZy YW1lKTsKKyAgICBtX21haW5GcmFtZSA9IFdURk1vdmUobWFpbkZyYW1lKTsKICAgICBtX2lzVmFs aWQgPSB0cnVlOwogCi0gICAgLy8gSWYgd2UgYXJlIHJlYXR0YWNoaW5nIHRvIGEgU3VzcGVuZGVk UGFnZSwgdGhlbiB0aGUgV2ViUHJvY2VzcycgV2ViUGFnZSBhbHJlYWR5IGV4aXN0cyBhbmQKLSAg ICAvLyBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZU1haW5GcmFtZSgpIHdpbGwgbm90IGJlIGNhbGxl ZCB0byBpbml0aWFsaXplIG1fbWFpbkZyYW1lLiBJbiBzdWNoCi0gICAgLy8gY2FzZSwgd2UgbmVl ZCB0byBpbml0aWFsaXplIG1fbWFpbkZyYW1lIHRvIHJlZmxlY3QgdGhlIGZhY3QgdGhlIHRoZSBX ZWJQcm9jZXNzJyBXZWJQYWdlCi0gICAgLy8gYWxyZWFkeSBleGlzdHMgYW5kIGFscmVhZHkgaGFz IGEgbWFpbiBmcmFtZS4KLSAgICBpZiAoZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlKSB7Ci0gICAg ICAgIGlmICghZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5mYWlsZWRUb1N1c3BlbmQoKSkgewot ICAgICAgICAgICAgQVNTRVJUKCFtX21haW5GcmFtZSk7Ci0gICAgICAgICAgICBBU1NFUlQoJmRl c3RpbmF0aW9uU3VzcGVuZGVkUGFnZS0+cHJvY2VzcygpID09IG1fcHJvY2Vzcy5wdHIoKSk7Ci0g ICAgICAgICAgICBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPnVuc3VzcGVuZCgpOwotICAgICAg ICAgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5OjpjcmVhdGUoKnRoaXMsIGRlc3RpbmF0 aW9uU3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSk7Ci0gICAgICAgICAgICBtX3Byb2Nlc3Mt PmZyYW1lQ3JlYXRlZChkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPm1haW5GcmFtZUlEKCksICpt X21haW5GcmFtZSk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAvLyBXZSBmYWlsZWQg dG8gc3VzcGVuZCB0aGUgcGFnZSBzbyBkZXN0cm95IGl0IG5vdyBhbmQgbWVyZWx5IHJldXNlIGl0 cyBXZWJDb250ZW50IHByb2Nlc3MuCi0gICAgICAgICAgICBkZXN0aW5hdGlvblN1c3BlbmRlZFBh Z2UgPSBudWxscHRyOwotICAgICAgICB9Ci0gICAgfQotCiAgICAgbV9wcm9jZXNzLT5hZGRFeGlz dGluZ1dlYlBhZ2UoKnRoaXMsIG1fcGFnZUlELCBXZWJQcm9jZXNzUHJveHk6OkJlZ2luc1VzaW5n RGF0YVN0b3JlOjpObyk7CiAgICAgbV9wcm9jZXNzLT5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2VJRCwgKnRoaXMp OwogCi0gICAgZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKGlzU3dhcEZyb21TdXNwZW5kZWQp OworICAgIC8vIE5vIG5lZWQgdG8gaW5pdGlhbGl6ZSB0aGUgV2ViUGFnZSBzaW5jZSBpdCB3YXMg Y3JlYXRlZCB3aGVuIHdlIGNyZWF0ZWQgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5LgorICAgIGZp bmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhTaG91bGRJbml0aWFsaXplV2ViUGFnZTo6Tm8pOwog fQogCi12b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKElzU3dh cEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1c3BlbmRlZCkKK3ZvaWQgV2ViUGFnZVByb3h5Ojpm aW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoU2hvdWxkSW5pdGlhbGl6ZVdlYlBhZ2Ugc2hvdWxk SW5pdGlhbGl6ZVBhZ2UpCiB7CiAgICAgQVNTRVJUKG1fcHJvY2Vzcy0+c3RhdGUoKSAhPSBDaGls ZFByb2Nlc3NQcm94eTo6U3RhdGU6OlRlcm1pbmF0ZWQpOwogCkBAIC04MzUsNyArODMxLDggQEAg dm9pZCBXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhJc1N3YXBGcm9t U3VzcGVuZGVkIGlzU3dhcEZyb21TdXMKICAgICBtX2VkaXRhYmxlSW1hZ2VDb250cm9sbGVyID0g c3RkOjptYWtlX3VuaXF1ZTxFZGl0YWJsZUltYWdlQ29udHJvbGxlcj4oKnRoaXMpOwogI2VuZGlm CiAKLSAgICBpbml0aWFsaXplV2ViUGFnZShpc1N3YXBGcm9tU3VzcGVuZGVkKTsKKyAgICBpZiAo c2hvdWxkSW5pdGlhbGl6ZVBhZ2UgPT0gU2hvdWxkSW5pdGlhbGl6ZVdlYlBhZ2U6OlllcykKKyAg ICAgICAgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsKIAogICAgIG1faW5zcGVjdG9yLT51cGRhdGVGb3JO ZXdQYWdlUHJvY2Vzcyh0aGlzKTsKIApAQCAtOTAwLDEyICs4OTcsMTEgQEAgUmVmUHRyPEFQSTo6 TmF2aWdhdGlvbj4gV2ViUGFnZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2Vzc1dpdGhJdGVtKFdl YkJhY2tGb3J3YXIKICAgICByZXR1cm4gV1RGTW92ZShuYXZpZ2F0aW9uKTsKIH0KIAotdm9pZCBX ZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2Fw RnJvbVN1c3BlbmRlZCkKK3ZvaWQgV2ViUGFnZVByb3h5OjpzZXREcmF3aW5nQXJlYShzdGQ6OnVu aXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4mJiBkcmF3aW5nQXJlYSkKIHsKLSAgICBBU1NFUlQo aXNWYWxpZCgpKTsKLQotICAgIG1fZHJhd2luZ0FyZWEgPSBwYWdlQ2xpZW50KCkuY3JlYXRlRHJh d2luZ0FyZWFQcm94eSgpOwotICAgIEFTU0VSVChtX2RyYXdpbmdBcmVhKTsKKyAgICBtX2RyYXdp bmdBcmVhID0gV1RGTW92ZShkcmF3aW5nQXJlYSk7CisgICAgaWYgKCFtX2RyYXdpbmdBcmVhKQor ICAgICAgICByZXR1cm47CiAKICNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKSAmJiBQTEFURk9S TShDT0NPQSkKICAgICBpZiAobV9kcmF3aW5nQXJlYS0+dHlwZSgpID09IERyYXdpbmdBcmVhVHlw ZVJlbW90ZUxheWVyVHJlZSkgewpAQCAtOTE2LDE1ICs5MTIsMTYgQEAgdm9pZCBXZWJQYWdlUHJv eHk6OmluaXRpYWxpemVXZWJQYWdlKElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1c3Bl bmRlZCkKICNlbmRpZgogICAgIH0KICNlbmRpZgorfQogCi0gICAgYXV0byBwYXJhbWV0ZXJzID0g Y3JlYXRpb25QYXJhbWV0ZXJzKCk7Ci0gICAgcGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVk ID0gaXNTd2FwRnJvbVN1c3BlbmRlZCA9PSBJc1N3YXBGcm9tU3VzcGVuZGVkOjpZZXM7Cit2b2lk IFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoKQoreworICAgIEFTU0VSVChpc1ZhbGlk KCkpOwogCi0jaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQotICAgIHBhcmFtZXRlcnMuaGFzUmVn aXN0ZXJlZFNlcnZpY2VXb3JrZXJzID0gcHJvY2VzcygpLnByb2Nlc3NQb29sKCkubWF5SGF2ZVJl Z2lzdGVyZWRTZXJ2aWNlV29ya2VycyhtX3dlYnNpdGVEYXRhU3RvcmUpOwotI2VuZGlmCisgICAg c2V0RHJhd2luZ0FyZWEocGFnZUNsaWVudCgpLmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKSk7Cisg ICAgQVNTRVJUKG1fZHJhd2luZ0FyZWEpOwogCi0gICAgcHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6 OldlYlByb2Nlc3M6OkNyZWF0ZVdlYlBhZ2UobV9wYWdlSUQsIHBhcmFtZXRlcnMpLCAwKTsKKyAg ICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6Q3JlYXRlV2ViUGFnZShtX3Bh Z2VJRCwgY3JlYXRpb25QYXJhbWV0ZXJzKCkpLCAwKTsKIAogICAgIG1fbmVlZHNUb0ZpbmlzaElu aXRpYWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2ggPSB0cnVlOwogICAgIGZpbmlzaElu aXRpYWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2goKTsKQEAgLTEwNzYsNyArMTA3Myw4 IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2 aWdhdGlvbiYgbmF2aWdhdGlvbiwgUmVzb3VyCiAgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFn ZUxvYWRTdGF0ZS50cmFuc2FjdGlvbigpOwogCiAgICAgYXV0byB1cmwgPSByZXF1ZXN0LnVybCgp OwotICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFuc2FjdGlv biwgdXJsKTsKKyAgICBpZiAoc2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkICE9IFNob3VsZFRy ZWF0QXNDb250aW51aW5nTG9hZDo6WWVzKQorICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0UGVu ZGluZ0FQSVJlcXVlc3RVUkwodHJhbnNhY3Rpb24sIHVybCk7CiAKICAgICBpZiAoIWlzVmFsaWQo KSkKICAgICAgICAgcmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsKQEAgLTEyOTQsNiArMTI5MiwxMCBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6c3RvcExvYWRpbmcoKQogICAgIH0KIAogICAgIG1fcHJvY2Vz cy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U3RvcExvYWRpbmcoKSwgbV9wYWdlSUQpOworICAg IGlmIChtX3Byb3Zpc2lvbmFsUGFnZSkgeworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZS0+Y2Fu Y2VsKCk7CisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlID0gbnVsbHB0cjsKKyAgICB9CiAgICAg bV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKIH0KIApAQCAtMjY5OCw3 ICsyNzAwLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURl Y2lzaW9uKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24KICAgICAgICAgfQogCiAgICAgICAg IGlmIChwcm9jZXNzRm9yTmF2aWdhdGlvbi5wdHIoKSAhPSAmcHJvY2VzcygpKSB7Ci0gICAgICAg ICAgICBwb2xpY3lBY3Rpb24gPSBpc1BhZ2VPcGVuZWRCeURPTVNob3dpbmdJbml0aWFsRW1wdHlE b2N1bWVudCgpID8gV2ViUG9saWN5QWN0aW9uOjpJZ25vcmUgOiBXZWJQb2xpY3lBY3Rpb246OlN1 c3BlbmQ7CisgICAgICAgICAgICBwb2xpY3lBY3Rpb24gPSBXZWJQb2xpY3lBY3Rpb246Oklnbm9y ZTsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAi ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiwgc3dhcHBpbmcgcHJvY2VzcyAlaSB3aXRo IHByb2Nlc3MgJWkgZm9yIG5hdmlnYXRpb24sIHJlYXNvbjogJXtwdWJsaWN9cyIsIHByb2Nlc3NJ ZGVudGlmaWVyKCksIHByb2Nlc3NGb3JOYXZpZ2F0aW9uLT5wcm9jZXNzSWRlbnRpZmllcigpLCBy ZWFzb24udXRmOCgpLmRhdGEoKSk7CiAgICAgICAgICAgICBMT0coUHJvY2Vzc1N3YXBwaW5nLCAi KFByb2Nlc3NTd2FwcGluZykgU3dpdGNoaW5nIGZyb20gcHJvY2VzcyAlaSB0byBuZXcgcHJvY2Vz cyAoJWkpIGZvciBuYXZpZ2F0aW9uICUiIFBSSXU2NCAiICclcyciLCBwcm9jZXNzSWRlbnRpZmll cigpLCBwcm9jZXNzRm9yTmF2aWdhdGlvbi0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbmF2aWdhdGlv bi0+bmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24tPmxvZ2dpbmdTdHJpbmcoKSk7CiAgICAgICAg IH0gZWxzZQpAQCAtMjcwNyw4ICsyNzA5LDE0IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZl ZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbihXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uCiAg ICAgICAgIGJvb2wgc2hvdWxkUHJvY2Vzc1N3YXAgPSBwcm9jZXNzRm9yTmF2aWdhdGlvbi5wdHIo KSAhPSAmcHJvY2VzcygpOwogICAgICAgICByZWNlaXZlZFBvbGljeURlY2lzaW9uKHBvbGljeUFj dGlvbiwgbmF2aWdhdGlvbi5wdHIoKSwgc2hvdWxkUHJvY2Vzc1N3YXAgPyBXVEY6Om51bGxvcHQg OiBXVEZNb3ZlKGRhdGEpLCBXVEZNb3ZlKHNlbmRlcikpOwogCi0gICAgICAgIGlmIChzaG91bGRQ cm9jZXNzU3dhcCkKLSAgICAgICAgICAgIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2Vzcyhu YXZpZ2F0aW9uLCBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UgPyBwcm9jZXNzKCkucHJvY2Vzc1Bv b2woKS50YWtlU3VzcGVuZGVkUGFnZSgqZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlKSA6IG51bGxw dHIsIFdURk1vdmUocHJvY2Vzc0Zvck5hdmlnYXRpb24pLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5 Q2xpZW50LCBXVEZNb3ZlKGRhdGEpKTsKKyAgICAgICAgaWYgKCFzaG91bGRQcm9jZXNzU3dhcCkK KyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBhdXRvIHN1c3BlbmRlZFBhZ2UgPSBkZXN0 aW5hdGlvblN1c3BlbmRlZFBhZ2UgPyBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS50YWtlU3VzcGVu ZGVkUGFnZSgqZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlKSA6IG51bGxwdHI7CisgICAgICAgIGlm IChzdXNwZW5kZWRQYWdlICYmIHN1c3BlbmRlZFBhZ2UtPmZhaWxlZFRvU3VzcGVuZCgpKQorICAg ICAgICAgICAgc3VzcGVuZGVkUGFnZSA9IG51bGxwdHI7CisKKyAgICAgICAgY29udGludWVOYXZp Z2F0aW9uSW5OZXdQcm9jZXNzKG5hdmlnYXRpb24sIFdURk1vdmUoc3VzcGVuZGVkUGFnZSksIFdU Rk1vdmUocHJvY2Vzc0Zvck5hdmlnYXRpb24pLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50 LCBXVEZNb3ZlKGRhdGEpKTsKICAgICB9KTsKIH0KIApAQCAtMjc0NCwyNCArMjc1Miw0NSBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6cmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihXZWJQb2xpY3lBY3Rpb24g YWN0aW9uLCBBUEk6Ok5hdmlnYXRpbwogICAgIHNlbmRlci0+c2VuZChhY3Rpb24sIG5hdmlnYXRp b24gPyBuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSA6IDAsIGRvd25sb2FkSUQsIFdURk1vdmUo d2Vic2l0ZVBvbGljaWVzKSk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojpjb250aW51ZU5hdmln YXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBzdGQ6OnVuaXF1 ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmIHN1c3BlbmRlZFBhZ2VQcm94eSwgUmVmPFdlYlBy b2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYg d2Vic2l0ZVBvbGljaWVzKQordm9pZCBXZWJQYWdlUHJveHk6OmNvbW1pdFByb3Zpc2lvbmFsUGFn ZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYg bWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90IGZy YW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYgY2VydGlmaWNhdGVJ bmZvLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0lu c2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYg dXNlckRhdGEpCiB7Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiY29udGlu dWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0 LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKLSAgICBMT0coTG9h ZGluZywgIkNvbnRpbnVpbmcgbmF2aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMnIGluIGEgbmV3IHdl YiBwcm9jZXNzIiwgbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi5sb2dnaW5n U3RyaW5nKCkpOworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFnZSk7CisgICAgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiY29tbWl0UHJvdmlzaW9uYWxQYWdlOiBwcmV2aW91c1BJ RCA9ICVpLCBuZXdQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nl c3NJZGVudGlmaWVyKCksIG1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCkucHJvY2Vzc0lkZW50 aWZpZXIoKSwgbV9wYWdlSUQpOwogCi0gICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gcHJldmlvdXNQ cm9jZXNzID0gbV9wcm9jZXNzLmNvcHlSZWYoKTsKICAgICBPcHRpb25hbDx1aW50NjRfdD4gbWFp bkZyYW1lSURJblByZXZpb3VzUHJvY2VzcyA9IG1fbWFpbkZyYW1lID8gbWFrZU9wdGlvbmFsKG1f bWFpbkZyYW1lLT5mcmFtZUlEKCkpIDogV1RGOjpudWxsb3B0OwotICAgIGF1dG8gbWFpbkZyYW1l VVJMID0gbV9tYWluRnJhbWUgPyBtX21haW5GcmFtZS0+dXJsKCkgOiBVUkwoKTsKIAotICAgIEFT U0VSVChtX3Byb2Nlc3MucHRyKCkgIT0gcHJvY2Vzcy5wdHIoKSk7CisgICAgQVNTRVJUKG1fcHJv Y2Vzcy5wdHIoKSAhPSAmbV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3MoKSk7CiAKICAgICBwcm9j ZXNzRGlkVGVybWluYXRlKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbjo6TmF2aWdhdGlvblN3YXAp OwogCiAgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2VJRCk7Ci0gICAgYm9vbCBkaWRT dXNwZW5kUHJldmlvdXNQYWdlID0gc3VzcGVuZEN1cnJlbnRQYWdlSWZQb3NzaWJsZShuYXZpZ2F0 aW9uLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5 Q2xpZW50KTsKKyAgICBhdXRvKiBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0YXRlKCkubmF2aWdh dGlvbihtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkpOworICAgIGJvb2wgZGlkU3Vz cGVuZFByZXZpb3VzUGFnZSA9IG5hdmlnYXRpb24gPyBzdXNwZW5kQ3VycmVudFBhZ2VJZlBvc3Np YmxlKCpuYXZpZ2F0aW9uLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzLCBtX3Byb3Zpc2lv bmFsUGFnZS0+cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCgpKSA6IGZhbHNlOwogICAgIG1f cHJvY2Vzcy0+cmVtb3ZlV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQsIFdlYlByb2Nlc3NQcm94eTo6 RW5kc1VzaW5nRGF0YVN0b3JlOjpObyk7CiAKLSAgICBzd2FwVG9XZWJQcm9jZXNzKFdURk1vdmUo cHJvY2VzcyksIFdURk1vdmUoc3VzcGVuZGVkUGFnZVByb3h5KSwgZGlkU3VzcGVuZFByZXZpb3Vz UGFnZSA/IElzU3dhcEZyb21TdXNwZW5kZWQ6OlllcyA6IElzU3dhcEZyb21TdXNwZW5kZWQ6Ok5v KTsKKyAgICAvLyBUaGVyZSBpcyBubyB3YXkgd2UnbGwgYmUgYWJsZSB0byByZXR1cm4gdG8gdGhl IHBhZ2UgaW4gdGhlIHByZXZpb3VzIHBhZ2Ugc28gY2xvc2UgaXQuCisgICAgaWYgKCFkaWRTdXNw ZW5kUHJldmlvdXNQYWdlKQorICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OkNsb3NlKCksIHBhZ2VJRCgpKTsKKworICAgIHN3YXBUb1dlYlByb2Nlc3MobV9wcm92aXNp b25hbFBhZ2UtPnByb2Nlc3MoKSwgbV9wcm92aXNpb25hbFBhZ2UtPnRha2VEcmF3aW5nQXJlYSgp LCBtX3Byb3Zpc2lvbmFsUGFnZS0+bWFpbkZyYW1lKCkpOworCisgICAgZGlkQ29tbWl0TG9hZEZv ckZyYW1lKGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgbWltZVR5cGUsIGZyYW1lSGFzQ3VzdG9tQ29u dGVudFByb3ZpZGVyLCBmcmFtZUxvYWRUeXBlLCBjZXJ0aWZpY2F0ZUluZm8sIGNvbnRhaW5zUGx1 Z2luRG9jdW1lbnQsIGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgdXNlckRhdGEpOworCisgICAg bV9wcm92aXNpb25hbFBhZ2UgPSBudWxscHRyOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6Y29u dGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwg c3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiBzdXNwZW5kZWRQYWdlUHJveHks IFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgbmV3UHJvY2VzcywgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRC eUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBPcHRpb25hbDxXZWJzaXRlUG9s aWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBSRUxFQVNFX0xPR19JRl9BTExP V0VEKExvYWRpbmcsICJjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3M6IHdlYlBJRCA9ICVp LCBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9w YWdlSUQpOworICAgIExPRyhMb2FkaW5nLCAiQ29udGludWluZyBuYXZpZ2F0aW9uICUiIFBSSXU2 NCAiICclcycgaW4gYSBuZXcgd2ViIHByb2Nlc3MiLCBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgp LCBuYXZpZ2F0aW9uLmxvZ2dpbmdTdHJpbmcoKSk7CisKKyAgICBpZiAobV9wcm92aXNpb25hbFBh Z2UpIHsKKyAgICAgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSAhPSBu YXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpKQorICAgICAgICAgICAgbV9wcm92aXNpb25hbFBhZ2Ut PmNhbmNlbCgpOworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7CisgICAgfQor CisgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBzdGQ6Om1ha2VfdW5pcXVlPFByb3Zpc2lvbmFsUGFn ZVByb3h5PigqdGhpcywgbmV3UHJvY2Vzcy5jb3B5UmVmKCksIFdURk1vdmUoc3VzcGVuZGVkUGFn ZVByb3h5KSwgbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi5jdXJyZW50UmVx dWVzdElzUmVkaXJlY3QoKSwgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpLCBwcm9jZXNzU3dh cFJlcXVlc3RlZEJ5Q2xpZW50KTsKIAogICAgIGlmIChhdXRvKiBpdGVtID0gbmF2aWdhdGlvbi50 YXJnZXRJdGVtKCkpIHsKICAgICAgICAgTE9HKExvYWRpbmcsICJXZWJQYWdlUHJveHkgJXAgY29u dGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzIHRvIGJhY2sgaXRlbSBVUkwgJXMiLCB0aGlzLCBp dGVtLT51cmwoKS51dGY4KCkuZGF0YSgpKTsKQEAgLTI3NjksNjcgKzI3OTgsMjIgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhBUEk6Ok5hdmlnYXRp b24mIG5hdmlnYXRpb24sIHMKICAgICAgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFnZUxvYWRT dGF0ZS50cmFuc2FjdGlvbigpOwogICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0UGVuZGluZ0FQ SVJlcXVlc3RVUkwodHJhbnNhY3Rpb24sIGl0ZW0tPnVybCgpKTsKIAotICAgICAgICBhdXRvIGl0 ZW1TdGF0ZXMgPSBtX2JhY2tGb3J3YXJkTGlzdC0+ZmlsdGVyZWRJdGVtU3RhdGVzKFt0aGlzLCB0 YXJnZXRJdGVtID0gaXRlbV0oV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYgaXRlbSkgewotICAgICAg ICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBpdGVtLnN1c3BlbmRlZFBhZ2UoKSkgewotICAgICAgICAg ICAgICAgIGlmICgmcGFnZS0+cHJvY2VzcygpID09IG1fcHJvY2Vzcy5wdHIoKSkKLSAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgcmV0 dXJuICZpdGVtICE9IHRhcmdldEl0ZW07Ci0gICAgICAgIH0pOwotICAgICAgICBtX3Byb2Nlc3Mt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlVwZGF0ZUJhY2tGb3J3YXJkTGlzdEZvclJlYXR0YWNo KFdURk1vdmUoaXRlbVN0YXRlcykpLCBtX3BhZ2VJRCk7Ci0gICAgICAgIG1fcHJvY2Vzcy0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uLm5hdmln YXRpb25JRCgpLCBpdGVtLT5pdGVtSUQoKSwgKm5hdmlnYXRpb24uYmFja0ZvcndhcmRGcmFtZUxv YWRUeXBlKCksIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNp dGVQb2xpY2llcykpLCBtX3BhZ2VJRCk7Ci0gICAgICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5l c3NUaW1lcigpLnN0YXJ0KCk7Ci0KKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UtPmdvVG9CYWNr Rm9yd2FyZEl0ZW0obmF2aWdhdGlvbiwgKml0ZW0sIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7 CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBpZiAobV9iYWNrRm9yd2FyZExpc3QtPmN1 cnJlbnRJdGVtKCkgJiYgKG5hdmlnYXRpb24ubG9ja0JhY2tGb3J3YXJkTGlzdCgpID09IExvY2tC YWNrRm9yd2FyZExpc3Q6OlllcyB8fCBuYXZpZ2F0aW9uLmxvY2tIaXN0b3J5KCkgPT0gTG9ja0hp c3Rvcnk6OlllcykpIHsKICAgICAgICAgLy8gSWYgV2ViQ29yZSBpcyBzdXBwb3NlZCB0byBsb2Nr IHRoZSBoaXN0b3J5IGZvciB0aGlzIGxvYWQsIHRoZW4gdGhlIG5ldyBwcm9jZXNzIG5lZWRzIHRv IGtub3cgYWJvdXQgdGhlIGN1cnJlbnQgaGlzdG9yeSBpdGVtIHNvIGl0IGNhbiB1cGRhdGUKICAg ICAgICAgLy8gaXQgaW5zdGVhZCBvZiBjcmVhdGluZyBhIG5ldyBvbmUuCi0gICAgICAgIG1fcHJv Y2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0Q3VycmVudEhpc3RvcnlJdGVtRm9yUmVh dHRhY2gobV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCktPml0ZW1TdGF0ZSgpKSwgbV9w YWdlSUQpOworICAgICAgICBuZXdQcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRD dXJyZW50SGlzdG9yeUl0ZW1Gb3JSZWF0dGFjaChtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0 ZW0oKS0+aXRlbVN0YXRlKCkpLCBtX3BhZ2VJRCk7CiAgICAgfQogCiAgICAgLy8gRklYTUU6IFdv cmsgb3V0IHRpbWluZyBvZiByZXNwb25kaW5nIHdpdGggdGhlIGxhc3QgcG9saWN5IGRlbGVnYXRl LCBldGMKICAgICBBU1NFUlQoIW5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKS5pc0VtcHR5KCkp OwogICAgIGlmIChhdXRvJiBzdWJzdGl0dXRlRGF0YSA9IG5hdmlnYXRpb24uc3Vic3RpdHV0ZURh dGEoKSkKLSAgICAgICAgbG9hZERhdGFXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCB7IHN1YnN0 aXR1dGVEYXRhLT5jb250ZW50LmRhdGEoKSwgc3Vic3RpdHV0ZURhdGEtPmNvbnRlbnQuc2l6ZSgp IH0sIHN1YnN0aXR1dGVEYXRhLT5NSU1FVHlwZSwgc3Vic3RpdHV0ZURhdGEtPmVuY29kaW5nLCBz dWJzdGl0dXRlRGF0YS0+YmFzZVVSTCwgc3Vic3RpdHV0ZURhdGEtPnVzZXJEYXRhLmdldCgpLCBT aG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMp KTsKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UtPmxvYWREYXRhV2l0aE5hdmlnYXRpb24obmF2 aWdhdGlvbiwgeyBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5kYXRhKCksIHN1YnN0aXR1dGVEYXRh LT5jb250ZW50LnNpemUoKSB9LCBzdWJzdGl0dXRlRGF0YS0+TUlNRVR5cGUsIHN1YnN0aXR1dGVE YXRhLT5lbmNvZGluZywgc3Vic3RpdHV0ZURhdGEtPmJhc2VVUkwsIHN1YnN0aXR1dGVEYXRhLT51 c2VyRGF0YS5nZXQoKSwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKICAgICBlbHNlCi0gICAg ICAgIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgUmVzb3VyY2VSZXF1ZXN0 IHsgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpIH0sIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRl cm5hbFVSTHNQb2xpY3k6OlNob3VsZEFsbG93RXh0ZXJuYWxTY2hlbWVzLCBudWxscHRyLCBTaG91 bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsK LQotICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOwotICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5k bGVyID0gW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCBuYXZpZ2F0aW9uSUQg PSBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCByZXF1ZXN0ID0gIG5hdmlnYXRpb24uY3VycmVu dFJlcXVlc3QoKSwgbWFpbkZyYW1lVVJMLCBpc1NlcnZlclJlZGlyZWN0ID0gbmF2aWdhdGlvbi5j dXJyZW50UmVxdWVzdElzUmVkaXJlY3QoKV0oKSBtdXRhYmxlIHsKLSAgICAgICAgaWYgKCF3ZWFr VGhpcykKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBBU1NFUlQobV9tYWluRnJhbWUp OwotICAgICAgICAvLyBUaGlzIG5hdmlnYXRpb24gd2FzIGRlc3Ryb3llZCBzbyBubyBuZWVkIHRv IG5vdGlmeSBvZiByZWRpcmVjdC4KLSAgICAgICAgaWYgKCFuYXZpZ2F0aW9uU3RhdGUoKS5uYXZp Z2F0aW9uKG5hdmlnYXRpb25JRCkpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgLy8g UmVzdG9yZSB0aGUgbWFpbiBmcmFtZSdzIGNvbW1pdHRlZCBVUkwgYXMgc29tZSBjbGllbnRzIG1h eSByZWx5IG9uIGl0IHVudGlsIHRoZSBuZXh0IGxvYWQgaXMgY29tbWl0dGVkLgotICAgICAgICBt X21haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5zZXRVUkwobWFpbkZyYW1lVVJMKTsKLQotICAg ICAgICAvLyBOb3JtYWxseSwgbm90aWZpY2F0aW9uIG9mIGEgc2VydmVyIHJlZGlyZWN0IGNvbWVz IGZyb20gdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KLSAgICAgICAgLy8gSWYgd2UgYXJlIHByb2Nl c3Mgc3dhcHBpbmcgaW4gcmVzcG9uc2UgdG8gYSBzZXJ2ZXIgcmVkaXJlY3QgdGhlbiB0aGF0IG5v dGlmaWNhdGlvbiB3aWxsIG5vdCBjb21lIGZyb20gdGhlIG5ldyBXZWJDb250ZW50IHByb2Nlc3Mu Ci0gICAgICAgIC8vIEluIHRoaXMgY2FzZSB3ZSBoYXZlIHRoZSBVSVByb2Nlc3Mgc3ludGhlc2l6 ZSB0aGUgcmVkaXJlY3Qgbm90aWZpY2F0aW9uIGF0IHRoZSBhcHByb3ByaWF0ZSB0aW1lLgotICAg ICAgICBpZiAoaXNTZXJ2ZXJSZWRpcmVjdCkgewotICAgICAgICAgICAgbV9tYWluRnJhbWUtPmZy YW1lTG9hZFN0YXRlKCkuZGlkU3RhcnRQcm92aXNpb25hbExvYWQocmVxdWVzdC51cmwoKSk7Ci0g ICAgICAgICAgICBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JG cmFtZShtX21haW5GcmFtZS0+ZnJhbWVJRCgpLCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUocmVxdWVz dCksIHsgfSk7Ci0gICAgICAgIH0KLSAgICB9OwotCi0gICAgaWYgKCFtX3Byb2Nlc3MtPnByb2Nl c3NQb29sKCkuY29uZmlndXJhdGlvbigpLnByb2Nlc3NTd2Fwc09uV2luZG93T3BlbldpdGhPcGVu ZXIoKSB8fCAhaXNQYWdlT3BlbmVkQnlET01TaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSB8 fCAhbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcykgewotICAgICAgICAvLyBUaGVyZSBpcyBu byB3YXkgd2UnbGwgYmUgYWJsZSB0byByZXR1cm4gdG8gdGhlIHBhZ2UgaW4gdGhlIHByZXZpb3Vz IHBhZ2Ugc28gY2xvc2UgaXQuCi0gICAgICAgIGlmICghZGlkU3VzcGVuZFByZXZpb3VzUGFnZSkK LSAgICAgICAgICAgIHByZXZpb3VzUHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xv c2UoKSwgbV9wYWdlSUQpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgbV9tYWluRnJh bWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIgPSBbdGhpcywgcHJldmlvdXNQcm9jZXNzID0gV1RGTW92 ZShwcmV2aW91c1Byb2Nlc3MpLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzID0gKm1haW5G cmFtZUlESW5QcmV2aW91c1Byb2Nlc3NdKGNvbnN0IEdsb2JhbFdpbmRvd0lkZW50aWZpZXImIHdp bmRvd0lkZW50aWZpZXIpIHsKLSAgICAgICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKLSAgICAgICAg R2xvYmFsRnJhbWVJZGVudGlmaWVyIG5hdmlnYXRlZEZyYW1lSWRlbnRpZmllckluTmV3UHJvY2Vz cyB7IHBhZ2VJRCgpLCBtX21haW5GcmFtZS0+ZnJhbWVJRCgpIH07Ci0gICAgICAgIHByZXZpb3Vz UHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RnJhbWVCZWNhbWVSZW1vdGUobWFpbkZy YW1lSURJblByZXZpb3VzUHJvY2VzcywgbmF2aWdhdGVkRnJhbWVJZGVudGlmaWVySW5OZXdQcm9j ZXNzLCB3aW5kb3dJZGVudGlmaWVyKSwgcGFnZUlEKCkpOwotICAgIH07CisgICAgICAgIG1fcHJv dmlzaW9uYWxQYWdlLT5sb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIFJlc291 cmNlUmVxdWVzdCB7IG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKSB9LCBXZWJDb3JlOjpTaG91 bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGRBbGxvd0V4dGVybmFsU2NoZW1lcywgbnVs bHB0ciwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKIH0KIAogYm9vbCBXZWJQYWdlUHJveHk6 OmlzUGFnZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgY29uc3QKQEAg LTM2OTQsMTEgKzM2NzgsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1l KHVpbnQ2NF90IGZyYW1lSUQpCiAKICAgICAvLyBBZGQgdGhlIGZyYW1lIHRvIHRoZSBwcm9jZXNz IHdpZGUgbWFwLgogICAgIG1fcHJvY2Vzcy0+ZnJhbWVDcmVhdGVkKGZyYW1lSUQsICptX21haW5G cmFtZSk7Ci0KLSAgICBpZiAobV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIpIHsKLSAgICAgICAg bV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIoKTsKLSAgICAgICAgbV9tYWluRnJhbWVDcmVhdGlv bkhhbmRsZXIgPSBudWxscHRyOwotICAgIH0KIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZENy ZWF0ZVN1YmZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCkBAIC0zNzIzLDEwICszNzAyLDYgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVN1YmZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCiAKIHZv aWQgV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVXaW5kb3codWludDY0X3QgZnJhbWVJRCwgR2xvYmFs V2luZG93SWRlbnRpZmllciYmIHdpbmRvd0lkZW50aWZpZXIpCiB7Ci0gICAgaWYgKG1fbWFpbkZy YW1lICYmIG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkgPT0gZnJhbWVJRCkgewotICAgICAgICBpZiAo YXV0byBtYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIgPSBXVEZNb3ZlKG1fbWFpbkZyYW1l V2luZG93Q3JlYXRpb25IYW5kbGVyKSkKLSAgICAgICAgICAgIG1haW5GcmFtZVdpbmRvd0NyZWF0 aW9uSGFuZGxlcih3aW5kb3dJZGVudGlmaWVyKTsKLSAgICB9CiB9CiAKIGRvdWJsZSBXZWJQYWdl UHJveHk6OmVzdGltYXRlZFByb2dyZXNzKCkgY29uc3QKQEAgLTM3NzksNiArMzc1NCwxMCBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRGVzdHJveU5hdmlnYXRpb24odWludDY0X3QgbmF2aWdhdGlv bklEKQogewogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7 CiAKKyAgICAvLyBPbiBwcm9jZXNzLXN3YXAsIHRoZSBwcmV2aW91cyBwcm9jZXNzIHRyaWVzIHRv IGRlc3Ryb3kgdGhlIG5hdmlnYXRpb24gYnV0IHRoZSBwcm92aXNpb25hbCBwcm9jZXNzIGlzIGFj dHVhbGx5IHRha2luZyBvdmVyIHRoZSBuYXZpZ2F0aW9uLgorICAgIGlmIChtX3Byb3Zpc2lvbmFs UGFnZSAmJiBtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkgPT0gbmF2aWdhdGlvbklE KQorICAgICAgICByZXR1cm47CisKICAgICAvLyBGSVhNRTogTWVzc2FnZSBjaGVjayB0aGUgbmF2 aWdhdGlvbklELgogICAgIG1fbmF2aWdhdGlvblN0YXRlLT5kaWREZXN0cm95TmF2aWdhdGlvbihu YXZpZ2F0aW9uSUQpOwogfQpAQCAtMzc5NiwxNCArMzc3NSw2IEBAIHZvaWQgV2ViUGFnZVByb3h5 OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2 NF90IG5hCiAgICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpICYmIG5hdmlnYXRpb25JRCkKICAg ICAgICAgbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRpb24obmF2aWdhdGlv bklEKTsKIAotICAgIC8vIElmIHRoaXMgc2VlbWluZ2x5IG5ldyBsb2FkIGlzIGFjdHVhbGx5IGNv bnRpbnVpbmcgYSBzZXJ2ZXIgcmVkaXJlY3QgZm9yIGEgcHJldmlvdXMgbmF2aWdhdGlvbiBpbiBh IG5ldyBwcm9jZXNzLAotICAgIC8vIHRoZW4gd2UgaWdub3JlIHRoaXMgbm90aWZpY2F0aW9uLgot ICAgIGlmIChuYXZpZ2F0aW9uICYmIG5hdmlnYXRpb24tPmN1cnJlbnRSZXF1ZXN0SXNSZWRpcmVj dCgpKSB7Ci0gICAgICAgIGF1dG8gbmF2aWdhdGlvblByb2Nlc3NJZGVudGlmaWVyID0gbmF2aWdh dGlvbi0+Y3VycmVudFJlcXVlc3RQcm9jZXNzSWRlbnRpZmllcigpOwotICAgICAgICBpZiAobmF2 aWdhdGlvblByb2Nlc3NJZGVudGlmaWVyICYmICpuYXZpZ2F0aW9uUHJvY2Vzc0lkZW50aWZpZXIg IT0gbV9wcm9jZXNzLT5jb3JlUHJvY2Vzc0lkZW50aWZpZXIoKSkKLSAgICAgICAgICAgIHJldHVy bjsKLSAgICB9Ci0KICAgICBMT0coTG9hZGluZywgIldlYlBhZ2VQcm94eSAlIiBQUkl1NjQgIiBp biBwcm9jZXNzIHBpZCAlaSBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lIHRvIGZyYW1l SUQgJSIgUFJJdTY0ICIsIG5hdmlnYXRpb25JRCAlIiBQUkl1NjQgIiwgdXJsICVzIiwgbV9wYWdl SUQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgZnJhbWVJRCwgbmF2aWdhdGlvbklE LCB1cmwuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RChMb2FkaW5nLCAiZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTogd2ViUElEID0gJWks IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnBy b2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlELCBmcmFtZUlEKTsKIApAQCAtMzkxMSw2ICszODgy LDExIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUo dWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2VjdXJpCiAKICAgICBQYWdlQ2xpZW50UHJvdGVjdG9y IHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlICYm IG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSA9PSBuYXZpZ2F0aW9uSUQgJiYgJm1f cHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCkgIT0gbV9wcm9jZXNzLnB0cigpKSB7CisgICAgICAg IC8vIFRoZSBsb2FkIGRpZCBub3QgZmFpbCwgaXQgbWVyZWx5IGhhcHBlbmluZyBpbiBhIG5ldyBw cm92aXNpb25hbCBwcm9jZXNzLgorICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgV2ViRnJh bWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwogICAgIE1FU1NB R0VfQ0hFQ0soZnJhbWUpOwogCkBAIC0zOTQ5LDYgKzM5MjUsMTAgQEAgdm9pZCBXZWJQYWdlUHJv eHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25z dCBTZWN1cmkKICAgICB9CiAKICAgICBtX2ZhaWxpbmdQcm92aXNpb25hbExvYWRVUkwgPSB7IH07 CisKKyAgICAvLyBJZiB0aGUgcHJvdmlzaW9uYWwgcGFnZSdzIGxvYWQgZmFpbHMgdGhlbiB3ZSBk ZXN0cm95IHRoZSBwcm92aXNpb25hbCBwYWdlLgorICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZSAm JiBtX3Byb3Zpc2lvbmFsUGFnZS0+bWFpbkZyYW1lKCkgPT0gZnJhbWUpCisgICAgICAgIG1fcHJv dmlzaW9uYWxQYWdlID0gbnVsbHB0cjsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmNsZWFyTG9h ZERlcGVuZGVudENhbGxiYWNrcygpCkBAIC00MzQwLDggKzQzMjAsOCBAQCB2b2lkIFdlYlBhZ2VQ cm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jKHVpbnQ2NF90IGZyYW1l SUQsIFdlYkNvcgogICAgIGF1dG8qIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlE KTsKICAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKIAotICAgIGRlY2lkZVBvbGljeUZvck5hdmln YXRpb25BY3Rpb24oKmZyYW1lLCBXVEZNb3ZlKGZyYW1lU2VjdXJpdHlPcmlnaW4pLCBuYXZpZ2F0 aW9uSUQsIFdURk1vdmUobmF2aWdhdGlvbkFjdGlvbkRhdGEpLCBXVEZNb3ZlKGZyYW1lSW5mb0Rh dGEpLCBvcmlnaW5hdGluZ1BhZ2VJRCwgb3JpZ2luYWxSZXF1ZXN0LCBXVEZNb3ZlKHJlcXVlc3Qp LCBXVEZNb3ZlKHJlcXVlc3RCb2R5KSwgV1RGTW92ZShyZWRpcmVjdFJlc3BvbnNlKSwgdXNlckRh dGEsIFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBt YWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRF0gKGF1dG8uLi4gYXJncykgewotICAg ICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xpY3lE ZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQpOworICAgIGRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oKmZyYW1lLCBXVEZNb3ZlKGZyYW1lU2VjdXJp dHlPcmlnaW4pLCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUobmF2aWdhdGlvbkFjdGlvbkRhdGEpLCBX VEZNb3ZlKGZyYW1lSW5mb0RhdGEpLCBvcmlnaW5hdGluZ1BhZ2VJRCwgb3JpZ2luYWxSZXF1ZXN0 LCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKHJlcXVlc3RCb2R5KSwgV1RGTW92ZShyZWRpcmVj dFJlc3BvbnNlKSwgdXNlckRhdGEsIFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMs IHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRCwgcHJv Y2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCldIChhdXRvLi4uIGFyZ3MpIHsKKyAgICAgICAgcHJv Y2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZy YW1lSUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CiAgICAgfSkpOwogfQogCkBA IC00NTc1LDEyICs0NTU1LDEyIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JS ZXNwb25zZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cml0eU9yaWdpCiAgICAgTUVTU0FH RV9DSEVDS19VUkwocmVzcG9uc2UudXJsKCkpOwogCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlv bj4gbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25JRCA/IG1fbmF2aWdhdGlvblN0YXRlLT5uYXZpZ2F0 aW9uKG5hdmlnYXRpb25JRCkgOiBudWxscHRyOwotICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtlUmVm KGZyYW1lLT5zZXRVcFBvbGljeUxpc3RlbmVyUHJveHkoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBt YWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRCwgbmF2aWdhdGlvbiA9IFdURk1vdmUo bmF2aWdhdGlvbildIChXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCBBUEk6OldlYnNpdGVQ b2xpY2llcyosIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0 ZWRCeUNsaWVudCwgUmVmUHRyPFNhZmVCcm93c2luZ1dhcm5pbmc+JiYgc2FmZUJyb3dzaW5nV2Fy bmluZykgbXV0YWJsZSB7CisgICAgYXV0byBsaXN0ZW5lciA9IG1ha2VSZWYoZnJhbWUtPnNldFVw UG9saWN5TGlzdGVuZXJQcm94eShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMp LCBmcmFtZUlELCBsaXN0ZW5lcklELCBuYXZpZ2F0aW9uID0gV1RGTW92ZShuYXZpZ2F0aW9uKSwg cHJvY2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCldIChXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0 aW9uLCBBUEk6OldlYnNpdGVQb2xpY2llcyosIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQg cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgUmVmUHRyPFNhZmVCcm93c2luZ1dhcm5pbmc+ JiYgc2FmZUJyb3dzaW5nV2FybmluZykgbXV0YWJsZSB7CiAgICAgICAgIC8vIEZJWE1FOiBBc3Nl cnQgdGhlIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiBpcyBudWxscHRyIGhlcmUgb25jZSBjbGllbnRz IG9mIFdLRnJhbWVQb2xpY3lMaXN0ZW5lclVzZVdpdGhQb2xpY2llcyBnbyBhd2F5LgogICAgICAg ICBSRUxFQVNFX0FTU0VSVChwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50ID09IFByb2Nlc3NT d2FwUmVxdWVzdGVkQnlDbGllbnQ6Ok5vKTsKICAgICAgICAgQVNTRVJUX1VOVVNFRChzYWZlQnJv d3NpbmdXYXJuaW5nLCAhc2FmZUJyb3dzaW5nV2FybmluZyk7Ci0gICAgICAgIHJlY2VpdmVkUG9s aWN5RGVjaXNpb24ocG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uLmdldCgpLCBXVEY6Om51bGxvcHQs IFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZN b3ZlKHByb3RlY3RlZFRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklEXSAoYXV0by4uLiBhcmdzKSB7 Ci0gICAgICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2Vp dmVQb2xpY3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQp OworICAgICAgICByZWNlaXZlZFBvbGljeURlY2lzaW9uKHBvbGljeUFjdGlvbiwgbmF2aWdhdGlv bi5nZXQoKSwgV1RGOjpudWxsb3B0LCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlz LCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKSwgZnJhbWVJRCwgbGlzdGVu ZXJJRCwgcHJvY2VzcyA9IFdURk1vdmUocHJvY2VzcyldIChhdXRvLi4uIGFyZ3MpIHsKKyAgICAg ICAgICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xpY3lE ZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQpOwogICAgICAg ICB9KSk7CiAgICAgfSwgU2hvdWxkRXhwZWN0U2FmZUJyb3dzaW5nUmVzdWx0OjpObykpOwogCkBA IC02NDAwLDYgKzYzODAsMTMgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnByb2Nlc3NEaWRUZXJtaW5h dGUoUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uIHJlYXNvbikKICAgICBzdG9wQWxsVVJMU2NoZW1l VGFza3MoKTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OnByb3Zpc2lvbmFsUHJvY2Vzc0RpZFRl cm1pbmF0ZSgpCit7CisgICAgQVNTRVJUKG1fcHJvdmlzaW9uYWxQYWdlKTsKKyAgICBtX3Byb3Zp c2lvbmFsUGFnZS0+Y2FuY2VsKCk7CisgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBudWxscHRyOwor fQorCiBzdGF0aWMgYm9vbCBzaG91bGRSZWxvYWRBZnRlclByb2Nlc3NUZXJtaW5hdGlvbihQcm9j ZXNzVGVybWluYXRpb25SZWFzb24gcmVhc29uKQogewogICAgIHN3aXRjaCAocmVhc29uKSB7CkBA IC02NDg3LDggKzY0NzQsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cHJvY2Vzc1dpbGxCZWNvbWVG b3JlZ3JvdW5kKCkKIHZvaWQgV2ViUGFnZVByb3h5OjpyZXNldFN0YXRlKFJlc2V0U3RhdGVSZWFz b24gcmVzZXRTdGF0ZVJlYXNvbikKIHsKICAgICBtX21haW5GcmFtZSA9IG51bGxwdHI7Ci0gICAg bV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIgPSBudWxscHRyOwotICAgIG1fbWFpbkZyYW1lV2lu ZG93Q3JlYXRpb25IYW5kbGVyID0gbnVsbHB0cjsKIAogI2lmIFBMQVRGT1JNKENPQ09BKQogICAg IG1fc2Nyb2xsaW5nUGVyZm9ybWFuY2VEYXRhID0gbnVsbHB0cjsKQEAgLTY3NzksNiArNjc2NCwx MCBAQCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJh bWV0ZXJzKCkKICAgICBwYXJhbWV0ZXJzLmFwcGxpY2F0aW9uTWFuaWZlc3QgPSBtX2NvbmZpZ3Vy YXRpb24tPmFwcGxpY2F0aW9uTWFuaWZlc3QoKSA/IE9wdGlvbmFsPFdlYkNvcmU6OkFwcGxpY2F0 aW9uTWFuaWZlc3Q+KG1fY29uZmlndXJhdGlvbi0+YXBwbGljYXRpb25NYW5pZmVzdCgpLT5hcHBs aWNhdGlvbk1hbmlmZXN0KCkpIDogV1RGOjpudWxsb3B0OwogI2VuZGlmCiAKKyNpZiBFTkFCTEUo U0VSVklDRV9XT1JLRVIpCisgICAgcGFyYW1ldGVycy5oYXNSZWdpc3RlcmVkU2VydmljZVdvcmtl cnMgPSBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS5tYXlIYXZlUmVnaXN0ZXJlZFNlcnZpY2VXb3Jr ZXJzKG1fd2Vic2l0ZURhdGFTdG9yZSk7CisjZW5kaWYKKwogICAgIHBhcmFtZXRlcnMubmVlZHNG b250QXR0cmlidXRlcyA9IG1fbmVlZHNGb250QXR0cmlidXRlczsKIAogICAgIG1fcHJvY2Vzcy0+ YWRkV2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJveHkobV91c2VyQ29udGVudENvbnRyb2xsZXIs IHBhcmFtZXRlcnMpOwpAQCAtODU0MCw2ICs4NTI5LDIxIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpz aW11bGF0ZURldmljZU9yaWVudGF0aW9uQ2hhbmdlKGRvdWJsZSBhbHBoYSwgZG91YmxlIGJldGEs IGRvCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTaW11bGF0ZURldmlj ZU9yaWVudGF0aW9uQ2hhbmdlKGFscGhhLCBiZXRhLCBnYW1tYSksIG1fcGFnZUlEKTsKIH0KIAor V2ViUGFnZVByb3h5OjpQYWdlUHJvY2Vzc092ZXJyaWRlOjpQYWdlUHJvY2Vzc092ZXJyaWRlKFdl YlBhZ2VQcm94eSYgcGFnZSwgV2ViUHJvY2Vzc1Byb3h5JiBuZXdQcm9jZXNzKQorICAgIDogbV9w YWdlKCZwYWdlKQorICAgICwgbV9wcmV2aW91c1Byb2Nlc3MocGFnZS5wcm9jZXNzKCkpCit7Cisg ICAgcGFnZS5tX3Byb2Nlc3MgPSBuZXdQcm9jZXNzOworfQorCitXZWJQYWdlUHJveHk6OlBhZ2VQ cm9jZXNzT3ZlcnJpZGU6OlBhZ2VQcm9jZXNzT3ZlcnJpZGUoUGFnZVByb2Nlc3NPdmVycmlkZSYm KSA9IGRlZmF1bHQ7CisKK1dlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6flBhZ2VQ cm9jZXNzT3ZlcnJpZGUoKQoreworICAgIGlmIChtX3BhZ2UpCisgICAgICAgIG1fcGFnZS0+bV9w cm9jZXNzID0gV1RGTW92ZShtX3ByZXZpb3VzUHJvY2Vzcyk7Cit9CisKICNpZiBFTkFCTEUoREFU QV9ERVRFQ1RJT04pCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkZXRlY3REYXRhSW5BbGxGcmFtZXMo V2ViQ29yZTo6RGF0YURldGVjdG9yVHlwZXMgdHlwZXMsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo Y29uc3QgRGF0YURldGVjdGlvblJlc3VsdCYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBkZTk4Njk0YWEzN2RiM2M3ZjJjZTI3 Y2M4MjlhOTIwMDIxMWRlMTBkLi40NTgyZjBhMTdmZTExNzgxNjczYmViZWM2NWNmZDJiMGU0NWZm ODAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMjI1LDYgKzIy NSw3IEBAIGNsYXNzIE5hdGl2ZVdlYktleWJvYXJkRXZlbnQ7CiBjbGFzcyBOYXRpdmVXZWJNb3Vz ZUV2ZW50OwogY2xhc3MgTmF0aXZlV2ViV2hlZWxFdmVudDsKIGNsYXNzIFBhZ2VDbGllbnQ7Citj bGFzcyBQcm92aXNpb25hbFBhZ2VQcm94eTsKIGNsYXNzIFJlbW90ZUxheWVyVHJlZUhvc3Q7CiBj bGFzcyBSZW1vdGVMYXllclRyZWVTY3JvbGxpbmdQZXJmb3JtYW5jZURhdGE7CiBjbGFzcyBSZW1v dGVMYXllclRyZWVUcmFuc2FjdGlvbjsKQEAgLTM1Niw3ICszNTcsNyBAQCBwdWJsaWM6CiAgICAg V2ViRnJhbWVQcm94eSogZm9jdXNlZEZyYW1lKCkgY29uc3QgeyByZXR1cm4gbV9mb2N1c2VkRnJh bWUuZ2V0KCk7IH0KICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZVNldExhcmdlc3RGcmFtZSgpIGNv bnN0IHsgcmV0dXJuIG1fZnJhbWVTZXRMYXJnZXN0RnJhbWUuZ2V0KCk7IH0KIAotICAgIERyYXdp bmdBcmVhUHJveHkqIGRyYXdpbmdBcmVhKCkgY29uc3QgeyByZXR1cm4gbV9kcmF3aW5nQXJlYS5n ZXQoKTsgfQorICAgIERyYXdpbmdBcmVhUHJveHkqIGRyYXdpbmdBcmVhKCkgY29uc3Q7CiAKICAg ICBXZWJOYXZpZ2F0aW9uU3RhdGUmIG5hdmlnYXRpb25TdGF0ZSgpIHsgcmV0dXJuICptX25hdmln YXRpb25TdGF0ZS5nZXQoKTsgfQogCkBAIC0zNzksNiArMzgwLDcgQEAgcHVibGljOgogCiAgICAg Ym9vbCBhZGRzVmlzaXRlZExpbmtzKCkgY29uc3QgeyByZXR1cm4gbV9hZGRzVmlzaXRlZExpbmtz OyB9CiAgICAgdm9pZCBzZXRBZGRzVmlzaXRlZExpbmtzKGJvb2wgYWRkc1Zpc2l0ZWRMaW5rcykg eyBtX2FkZHNWaXNpdGVkTGlua3MgPSBhZGRzVmlzaXRlZExpbmtzOyB9CisgICAgVmlzaXRlZExp bmtTdG9yZSYgdmlzaXRlZExpbmtTdG9yZSgpIHsgcmV0dXJuIG1fdmlzaXRlZExpbmtTdG9yZTsg fQogCiAgICAgdm9pZCBleGl0RnVsbHNjcmVlbkltbWVkaWF0ZWx5KCk7CiAgICAgdm9pZCBmdWxs c2NyZWVuTWF5UmV0dXJuVG9JbmxpbmUoKTsKQEAgLTQ1OCw4ICs0NjAsOCBAQCBwdWJsaWM6CiAg ICAgQVBJOjpJY29uTG9hZGluZ0NsaWVudCYgaWNvbkxvYWRpbmdDbGllbnQoKSB7IHJldHVybiAq bV9pY29uTG9hZGluZ0NsaWVudDsgfQogICAgIHZvaWQgc2V0SWNvbkxvYWRpbmdDbGllbnQoc3Rk Ojp1bmlxdWVfcHRyPEFQSTo6SWNvbkxvYWRpbmdDbGllbnQ+JiYpOwogCi0gICAgZW51bSBjbGFz cyBJc1N3YXBGcm9tU3VzcGVuZGVkIHsgTm8sIFllcyB9OwotICAgIHZvaWQgaW5pdGlhbGl6ZVdl YlBhZ2UoSXNTd2FwRnJvbVN1c3BlbmRlZCA9IElzU3dhcEZyb21TdXNwZW5kZWQ6Ok5vKTsKKyAg ICB2b2lkIGluaXRpYWxpemVXZWJQYWdlKCk7CisgICAgdm9pZCBzZXREcmF3aW5nQXJlYShzdGQ6 OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4mJik7CiAKICAgICBXZWFrUHRyPFNlY0tleVBy b3h5U3RvcmU+IHNlY0tleVByb3h5U3RvcmUoY29uc3QgV2ViQ29yZTo6QXV0aGVudGljYXRpb25D aGFsbGVuZ2UmKTsKICAgICAgICAgCkBAIC05OTcsNiArOTk5LDcgQEAgcHVibGljOgogICAgIHZv aWQgcHJvY2Vzc0RpZEJlY29tZVVucmVzcG9uc2l2ZSgpOwogICAgIHZvaWQgcHJvY2Vzc0RpZEJl Y29tZVJlc3BvbnNpdmUoKTsKICAgICB2b2lkIHByb2Nlc3NEaWRUZXJtaW5hdGUoUHJvY2Vzc1Rl cm1pbmF0aW9uUmVhc29uKTsKKyAgICB2b2lkIHByb3Zpc2lvbmFsUHJvY2Vzc0RpZFRlcm1pbmF0 ZSgpOwogICAgIHZvaWQgZGlzcGF0Y2hQcm9jZXNzRGlkVGVybWluYXRlKFByb2Nlc3NUZXJtaW5h dGlvblJlYXNvbik7CiAgICAgdm9pZCB3aWxsQ2hhbmdlUHJvY2Vzc0lzUmVzcG9uc2l2ZSgpOwog ICAgIHZvaWQgZGlkQ2hhbmdlUHJvY2Vzc0lzUmVzcG9uc2l2ZSgpOwpAQCAtMTAyNSw2ICsxMDI4 LDE5IEBAIHB1YmxpYzoKICAgICBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MoKSB7IHJldHVybiBt X3Byb2Nlc3M7IH0KICAgICBQcm9jZXNzSUQgcHJvY2Vzc0lkZW50aWZpZXIoKSBjb25zdDsKIAor ICAgIGNsYXNzIFBhZ2VQcm9jZXNzT3ZlcnJpZGUgeworICAgIHB1YmxpYzoKKyAgICAgICAgUGFn ZVByb2Nlc3NPdmVycmlkZShXZWJQYWdlUHJveHkmLCBXZWJQcm9jZXNzUHJveHkmIG5ld1Byb2Nl c3MpOworICAgICAgICBQYWdlUHJvY2Vzc092ZXJyaWRlKFBhZ2VQcm9jZXNzT3ZlcnJpZGUmJik7 CisgICAgICAgIH5QYWdlUHJvY2Vzc092ZXJyaWRlKCk7CisKKyAgICBwcml2YXRlOgorICAgICAg ICBSZWZQdHI8V2ViUGFnZVByb3h5PiBtX3BhZ2U7CisgICAgICAgIFJlZjxXZWJQcm9jZXNzUHJv eHk+IG1fcHJldmlvdXNQcm9jZXNzOworICAgIH07CisKKyAgICBQYWdlUHJvY2Vzc092ZXJyaWRl IHRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKFdlYlByb2Nlc3NQcm94eSYgbmV3UHJvY2Vzcykg eyByZXR1cm4gUGFnZVByb2Nlc3NPdmVycmlkZSgqdGhpcywgbmV3UHJvY2Vzcyk7IH0KKwogICAg IFdlYlByZWZlcmVuY2VzJiBwcmVmZXJlbmNlcygpIHsgcmV0dXJuIG1fcHJlZmVyZW5jZXM7IH0K ICAgICB2b2lkIHNldFByZWZlcmVuY2VzKFdlYlByZWZlcmVuY2VzJik7CiAKQEAgLTE0MTUsNiAr MTQzMSwyMSBAQCBwdWJsaWM6CiAgICAgRWRpdGFibGVJbWFnZUNvbnRyb2xsZXImIGVkaXRhYmxl SW1hZ2VDb250cm9sbGVyKCkgeyByZXR1cm4gKm1fZWRpdGFibGVJbWFnZUNvbnRyb2xsZXI7IH0K ICNlbmRpZgogCisgICAgUHJvdmlzaW9uYWxQYWdlUHJveHkqIHByb3Zpc2lvbmFsUGFnZVByb3h5 KCkgY29uc3QgeyByZXR1cm4gbV9wcm92aXNpb25hbFBhZ2UuZ2V0KCk7IH0KKyAgICB2b2lkIGNv bW1pdFByb3Zpc2lvbmFsUGFnZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9u SUQsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJv dmlkZXIsIHVpbnQzMl90IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRl SW5mbyYsIGJvb2wgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9uYWw8V2ViQ29yZTo6SGFz SW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIGNvbnN0IFVzZXJEYXRh Jik7CisKKyAgICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3Qg ZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiwgVVJMJiYgdW5yZWFjaGFibGVV UkwsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRh JiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmlu ZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBjb25zdCBV c2VyRGF0YSYpOworICAgIHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9u YWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgY29uc3QgVXNlckRhdGEmKTsKKworICAgIHZvaWQg bG9hZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBjb25zdCBJUEM6OkRhdGFS ZWZlcmVuY2UmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5n LCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6 U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRh PiYmID0gV1RGOjpudWxsb3B0KTsKKyAgICB2b2lkIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24o QVBJOjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlNo b3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29y ZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNE YXRhPiYmID0gV1RGOjpudWxsb3B0KTsKKworICAgIC8vIElQQzo6TWVzc2FnZVJlY2VpdmVyCisg ICAgLy8gSW1wbGVtZW50ZWQgaW4gZ2VuZXJhdGVkIFdlYlBhZ2VQcm94eU1lc3NhZ2VSZWNlaXZl ci5jcHAKKyAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6 RGVjb2RlciYpIG92ZXJyaWRlOworICAgIHZvaWQgZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6 Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYsIHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+ Jikgb3ZlcnJpZGU7CisKIHByaXZhdGU6CiAgICAgV2ViUGFnZVByb3h5KFBhZ2VDbGllbnQmLCBX ZWJQcm9jZXNzUHJveHkmLCB1aW50NjRfdCBwYWdlSUQsIFJlZjxBUEk6OlBhZ2VDb25maWd1cmF0 aW9uPiYmKTsKICAgICB2b2lkIHBsYXRmb3JtSW5pdGlhbGl6ZSgpOwpAQCAtMTQzOSwxMiArMTQ3 MCw2IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHNldFVzZXJBZ2VudChTdHJpbmcmJik7CiAKLSAg ICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgotICAgIC8vIEltcGxlbWVudGVkIGluIGdlbmVyYXRl ZCBXZWJQYWdlUHJveHlNZXNzYWdlUmVjZWl2ZXIuY3BwCi0gICAgdm9pZCBkaWRSZWNlaXZlTWVz c2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImKSBvdmVycmlkZTsKLSAgICB2b2lk IGRpZFJlY2VpdmVTeW5jTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImLCBz dGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVyPiYpIG92ZXJyaWRlOwotCi0KICAgICAvLyBJUEM6 Ok1lc3NhZ2VTZW5kZXIKICAgICBib29sIHNlbmRNZXNzYWdlKHN0ZDo6dW5pcXVlX3B0cjxJUEM6 OkVuY29kZXI+LCBPcHRpb25TZXQ8SVBDOjpTZW5kT3B0aW9uPikgb3ZlcnJpZGU7CiAgICAgSVBD OjpDb25uZWN0aW9uKiBtZXNzYWdlU2VuZGVyQ29ubmVjdGlvbigpIG92ZXJyaWRlOwpAQCAtMTQ2 NiwxMiArMTQ5MSw5IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaWRDcmVhdGVTdWJmcmFtZSh1aW50 NjRfdCBmcmFtZUlEKTsKICAgICB2b2lkIGRpZENyZWF0ZVdpbmRvdyh1aW50NjRfdCBmcmFtZUlE LCBXZWJDb3JlOjpHbG9iYWxXaW5kb3dJZGVudGlmaWVyJiYpOwogCi0gICAgdm9pZCBkaWRTdGFy dFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmln YXRpb25JRCwgVVJMJiYsIFVSTCYmIHVucmVhY2hhYmxlVVJMLCBjb25zdCBVc2VyRGF0YSYpOwot ICAgIHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJh bWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QmJiwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2b2lkIHdpbGxQZXJmb3JtQ2xp ZW50UmVkaXJlY3RGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTdHJpbmcmIHVybCwg ZG91YmxlIGRlbGF5LCBXZWJDb3JlOjpMb2NrQmFja0ZvcndhcmRMaXN0KTsKICAgICB2b2lkIGRp ZENhbmNlbENsaWVudFJlZGlyZWN0Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCk7CiAgICAgdm9p ZCBkaWRDaGFuZ2VQcm92aXNpb25hbFVSTEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2 NF90IG5hdmlnYXRpb25JRCwgVVJMJiYpOwotICAgIHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9h ZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2lu RGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBT dHJpbmcmIHByb3Zpc2lvbmFsVVJMLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgY29u c3QgVXNlckRhdGEmKTsKICAgICB2b2lkIGRpZENvbW1pdExvYWRGb3JGcmFtZSh1aW50NjRfdCBm cmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJv b2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90IGZyYW1lTG9hZFR5cGUs IGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYsIGJvb2wgY29udGFpbnNQbHVnaW5Eb2N1 bWVudCwgT3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJbnNl Y3VyZUNvbnRlbnQsIGNvbnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCBkaWRGaW5pc2hEb2N1bWVu dExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNv bnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJhbWUodWludDY0X3Qg ZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBVc2VyRGF0YSYpOwpAQCAtMTU3 NSwxOCArMTU5NywxNiBAQCBwcml2YXRlOgogICAgIHZvaWQgc2V0Q2FuU2hvcnRDaXJjdWl0SG9y aXpvbnRhbFdoZWVsRXZlbnRzKGJvb2wgY2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZl bnRzKSB7IG1fY2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRzID0gY2FuU2hvcnRD aXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRzOyB9CiAKICAgICB2b2lkIHJlYXR0YWNoVG9XZWJQ cm9jZXNzKCk7Ci0gICAgdm9pZCBzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+ JiYsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYsIElzU3dhcEZyb21TdXNw ZW5kZWQpOworICAgIHZvaWQgc3dhcFRvV2ViUHJvY2VzcyhSZWY8V2ViUHJvY2Vzc1Byb3h5PiYm LCBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4mJiwgUmVmUHRyPFdlYkZyYW1lUHJv eHk+JiYgbWFpbkZyYW1lKTsKICAgICB2b2lkIGRpZEZhaWxUb1N1c3BlbmRBZnRlclByb2Nlc3NT d2FwKCk7CiAgICAgdm9pZCBkaWRTdXNwZW5kQWZ0ZXJQcm9jZXNzU3dhcCgpOwogCi0gICAgdm9p ZCBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoSXNTd2FwRnJvbVN1c3BlbmRlZCA9IElzU3dh cEZyb21TdXNwZW5kZWQ6Ok5vKTsKKyAgICBlbnVtIGNsYXNzIFNob3VsZEluaXRpYWxpemVXZWJQ YWdlIHsgTm8sIFllcyB9OworICAgIHZvaWQgZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKFNo b3VsZEluaXRpYWxpemVXZWJQYWdlID0gU2hvdWxkSW5pdGlhbGl6ZVdlYlBhZ2U6Olllcyk7CiAK ICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiByZWF0dGFjaFRvV2ViUHJvY2Vzc0ZvclJlbG9h ZCgpOwogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IHJlYXR0YWNoVG9XZWJQcm9jZXNzV2l0 aEl0ZW0oV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYpOwogCi0gICAgdm9pZCBsb2FkRGF0YVdpdGhO YXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYsIGNv bnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmlu ZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFz Q29udGludWluZ0xvYWQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51 bGxvcHQpOwotICAgIHZvaWQgbG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRp b24mLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVy bmFsVVJMc1BvbGljeSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVh dEFzQ29udGludWluZ0xvYWQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6 Om51bGxvcHQpOwotCiAgICAgdm9pZCByZXF1ZXN0Tm90aWZpY2F0aW9uUGVybWlzc2lvbih1aW50 NjRfdCBub3RpZmljYXRpb25JRCwgY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcpOwogICAgIHZv aWQgc2hvd05vdGlmaWNhdGlvbihjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIGJv ZHksIGNvbnN0IFN0cmluZyYgaWNvblVSTCwgY29uc3QgU3RyaW5nJiB0YWcsIGNvbnN0IFN0cmlu ZyYgbGFuZywgV2ViQ29yZTo6Tm90aWZpY2F0aW9uRGlyZWN0aW9uLCBjb25zdCBTdHJpbmcmIG9y aWdpblN0cmluZywgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQpOwogICAgIHZvaWQgY2FuY2VsTm90 aWZpY2F0aW9uKHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsKQEAgLTE5NTIsOCArMTk3Miw2IEBA IHByaXZhdGU6CiAgICAgUmVmPFdlYnNpdGVEYXRhU3RvcmU+IG1fd2Vic2l0ZURhdGFTdG9yZTsK IAogICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5PiBtX21haW5GcmFtZTsKLSAgICBGdW5jdGlvbjx2 b2lkKCk+IG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyOwotICAgIEZ1bmN0aW9uPHZvaWQoY29u c3QgV2ViQ29yZTo6R2xvYmFsV2luZG93SWRlbnRpZmllciYpPiBtX21haW5GcmFtZVdpbmRvd0Ny ZWF0aW9uSGFuZGxlcjsKIAogICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5PiBtX2ZvY3VzZWRGcmFt ZTsKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9mcmFtZVNldExhcmdlc3RGcmFtZTsKQEAg LTIzMjQsNiArMjM0Miw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX25lZWRzRm9udEF0dHJpYnV0 ZXMgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9tYXlIYXZlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94 RXh0ZW5zaW9uIHsgZmFsc2UgfTsKIAorICAgIHN0ZDo6dW5pcXVlX3B0cjxQcm92aXNpb25hbFBh Z2VQcm94eT4gbV9wcm92aXNpb25hbFBhZ2U7CisKICNpZiBIQVZFKFBFTkNJTEtJVCkKICAgICBz dGQ6OnVuaXF1ZV9wdHI8RWRpdGFibGVJbWFnZUNvbnRyb2xsZXI+IG1fZWRpdGFibGVJbWFnZUNv bnRyb2xsZXI7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJv eHkuY3BwCmluZGV4IGRiMWZkNThiOTNkZmY1ODY1ZDEzZmM1NDFiNmU1ZDg3NDZlYjhlMGEuLjZi ZTlkYzM5OWUwMTQ4OGRhNjc4ZmI0NTY4ZWYzNmIyMWYzYzQ4NzYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAtMzQsNiArMzQsNyBAQAogI2luY2x1 ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJQbHVnaW5JbmZvU3RvcmUuaCIKICNpbmNsdWRlICJQ bHVnaW5Qcm9jZXNzTWFuYWdlci5oIgorI2luY2x1ZGUgIlByb3Zpc2lvbmFsUGFnZVByb3h5Lmgi CiAjaW5jbHVkZSAiVGV4dENoZWNrZXIuaCIKICNpbmNsdWRlICJUZXh0Q2hlY2tlclN0YXRlLmgi CiAjaW5jbHVkZSAiVUlNZXNzYWdlUG9ydENoYW5uZWxQcm92aWRlci5oIgpAQCAtNTg0LDYgKzU4 NSwxNSBAQCBib29sIFdlYlByb2Nlc3NQcm94eTo6ZnVsbEtleWJvYXJkQWNjZXNzRW5hYmxlZCgp CiB9CiAjZW5kaWYKIAorYm9vbCBXZWJQcm9jZXNzUHJveHk6Omhhc1Byb3Zpc2lvbmFsUGFnZVdp dGhJRCh1aW50NjRfdCBwYWdlSUQpIGNvbnN0Cit7CisgICAgZm9yIChhdXRvKiBwcm92aXNpb25h bFBhZ2UgOiBtX3Byb3Zpc2lvbmFsUGFnZXMpIHsKKyAgICAgICAgaWYgKHByb3Zpc2lvbmFsUGFn ZS0+cGFnZSgpLnBhZ2VJRCgpID09IHBhZ2VJRCkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOwor ICAgIH0KKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojp1cGRh dGVCYWNrRm9yd2FyZEl0ZW0oY29uc3QgQmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlJiBpdGVtU3Rh dGUpCiB7CiAgICAgaWYgKGF1dG8qIGl0ZW0gPSBXZWJCYWNrRm9yd2FyZExpc3RJdGVtOjppdGVt Rm9ySUQoaXRlbVN0YXRlLmlkZW50aWZpZXIpKSB7CkBAIC01OTEsNyArNjAxLDcgQEAgdm9pZCBX ZWJQcm9jZXNzUHJveHk6OnVwZGF0ZUJhY2tGb3J3YXJkSXRlbShjb25zdCBCYWNrRm9yd2FyZExp c3RJdGVtU3RhdGUmIGl0ZW0KICAgICAgICAgLy8gdGhlIGJhY2svZm9yd2FyZCBpdGVtcyBwYWdl LgogICAgICAgICAvLyBlLmcuIFRoZSBvbGQgd2ViIHByb2Nlc3MgaXMgbmF2aWdhdGluZyB0byBh Ym91dDpibGFuayBmb3Igc3VzcGVuc2lvbi4KICAgICAgICAgLy8gV2UgaWdub3JlIHRoZXNlIHVw ZGF0ZXMuCi0gICAgICAgIGlmIChtX3BhZ2VNYXAuY29udGFpbnMoaXRlbS0+cGFnZUlEKCkpKQor ICAgICAgICBpZiAobV9wYWdlTWFwLmNvbnRhaW5zKGl0ZW0tPnBhZ2VJRCgpKSB8fCBoYXNQcm92 aXNpb25hbFBhZ2VXaXRoSUQoaXRlbS0+cGFnZUlEKCkpKQogICAgICAgICAgICAgaXRlbS0+c2V0 UGFnZVN0YXRlKGl0ZW1TdGF0ZS5wYWdlU3RhdGUpOwogICAgIH0KIH0KQEAgLTY5NCw2ICs3MDQs NyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6cHJvY2Vzc0RpZFRlcm1pbmF0ZU9yRmFpbGVkVG9M YXVuY2goKQogICAgICAgICB3ZWJDb25uZWN0aW9uLT5kaWRDbG9zZSgpOwogCiAgICAgYXV0byBw YWdlcyA9IGNvcHlUb1ZlY3Rvck9mPFJlZlB0cjxXZWJQYWdlUHJveHk+PihtX3BhZ2VNYXAudmFs dWVzKCkpOworICAgIGF1dG8gcHJvdmlzaW9uYWxQYWdlcyA9IFdURjo6bWFwKG1fcHJvdmlzaW9u YWxQYWdlcywgW10oYXV0byogcHJvdmlzaW9uYWxQYWdlKSB7IHJldHVybiBtYWtlV2Vha1B0cihw cm92aXNpb25hbFBhZ2UpOyB9KTsKIAogICAgIHNodXREb3duKCk7CiAKQEAgLTcwOCw2ICs3MTks MTEgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OnByb2Nlc3NEaWRUZXJtaW5hdGVPckZhaWxlZFRv TGF1bmNoKCkKIAogICAgIGZvciAoYXV0byYgcGFnZSA6IHBhZ2VzKQogICAgICAgICBwYWdlLT5w cm9jZXNzRGlkVGVybWluYXRlKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbjo6Q3Jhc2gpOworCisg ICAgZm9yIChhdXRvJiBwcm92aXNpb25hbFBhZ2UgOiBwcm92aXNpb25hbFBhZ2VzKSB7CisgICAg ICAgIGlmIChwcm92aXNpb25hbFBhZ2UpCisgICAgICAgICAgICBwcm92aXNpb25hbFBhZ2UtPnBy b2Nlc3NEaWRUZXJtaW5hdGUoKTsKKyAgICB9CiB9CiAKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojpk aWRSZWNlaXZlSW52YWxpZE1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBJUEM6 OlN0cmluZ1JlZmVyZW5jZSBtZXNzYWdlUmVjZWl2ZXJOYW1lLCBJUEM6OlN0cmluZ1JlZmVyZW5j ZSBtZXNzYWdlTmFtZSkKQEAgLTc4MCw2ICs3OTYsMTIgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6 OmRpZEZpbmlzaExhdW5jaGluZyhQcm9jZXNzTGF1bmNoZXIqIGxhdW5jaGVyLCBJUEM6OkNvbm5l Y3QKICAgICAgICAgcGFnZS0+cHJvY2Vzc0RpZEZpbmlzaExhdW5jaGluZygpOwogICAgIH0KIAor ICAgIGZvciAoYXV0byogcHJvdmlzaW9uYWxQYWdlIDogbV9wcm92aXNpb25hbFBhZ2VzKSB7Cisg ICAgICAgIEFTU0VSVCh0aGlzID09ICZwcm92aXNpb25hbFBhZ2UtPnByb2Nlc3MoKSk7CisgICAg ICAgIHByb3Zpc2lvbmFsUGFnZS0+cHJvY2Vzc0RpZEZpbmlzaExhdW5jaGluZygpOworICAgIH0K KworCiAgICAgUkVMRUFTRV9BU1NFUlQoIW1fd2ViQ29ubmVjdGlvbik7CiAgICAgbV93ZWJDb25u ZWN0aW9uID0gV2ViQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6Y3JlYXRlKHRoaXMpOwogCkBAIC04 NzMsNyArODk1LDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6Om1heWJlU2h1dERvd24oKQogCiBi b29sIFdlYlByb2Nlc3NQcm94eTo6Y2FuVGVybWluYXRlQ2hpbGRQcm9jZXNzKCkKIHsKLSAgICBp ZiAoIW1fcGFnZU1hcC5pc0VtcHR5KCkgfHwgbV9wcm9jZXNzUG9vbC0+aGFzU3VzcGVuZGVkUGFn ZUZvcigqdGhpcykpCisgICAgaWYgKCFtX3BhZ2VNYXAuaXNFbXB0eSgpIHx8IG1fcHJvY2Vzc1Bv b2wtPmhhc1N1c3BlbmRlZFBhZ2VGb3IoKnRoaXMpIHx8ICFtX3Byb3Zpc2lvbmFsUGFnZXMuaXNF bXB0eSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAoIW1fcHJvY2Vzc1Bvb2wt PnNob3VsZFRlcm1pbmF0ZSh0aGlzKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Byb3h5LmgKaW5kZXggNzVmNjVhN2Y3ZWIxYWNjODE5OTkxY2U0ZjlmNjk4NmM5NWI2MWZmMy4u NTA0MjYzMGRlMzcxZDg1YTgyODM3NDM0OGFhOTY5MTczOWM5Y2Q3MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKQEAgLTcwLDYgKzcwLDcgQEAgbmFtZXNwYWNl IFdlYktpdCB7CiBjbGFzcyBOZXR3b3JrUHJvY2Vzc1Byb3h5OwogY2xhc3MgT2JqQ09iamVjdEdy YXBoOwogY2xhc3MgUGFnZUNsaWVudDsKK2NsYXNzIFByb3Zpc2lvbmFsUGFnZVByb3h5OwogY2xh c3MgVXNlck1lZGlhQ2FwdHVyZU1hbmFnZXJQcm94eTsKIGNsYXNzIFZpc2l0ZWRMaW5rU3RvcmU7 CiBjbGFzcyBXZWJCYWNrRm9yd2FyZExpc3RJdGVtOwpAQCAtMTI0LDYgKzEyNSw5IEBAIHB1Ymxp YzoKICAgICBlbnVtIGNsYXNzIEVuZHNVc2luZ0RhdGFTdG9yZSA6IGJvb2wgeyBObywgWWVzIH07 CiAgICAgdm9pZCByZW1vdmVXZWJQYWdlKFdlYlBhZ2VQcm94eSYsIHVpbnQ2NF90IHBhZ2VJRCwg RW5kc1VzaW5nRGF0YVN0b3JlKTsKIAorICAgIHZvaWQgYWRkUHJvdmlzaW9uYWxQYWdlUHJveHko UHJvdmlzaW9uYWxQYWdlUHJveHkmIHByb3Zpc2lvbmFsUGFnZSkgeyBBU1NFUlQoIW1fcHJvdmlz aW9uYWxQYWdlcy5jb250YWlucygmcHJvdmlzaW9uYWxQYWdlKSk7IG1fcHJvdmlzaW9uYWxQYWdl cy5hZGQoJnByb3Zpc2lvbmFsUGFnZSk7IH0KKyAgICB2b2lkIHJlbW92ZVByb3Zpc2lvbmFsUGFn ZVByb3h5KFByb3Zpc2lvbmFsUGFnZVByb3h5JiBwcm92aXNpb25hbFBhZ2UpIHsgQVNTRVJUKG1f cHJvdmlzaW9uYWxQYWdlcy5jb250YWlucygmcHJvdmlzaW9uYWxQYWdlKSk7IG1fcHJvdmlzaW9u YWxQYWdlcy5yZW1vdmUoJnByb3Zpc2lvbmFsUGFnZSk7IH0KKwogICAgIHR5cGVuYW1lIFdlYlBh Z2VQcm94eU1hcDo6VmFsdWVzQ29uc3RJdGVyYXRvclJhbmdlIHBhZ2VzKCkgY29uc3QgeyByZXR1 cm4gbV9wYWdlTWFwLnZhbHVlcygpOyB9CiAgICAgdW5zaWduZWQgcGFnZUNvdW50KCkgY29uc3Qg eyByZXR1cm4gbV9wYWdlTWFwLnNpemUoKTsgfQogICAgIHVuc2lnbmVkIHZpc2libGVQYWdlQ291 bnQoKSBjb25zdCB7IHJldHVybiBtX3Zpc2libGVQYWdlQ291bnRlci52YWx1ZSgpOyB9CkBAIC0z MzAsNiArMzM0LDggQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgbG9nRGlhZ25vc3RpY01lc3NhZ2VG b3JSZXNvdXJjZUxpbWl0VGVybWluYXRpb24oY29uc3QgU3RyaW5nJiBsaW1pdEtleSk7CiAKKyAg ICBib29sIGhhc1Byb3Zpc2lvbmFsUGFnZVdpdGhJRCh1aW50NjRfdCBwYWdlSUQpIGNvbnN0Owor CiAgICAgZW51bSBjbGFzcyBJc1dlYWsgeyBObywgWWVzIH07CiAgICAgdGVtcGxhdGU8dHlwZW5h bWUgVD4gY2xhc3MgV2Vha09yU3Ryb25nUHRyIHsKICAgICBwdWJsaWM6CkBAIC0zNzMsNiArMzc5 LDcgQEAgcHJpdmF0ZToKIAogICAgIFdlYlBhZ2VQcm94eU1hcCBtX3BhZ2VNYXA7CiAgICAgV2Vi RnJhbWVQcm94eU1hcCBtX2ZyYW1lTWFwOworICAgIEhhc2hTZXQ8UHJvdmlzaW9uYWxQYWdlUHJv eHkqPiBtX3Byb3Zpc2lvbmFsUGFnZXM7CiAgICAgVXNlckluaXRpYXRlZEFjdGlvbk1hcCBtX3Vz ZXJJbml0aWF0ZWRBY3Rpb25NYXA7CiAKICAgICBIYXNoU2V0PFZpc2l0ZWRMaW5rU3RvcmUqPiBt X3Zpc2l0ZWRMaW5rU3RvcmVzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oKaW5kZXggZGVkYmFkY2NkMzRmMGE0MzRkNmRlMTQ1NGM0NGE5ODkyMmNh MDFjZC4uZDdkYTI3YTA1MTI4OWU3ZTUxZjQ4ZTJjOWVjYTc5ZmE4OTExMjQ1MSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9T b3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0zMDcwLDYg KzMwNzAsOCBAQAogCQk0NjZCQzAzODFGQTI2NkM5MDAyRkE5QzEgLyogV2ViU1dDb250ZXh0TWFu YWdlckNvbm5lY3Rpb24uY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0g V2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQk0NjZCQzAzOTFGQTI2NkM5MDAyRkE5QzEgLyogV2ViU1dDb250ZXh0TWFuYWdlckNv bm5lY3Rpb24uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViU1dDb250ZXh0 TWFuYWdlckNvbm5lY3Rpb24uaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDY2QkMw M0ExRkEyNjZDOTAwMkZBOUMxIC8qIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLm1lc3Nh Z2VzLmluICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0 aW9uLm1lc3NhZ2VzLmluOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk0NjgzNTY5QTIx RTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQYWdlUHJveHkuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gUHJvdmlzaW9uYWxQYWdlUHJveHkuaDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKKwkJNDY4MzU2OUIyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFsUGFn ZVByb3h5LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFByb3Zpc2lv bmFsUGFnZVByb3h5LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDZBMkI2MDYx RTU2NzVBMjAwQzNERURBIC8qIEJhY2tncm91bmRQcm9jZXNzUmVzcG9uc2l2ZW5lc3NUaW1lci5j cHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBCYWNrZ3JvdW5kUHJvY2Vz c1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0 NkEyQjYwNzFFNTY3NUEyMDBDM0RFREEgLyogQmFja2dyb3VuZFByb2Nlc3NSZXNwb25zaXZlbmVz c1RpbWVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEJhY2tncm91bmRQcm9j ZXNzUmVzcG9uc2l2ZW5lc3NUaW1lci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0 NkRGMDYzOTFGMzkwNUU1MDAxOTgwQkIgLyogTmV0d29ya0NPUlNQcmVmbGlnaHRDaGVja2VyLmNw cCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IE5ldHdvcmtDT1JTUHJlZmxp Z2h0Q2hlY2tlci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC03MzEyLDYgKzcz MTQsOCBAQAogCQkJCTg2RTY3QTIyMTkwRjQxMTgwMDAwNEFCNyAvKiBQcm9jZXNzVGhyb3R0bGVy LmNwcCAqLywKIAkJCQk4NkU2N0EyMTE5MEY0MTE4MDAwMDRBQjcgLyogUHJvY2Vzc1Rocm90dGxl ci5oICovLAogCQkJCTgzMDQ4QUU1MUFDQTQ1REMwMDgyQzgzMiAvKiBQcm9jZXNzVGhyb3R0bGVy Q2xpZW50LmggKi8sCisJCQkJNDY4MzU2OUIyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFs UGFnZVByb3h5LmNwcCAqLywKKwkJCQk0NjgzNTY5QTIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlz aW9uYWxQYWdlUHJveHkuaCAqLywKIAkJCQlBNTVCQTgxQjFCQTI1QjFFMDA3Q0QzM0QgLyogUmVt b3RlV2ViSW5zcGVjdG9yUHJveHkuY3BwICovLAogCQkJCUE1NUJBODE5MUJBMjVCMUUwMDdDRDMz RCAvKiBSZW1vdGVXZWJJbnNwZWN0b3JQcm94eS5oICovLAogCQkJCUE1NUJBODFBMUJBMjVCMUUw MDdDRDMzRCAvKiBSZW1vdGVXZWJJbnNwZWN0b3JQcm94eS5tZXNzYWdlcy5pbiAqLywKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcCBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcAppbmRleCAwMDc0OWI0 NzdhMjRjZThjY2M4MjUwMWQ5NGUwOGI2MGVlMWE2MjYzLi5mZmVkMDBjODIwNmE5NGYwZTRmZmM3 ZmYzYThhOWRmZjg2MTNmYWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJGcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViRnJhbWUuY3BwCkBAIC0yNjMsOCArMjYzLDYgQEAgc3RhdGljIFdlYkNvcmU6OlBvbGlj eUFjdGlvbiB0b1BvbGljeUFjdGlvbihXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uKQogICAg ICAgICByZXR1cm4gV2ViQ29yZTo6UG9saWN5QWN0aW9uOjpJZ25vcmU7CiAgICAgY2FzZSBXZWJQ b2xpY3lBY3Rpb246OkRvd25sb2FkOgogICAgICAgICByZXR1cm4gV2ViQ29yZTo6UG9saWN5QWN0 aW9uOjpEb3dubG9hZDsKLSAgICBjYXNlIFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZDoKLSAgICAg ICAgYnJlYWs7CiAgICAgfQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIHJldHVybiBX ZWJDb3JlOjpQb2xpY3lBY3Rpb246Oklnbm9yZTsKQEAgLTI3MiwxMSArMjcwLDggQEAgc3RhdGlj IFdlYkNvcmU6OlBvbGljeUFjdGlvbiB0b1BvbGljeUFjdGlvbihXZWJQb2xpY3lBY3Rpb24gcG9s aWN5QWN0aW9uKQogCiB2b2lkIFdlYkZyYW1lOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24odWlu dDY0X3QgbGlzdGVuZXJJRCwgV2ViUG9saWN5QWN0aW9uIGFjdGlvbiwgdWludDY0X3QgbmF2aWdh dGlvbklELCBEb3dubG9hZElEIGRvd25sb2FkSUQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0Rh dGE+JiYgd2Vic2l0ZVBvbGljaWVzKQogewotICAgIGlmICghbV9jb3JlRnJhbWUgfHwgIW1fcG9s aWN5TGlzdGVuZXJJRCB8fCBsaXN0ZW5lcklEICE9IG1fcG9saWN5TGlzdGVuZXJJRCB8fCAhbV9w b2xpY3lGdW5jdGlvbikgewotICAgICAgICBpZiAoYWN0aW9uID09IFdlYlBvbGljeUFjdGlvbjo6 U3VzcGVuZCkKLSAgICAgICAgICAgIHBhZ2UoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjpEaWRGYWlsVG9TdXNwZW5kQWZ0ZXJQcm9jZXNzU3dhcCgpKTsKKyAgICBpZiAoIW1fY29yZUZy YW1lIHx8ICFtX3BvbGljeUxpc3RlbmVySUQgfHwgbGlzdGVuZXJJRCAhPSBtX3BvbGljeUxpc3Rl bmVySUQgfHwgIW1fcG9saWN5RnVuY3Rpb24pCiAgICAgICAgIHJldHVybjsKLSAgICB9CiAKICAg ICBGcmFtZVBvbGljeUZ1bmN0aW9uIGZ1bmN0aW9uID0gV1RGTW92ZShtX3BvbGljeUZ1bmN0aW9u KTsKICAgICBib29sIGZvck5hdmlnYXRpb25BY3Rpb24gPSBtX3BvbGljeUZ1bmN0aW9uRm9yTmF2 aWdhdGlvbkFjdGlvbiA9PSBGb3JOYXZpZ2F0aW9uQWN0aW9uOjpZZXM7CkBAIC0yOTIsMTYgKzI4 Nyw3IEBAIHZvaWQgV2ViRnJhbWU6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1aW50NjRfdCBs aXN0ZW5lcklELCBXZWJQb2xpY3lBY3Rpb24gYWN0CiAgICAgICAgICAgICBkb2N1bWVudExvYWRl ci0+c2V0TmF2aWdhdGlvbklEKG5hdmlnYXRpb25JRCk7CiAgICAgfQogCi0gICAgYm9vbCBzaG91 bGRTdXNwZW5kID0gZmFsc2U7Ci0gICAgaWYgKGFjdGlvbiA9PSBXZWJQb2xpY3lBY3Rpb246OlN1 c3BlbmQpIHsKLSAgICAgICAgc2hvdWxkU3VzcGVuZCA9IHRydWU7Ci0gICAgICAgIGFjdGlvbiA9 IFdlYlBvbGljeUFjdGlvbjo6SWdub3JlOwotICAgIH0KLQogICAgIGZ1bmN0aW9uKHRvUG9saWN5 QWN0aW9uKGFjdGlvbikpOwotCi0gICAgaWYgKHNob3VsZFN1c3BlbmQpCi0gICAgICAgIHBhZ2Uo KS0+c3VzcGVuZEZvclByb2Nlc3NTd2FwKCk7CiB9CiAKIHZvaWQgV2ViRnJhbWU6OnN0YXJ0RG93 bmxvYWQoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBTdHJp bmcmIHN1Z2dlc3RlZE5hbWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCmluZGV4IDgwM2JhOGI5OTVlZDNlYzgzMWFiNDZiNTM5N2M3NjYyZTZhODFjNjUu LjEwZTVhNzcyMzNjOTU3NjgxMmEzMDk3ZTA4M2ExNWY5MDBmZGViZTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC00MDEsNyArNDAxLDcgQEAg V2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnMmJiBwYXJhbWV0ZXJzKQogICAgICwgbV9vdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSB7 IHBhcmFtZXRlcnMub3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgfQogICAgICwgbV9jcHVM aW1pdChwYXJhbWV0ZXJzLmNwdUxpbWl0KQogI2lmIFBMQVRGT1JNKE1BQykKLSAgICAsIG1fc2hv dWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uKHBhcmFtZXRlcnMuaXNTd2FwRnJv bVN1c3BlbmRlZCkKKyAgICAsIG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0 aW9uKHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkKICNlbmRpZgogewogICAgIEFTU0VSVChtX3Bh Z2VJRCk7CkBAIC00NzEsOCArNDcxLDggQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdl SUQsIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQogICAgIG1fZHJhd2lu Z0FyZWEtPnNldFBhaW50aW5nRW5hYmxlZChmYWxzZSk7CiAgICAgbV9kcmF3aW5nQXJlYS0+c2V0 U2hvdWxkU2NhbGVWaWV3VG9GaXREb2N1bWVudChwYXJhbWV0ZXJzLnNob3VsZFNjYWxlVmlld1Rv Rml0RG9jdW1lbnQpOwogCi0gICAgaWYgKHBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCkK LSAgICAgICAgZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6U3dhcEZyb21T dXNwZW5kZWQpOworICAgIGlmIChwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXApCisgICAgICAgIGZy ZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlByb2Nlc3NTd2FwKTsKIAogI2lm IEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpCiAgICAgbV91c2VBc3luY1Njcm9sbGluZyA9IHBhcmFt ZXRlcnMuc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5Ojp0aHJlYWRl ZFNjcm9sbGluZ0VuYWJsZWRLZXkoKSk7CkBAIC02OTYsNyArNjk2LDcgQEAgdm9pZCBXZWJQYWdl OjpyZWluaXRpYWxpemVXZWJQYWdlKFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0 ZXJzKQogICAgICAgICBtX2RyYXdpbmdBcmVhLT51cGRhdGVQcmVmZXJlbmNlcyhwYXJhbWV0ZXJz LnN0b3JlKTsKICAgICAgICAgbV9kcmF3aW5nQXJlYS0+c2V0UGFpbnRpbmdFbmFibGVkKHRydWUp OwogI2lmIFBMQVRGT1JNKE1BQykKLSAgICAgICAgbV9zaG91bGRBdHRhY2hEcmF3aW5nQXJlYU9u UGFnZVRyYW5zaXRpb24gPSBwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQ7CisgICAgICAg IG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uID0gcGFyYW1ldGVycy5p c1Byb2Nlc3NTd2FwOwogI2VuZGlmCiAgICAgICAgIHVuZnJlZXplTGF5ZXJUcmVlKExheWVyVHJl ZUZyZWV6ZVJlYXNvbjo6UGFnZVN1c3BlbmRlZCk7CiAgICAgfQpAQCAtMzA1MywxMiArMzA1Myw2 IEBAIHZvaWQgV2ViUGFnZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKHVpbnQ2NF90IGZyYW1l SUQsIHVpbnQ2NF90IGxpc3RlbmVySUQsIFdlCiAgICAgV2ViRnJhbWUqIGZyYW1lID0gV2ViUHJv Y2Vzczo6c2luZ2xldG9uKCkud2ViRnJhbWUoZnJhbWVJRCk7CiAgICAgaWYgKCFmcmFtZSkKICAg ICAgICAgcmV0dXJuOwotICAgIGlmIChwb2xpY3lBY3Rpb24gPT0gV2ViUG9saWN5QWN0aW9uOjpT dXNwZW5kKSB7Ci0gICAgICAgIEFTU0VSVChmcmFtZSA9PSBtX21haW5GcmFtZSk7Ci0gICAgICAg IHNldElzU3VzcGVuZGVkKHRydWUpOwotCi0gICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigp LnNlbmRQcmV3YXJtSW5mb3JtYXRpb24obWFpbldlYkZyYW1lKCktPnVybCgpKTsKLSAgICB9CiAg ICAgZnJhbWUtPmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihsaXN0ZW5lcklELCBwb2xpY3lBY3Rp b24sIG5hdmlnYXRpb25JRCwgZG93bmxvYWRJRCwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsK IH0KIApAQCAtMzEwMCw3ICszMDk0LDcgQEAgdm9pZCBXZWJQYWdlOjpkaWRDb21wbGV0ZVBhZ2VU cmFuc2l0aW9uKCkKIAogICAgIGJvb2wgaXNJbml0aWFsRW1wdHlEb2N1bWVudCA9ICFtX21haW5G cmFtZTsKICAgICBpZiAoIWlzSW5pdGlhbEVtcHR5RG9jdW1lbnQpCi0gICAgICAgIHVuZnJlZXpl TGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6U3dhcEZyb21TdXNwZW5kZWQpOworICAg ICAgICB1bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlByb2Nlc3NTd2Fw KTsKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICBpZiAobV9zaG91bGRBdHRhY2hEcmF3aW5nQXJl YU9uUGFnZVRyYW5zaXRpb24gJiYgIWlzSW5pdGlhbEVtcHR5RG9jdW1lbnQpIHsKQEAgLTYzMTIs NiArNjMwNiwxMCBAQCB2b2lkIFdlYlBhZ2U6OnNldElzU3VzcGVuZGVkKGJvb2wgc3VzcGVuZGVk KQogICAgIGlmIChtX2lzU3VzcGVuZGVkKSB7CiAgICAgICAgIC8vIFVuZnJvemVuIG9uIGRyYXdp bmcgYXJlYSByZXNldC4KICAgICAgICAgZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJl YXNvbjo6UGFnZVN1c3BlbmRlZCk7CisKKyAgICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCku c2VuZFByZXdhcm1JbmZvcm1hdGlvbihtYWluV2ViRnJhbWUoKS0+dXJsKCkpOworCisgICAgICAg IHN1c3BlbmRGb3JQcm9jZXNzU3dhcCgpOwogICAgIH0gZWxzZQogICAgICAgICBtX3Nob3VsZFJl c2V0RHJhd2luZ0FyZWFBZnRlclN1c3BlbmQgPSB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDcxNWUxMjQ1MjBmZjA3NmI5NjBhZWQ3MGU5 YjkyMDc1YTY1NTJhZWYuLmYzYjkzNGUyN2RhOWQ1ZWE1YTFiYmY1NWYxNDlmNWE4NTEyNzM2ZTQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTY5Niw3 ICs2OTYsNyBAQCBwdWJsaWM6CiAgICAgICAgIFByb2Nlc3NTdXNwZW5kZWQgICAgICAgID0gMSA8 PCAyLAogICAgICAgICBQYWdlU3VzcGVuZGVkICAgICAgICAgICA9IDEgPDwgMywKICAgICAgICAg UHJpbnRpbmcgICAgICAgICAgICAgICAgPSAxIDw8IDQsCi0gICAgICAgIFN3YXBGcm9tU3VzcGVu ZGVkICAgICAgID0gMSA8PCA1LAorICAgICAgICBQcm9jZXNzU3dhcCAgICAgICAgICAgICA9IDEg PDwgNSwKICAgICB9OwogICAgIHZvaWQgZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJl YXNvbik7CiAgICAgdm9pZCB1bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb24p OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCmluZGV4IDkxYWQ3MWFk ZTFiN2RiNGY5ZGNlNjRkNGYzMzA0NjdiMjJiODMzY2MuLjgzYjY1OTkyNzBiNTFjN2JiMThlZmU3 MzdhNTkyZTAyNTcxYTI4MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0Fy ZWEubW0KQEAgLTk3LDcgKzk3LDcgQEAgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OlRp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhKFdlYlBhZ2UmIHdlYlBhZ2UsIGMKICAgICB1cGRh dGVMYXllckhvc3RpbmdDb250ZXh0KCk7CiAgICAgc2V0Q29sb3JTcGFjZShwYXJhbWV0ZXJzLmNv bG9yU3BhY2UpOwogCi0gICAgaWYgKCFwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQpCisg ICAgaWYgKCFwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXApCiAgICAgICAgIGF0dGFjaCgpOwogfQog CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWEy NjI0MDRiZWNkYTVmMTk5ZjMxMWFjZTIwZWUxMzQzM2IxNzM1Ny4uMzI0OWY0M2UzNmI4ZTlmNTQ5 NDcyZDkyMDRiMmM2ODFlMmE2OWUwMCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTAxLTE1ICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBWaWV3IGJl Y29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkIEFQSSB0ZXN0IGNvdmVyYWdlLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5t bToKKyAgICAgICAgKC1bUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSB3ZWJWaWV3OmRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25SZXNwb25zZTpkZWNpc2lvbkhhbmRsZXI6XSk6CisKIDIwMTktMDEtMTUg IFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXSBVc2UgdGhl IGNvbnRhaW5pbmcgYmxvY2sncyBwYWRkaW5nIGJveCB0byBwb3NpdGlvbiBvdXQtb2YtZmxvdyBl bGVtZW50cy4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCmluZGV4IGYzNWQ4YmFhMzUz ZjA3MDI0ZmQ0MGU3ZDUyNzQ1M2E3NDIxMGMzYmEuLmE0NDViZjFmOWNiYjJlMmM5NjIwNjY0NzI4 ODFjNWVkNDlkMWNhOGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQpAQCAtMSw1 ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDE3LTIwMTkgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC03Miw2ICs3 Miw3IEBAIHN0YXRpYyBib29sIHNlcnZlclJlZGlyZWN0ZWQ7CiBzdGF0aWMgSGFzaFNldDxwaWRf dD4gc2VlblBJRHM7CiBzdGF0aWMgYm9vbCB3aWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0Owogc3Rh dGljIGJvb2wgZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0Oworc3RhdGljIGJvb2wgc2hvdWxkQ29u dmVydFRvRG93bmxvYWQ7CiBzdGF0aWMgUmV0YWluUHRyPE5TVVJMPiBjbGllbnRSZWRpcmVjdFNv dXJjZVVSTDsKIHN0YXRpYyBSZXRhaW5QdHI8TlNVUkw+IGNsaWVudFJlZGlyZWN0RGVzdGluYXRp b25VUkw7CiAKQEAgLTEyOCw2ICsxMjksMTEgQEAgLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcg Kil3ZWJWaWV3IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246KFdLTmF2aWdhdGkKICAg ICBkaWRSZXBvbmRUb1BvbGljeURlY2lzaW9uQ2FsbCA9IHRydWU7CiB9CiAKKy0gKHZvaWQpd2Vi VmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9u c2U6KFdLTmF2aWdhdGlvblJlc3BvbnNlICopbmF2aWdhdGlvblJlc3BvbnNlIGRlY2lzaW9uSGFu ZGxlcjoodm9pZCAoXikoV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3kpKWRlY2lzaW9uSGFuZGxl cgoreworICAgIGRlY2lzaW9uSGFuZGxlcihzaG91bGRDb252ZXJ0VG9Eb3dubG9hZCA/IF9XS05h dmlnYXRpb25SZXNwb25zZVBvbGljeUJlY29tZURvd25sb2FkIDogV0tOYXZpZ2F0aW9uUmVzcG9u c2VQb2xpY3lBbGxvdyk7Cit9CisKIC0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmll dyBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbE5hdmlnYXRpb246KFdLTmF2 aWdhdGlvbiAqKW5hdmlnYXRpb24KIHsKICAgICBzZWVuUElEcy5hZGQoW3dlYlZpZXcgX3dlYlBy b2Nlc3NJZGVudGlmaWVyXSk7CkBAIC0xNDA1LDcgKzE0MTEsNyBAQCBURVNUKFByb2Nlc3NTd2Fw LCBTZXJ2ZXJSZWRpcmVjdCkKIAogICAgIEVYUEVDVF9GQUxTRShzZXJ2ZXJSZWRpcmVjdGVkKTsK ICAgICBFWFBFQ1RfRVEoMywgbnVtYmVyT2ZEZWNpZGVQb2xpY3lDYWxscyk7Ci0gICAgRVhQRUNU X0VRKDJ1LCBzZWVuUElEcy5zaXplKCkpOworICAgIEVYUEVDVF9FUSgzdSwgc2VlblBJRHMuc2l6 ZSgpKTsKIH0KIAogVEVTVChQcm9jZXNzU3dhcCwgU2VydmVyUmVkaXJlY3QyKQpAQCAtMTQ2Nyw2 ICsxNDczLDEwOSBAQCBURVNUKFByb2Nlc3NTd2FwLCBTZXJ2ZXJSZWRpcmVjdDIpCiAgICAgRVhQ RUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4xLmh0bWwiLCBbW3dlYlZp ZXcgVVJMXSBhYnNvbHV0ZVN0cmluZ10pOwogfQogCitzdGF0aWMgY29uc3QgY2hhciogbGlua1Rv V2ViS2l0Qnl0ZXMgPSBSIlBTT05SRVNPVVJDRSgKKzxib2R5PgorICA8YSBpZD0idGVzdExpbmsi IGhyZWY9InBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiPkxpbms8L2E+Cis8L2JvZHk+ CispUFNPTlJFU09VUkNFIjsKKworVEVTVChQcm9jZXNzU3dhcCwgUG9saWN5Q2FuY2VsQWZ0ZXJT ZXJ2ZXJSZWRpcmVjdCkKK3sKKyAgICBhdXRvIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbiA9IGFk b3B0TlMoW1tfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBw cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uID0g WUVTOworICAgIGF1dG8gcHJvY2Vzc1Bvb2wgPSBhZG9wdE5TKFtbV0tQcm9jZXNzUG9vbCBhbGxv Y10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCld KTsKKworICAgIGF1dG8gd2ViVmlld0NvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3 Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBz ZXRQcm9jZXNzUG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07CisgICAgYXV0byBoYW5kbGVyID0gYWRv cHROUyhbW1BTT05TY2hlbWUgYWxsb2NdIGluaXRdKTsKKyAgICBbaGFuZGxlciBhZGRNYXBwaW5n RnJvbVVSTFN0cmluZzpAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiIHRvRGF0YTps aW5rVG9XZWJLaXRCeXRlc107CisgICAgW2hhbmRsZXIgYWRkUmVkaXJlY3RGcm9tVVJMU3RyaW5n OkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCIgdG9VUkxTdHJpbmc6QCJwc29uOi8v d3d3LmFwcGxlLmNvbS9pZ25vcmUuaHRtbCJdOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBz ZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAicHNvbiJdOwor CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhG cmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25m aWd1cmF0aW9uLmdldCgpXSk7CisgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBhZG9wdE5T KFtbUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNl dE5hdmlnYXRpb25EZWxlZ2F0ZTpuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCldOworCisgICAgbmF2 aWdhdGlvbkRlbGVnYXRlLT5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uID0gXihXS05h dmlnYXRpb25BY3Rpb24gKmFjdGlvbiwgdm9pZCAoXmRlY2lzaW9uSGFuZGxlcikoV0tOYXZpZ2F0 aW9uQWN0aW9uUG9saWN5KSkgeworICAgICAgICBpZiAoW2FjdGlvbi5yZXF1ZXN0LlVSTC5hYnNv bHV0ZVN0cmluZyBoYXNTdWZmaXg6QCJpZ25vcmUuaHRtbCJdKSB7CisgICAgICAgICAgICBkZWNp c2lvbkhhbmRsZXIoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5Q2FuY2VsKTsKKyAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBkZWNpc2lvbkhhbmRsZXIoV0tOYXZpZ2F0aW9u QWN0aW9uUG9saWN5QWxsb3cpOworICAgIH07CisKKyAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3Qg PSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAicHNv bjovL3d3dy5nb29nbGUuY29tL21haW4uaHRtbCJdXTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVz dDpyZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAg ZG9uZSA9IGZhbHNlOworICAgIGF1dG8gcGlkQWZ0ZXJGaXJzdExvYWQgPSBbd2ViVmlldyBfd2Vi UHJvY2Vzc0lkZW50aWZpZXJdOworCisgICAgRVhQRUNUX0VRKDEsIG51bWJlck9mRGVjaWRlUG9s aWN5Q2FsbHMpOworCisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAidGVzdExpbmsu Y2xpY2soKSIgY29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0 aWw6OnJ1bigmZmFpbGVkKTsKKyAgICBmYWlsZWQgPSBmYWxzZTsKKyAgICBkb25lID0gZmFsc2U7 CisKKyAgICBFWFBFQ1RfRVEoMywgbnVtYmVyT2ZEZWNpZGVQb2xpY3lDYWxscyk7CisKKyAgICAv LyBXZSBzaG91bGQgc3RpbGwgYmUgb24gZ29vZ2xlLmNvbS4KKyAgICBFWFBFQ1RfRVEocGlkQWZ0 ZXJGaXJzdExvYWQsIFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0pOworICAgIEVYUEVD VF9XS19TVFJFUShAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiLCBbW3dlYlZpZXcg VVJMXSBhYnNvbHV0ZVN0cmluZ10pOworCisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0 OkAidGVzdExpbmsuaW5uZXJUZXh0IiBjb21wbGV0aW9uSGFuZGxlcjogWyZdIChpZCBpbm5lclRl eHQsIE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAIkxpbmsiLCBp bm5lclRleHQpOworICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBUZXN0V2ViS2l0 QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKK30KKworVEVTVChQcm9j ZXNzU3dhcCwgQ3Jvc3NTaXRlRG93bmxvYWQpCit7CisgICAgYXV0byBwcm9jZXNzUG9vbENvbmZp Z3VyYXRpb24gPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9jXSBp bml0XSk7CisgICAgcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NTd2Fwc09u TmF2aWdhdGlvbiA9IFlFUzsKKyAgICBhdXRvIHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dLUHJv Y2Vzc1Bvb2wgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25maWd1 cmF0aW9uLmdldCgpXSk7CisKKyAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHRO UyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlld0Nv bmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0KCldOworICAgIGF1dG8g aGFuZGxlciA9IGFkb3B0TlMoW1tQU09OU2NoZW1lIGFsbG9jXSBpbml0XSk7CisgICAgW2hhbmRs ZXIgYWRkTWFwcGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5o dG1sIiB0b0RhdGE6bGlua1RvV2ViS2l0Qnl0ZXNdOworICAgIFtoYW5kbGVyIGFkZE1hcHBpbmdG cm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCIgdG9EYXRhOiJI ZWxsbyJdOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmhh bmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAicHNvbiJdOworCisgICAgYXV0byB3ZWJWaWV3ID0g YWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAs IDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpXSk7Cisg ICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBhZG9wdE5TKFtbUFNPTk5hdmlnYXRpb25EZWxl Z2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpu YXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCldOworCisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0g W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246 Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiXV07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6 cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRv bmUgPSBmYWxzZTsKKyAgICBhdXRvIHBpZEFmdGVyRmlyc3RMb2FkID0gW3dlYlZpZXcgX3dlYlBy b2Nlc3NJZGVudGlmaWVyXTsKKworICAgIHNob3VsZENvbnZlcnRUb0Rvd25sb2FkID0gdHJ1ZTsK KyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJ0ZXN0TGluay5jbGljaygpIiBjb21w bGV0aW9uSGFuZGxlcjpuaWxdOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZmYWls ZWQpOworICAgIGZhaWxlZCA9IGZhbHNlOworICAgIHNob3VsZENvbnZlcnRUb0Rvd25sb2FkID0g ZmFsc2U7CisKKyAgICAvLyBXZSBzaG91bGQgc3RpbGwgYmUgb24gZ29vZ2xlLmNvbS4KKyAgICBF WFBFQ1RfRVEocGlkQWZ0ZXJGaXJzdExvYWQsIFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmll cl0pOworICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0 bWwiLCBbW3dlYlZpZXcgVVJMXSBhYnNvbHV0ZVN0cmluZ10pOworCisgICAgW3dlYlZpZXcgZXZh bHVhdGVKYXZhU2NyaXB0OkAidGVzdExpbmsuaW5uZXJUZXh0IiBjb21wbGV0aW9uSGFuZGxlcjog WyZdIChpZCBpbm5lclRleHQsIE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAgIEVYUEVDVF9XS19T VFJFUShAIkxpbmsiLCBpbm5lclRleHQpOworICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9XTsK KyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsK K30KKwogZW51bSBjbGFzcyBTaG91bGRFbmFibGVQU09OIHsgTm8sIFllcyB9Owogc3RhdGljIHZv aWQgcnVuQ2xpZW50U2lkZVJlZGlyZWN0VGVzdChTaG91bGRFbmFibGVQU09OIHNob3VsZEVuYWJs ZVBTT04pCiB7CkBAIC0yMjMyLDEyICsyMzQxLDI3IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIFBhZ2VT aG93SGlkZSkKIAogICAgIEVYUEVDVF9FUSg3dSwgW3JlY2VpdmVkTWVzc2FnZXMgY291bnRdKTsK ICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0g cGFnZXNob3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMF0pOwotICAg IEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdl aGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKLSAgICBFWFBFQ1Rf V0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlc2hvdyBOT1Qg cGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7Ci0gICAgRVhQRUNUX1dLX1NU UkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVk IiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNv bjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2Vp dmVkTWVzc2FnZXMuZ2V0KClbNF0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cu d2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3Nh Z2VzLmdldCgpWzVdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNv bS9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgp WzZdKTsKKyAgICBpZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0gaGFzUHJlZml4OkAicHNv bjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJF UShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQi LCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAi cHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgTk9UIHBlcnNpc3RlZCIs IHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOworICAgIH0gZWxzZSB7CisgICAgICAgIEVYUEVD VF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93IE5P VCBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKKyAgICAgICAgRVhQRUNU X1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBl cnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOworICAgIH0KKyAgICBpZiAoW3Jl Y2VpdmVkTWVzc2FnZXMuZ2V0KClbM10gaGFzUHJlZml4OkAicHNvbjovL3d3dy5hcHBsZS5jb20v bWFpbi5odG1sIl0pIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBs ZS5jb20vbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5n ZXQoKVszXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9y Zy9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgp WzRdKTsKKyAgICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3 LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNz YWdlcy5nZXQoKVszXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBw bGUuY29tL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMu Z2V0KClbNF0pOworICAgIH0KKyAgICBpZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0gaGFz UHJlZml4OkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVY UEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlk ZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdKTsKKyAgICAgICAgRVhQRUNU X1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgcGVy c2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7CisgICAgfSBlbHNlIHsKKyAgICAg ICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFn ZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7CisgICAgICAgIEVY UEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlk ZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAgICB9CiB9CiAKIC8v IERpc2FibGluZyB0aGUgcGFnZSBjYWNoZSBleHBsaWNpdGx5IGlzIChmb3Igc29tZSByZWFzb24p IG5vdCBhdmFpbGFibGUgb24gaU9TLgpAQCAtMjMwNywxMiArMjQzMSwyNyBAQCBURVNUKFByb2Nl c3NTd2FwLCBMb2FkVW5sb2FkKQogCiAgICAgRVhQRUNUX0VRKDd1LCBbcmVjZWl2ZWRNZXNzYWdl cyBjb3VudF0pOwogICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9t YWluLmh0bWwgLSBsb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVswXSk7Ci0gICAgRVhQRUNU X1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHVubG9hZCIsIHJl Y2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93 d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIGxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJd KTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwg LSB1bmxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKLSAgICBFWFBFQ1RfV0tfU1RS RVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gbG9hZCIsIHJlY2VpdmVkTWVz c2FnZXMuZ2V0KClbNF0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0 Lm9yZy9tYWluLmh0bWwgLSB1bmxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdKTsKLSAg ICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBsb2Fk IiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2Vz LmdldCgpWzFdIGhhc1ByZWZpeDpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiXSkg eworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5o dG1sIC0gdW5sb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7CisgICAgICAgIEVYUEVD VF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIGxvYWQiLCByZWNl aXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsKKyAgICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tf U1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBsb2FkIiwgcmVjZWl2ZWRN ZXNzYWdlcy5nZXQoKVsxXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cu d2Via2l0Lm9yZy9tYWluLmh0bWwgLSB1bmxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJd KTsKKyAgICB9CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdIGhhc1ByZWZpeDpA InBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19T VFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHVubG9hZCIsIHJlY2VpdmVk TWVzc2FnZXMuZ2V0KClbM10pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3 LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gbG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNF0p OworICAgIH0gZWxzZSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Vi a2l0Lm9yZy9tYWluLmh0bWwgLSBsb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSk7Cisg ICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAt IHVubG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNF0pOworICAgIH0KKyAgICBpZiAoW3Jl Y2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0gaGFzUHJlZml4OkAicHNvbjovL3d3dy53ZWJraXQub3Jn L21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Vi a2l0Lm9yZy9tYWluLmh0bWwgLSB1bmxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdKTsK KyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1s IC0gbG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAgIH0gZWxzZSB7CisgICAg ICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIGxv YWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVR KEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHVubG9hZCIsIHJlY2VpdmVkTWVz c2FnZXMuZ2V0KClbNl0pOworICAgIH0KIH0KIAogVEVTVChQcm9jZXNzU3dhcCwgV2ViSW5zcGVj dG9yKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDA0YTg2ODY2ZWE2MDBkMjAxMDI5MWFiZmJiOTRiMzcyMWQ1OWRhNTQuLjM0 YzUyODZkMzA1YTNhZmQ2ODU1MjUyMDgxZTI4NGM0NTc0MTA1MDMgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NyBAQAorMjAxOS0wMS0xNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAg ICAgIFJlZ3Jlc3Npb24oUFNPTikgVmlldyBiZWNvbWVzIGJsYW5rIGFmdGVyIGNsaWNrIGEgY3Jv c3Mtc2l0ZSBkb3dubG9hZCBsaW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTMzNjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNraXAgdGVz dCB0ZXN0aW5nIHRoZSBjcm9zcy1wcm9jZXNzIERPTVdpbmRvdyBBUEkgYXMgSSBicm9rZSBpdCB3 aXRoIHRoaXMgcGF0Y2guCisgICAgICAgIFRoZSBmZWF0dXJlIGlzIGZhciBmcm9tIHJlYWR5IGFu ZCBvZmYgYnkgZGVmYXVsdCBhbnl3YXkuIEkgd2lsbCBhZGQgc3VwcG9ydCBiYWNrCisgICAgICAg IGluIGEgZm9sbG93LXVwLgorCisgICAgICAgICogcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlv bnM6CisKIDIwMTktMDEtMTUgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IEF1ZGl0OiBwcm92aWRlIGEgd2F5IHRvIGRldGVybWluZSB3 aGV0aGVyIGEgZ2l2ZSBub2RlIGhhcyBldmVudCBsaXN0ZW5lcnMKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZv cm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggOGU5NTllZGFmZmQ4OTI3ZWY5YzJhYWMzMTZl OWUzMTAwY2QxNDBjYi4uOWQ5MGJlOGI0OGU1N2M5NjBiY2RhNjg2Y2UyNDQwZDcxMzhiYjBmNiAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKKysr IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTczMyw4ICs3 MzMsOCBAQCBodHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0YXRpc3RpY3MvcmVtb3ZlLWJsb2NraW5n LWluLXJlZGlyZWN0Lmh0bWwgWyBTa2lwIF0KIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlz dGljcy9ub24tcHJldmFsZW50LXJlc291cmNlcy1jYW4tYWNjZXNzLWNvb2tpZXMtaW4tYS10aGly ZC1wYXJ0eS1jb250ZXh0Lmh0bWwgWyBTa2lwIF0KIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3Rh dGlzdGljcy9jYXAtY2FjaGUtbWF4LWFnZS1mb3ItcHJldmFsZW50LXJlc291cmNlLmh0bWwgWyBT a2lwIF0KIAotIyBQcm9jZXNzIHN3YXBwaW5nIGlzIG9ubHkgaW1wbGVtZW50ZWQgb24gV2ViS2l0 Mi4KLWh0dHAvdGVzdHMvbmF2aWdhdGlvbi9wcm9jZXNzLXN3YXAtd2luZG93LW9wZW4uaHRtbCBb IFBhc3MgXQorIyBUaGlzIGZlYXR1cmUgaXMgY3VycmVudGx5IGRpc2FibGVkIGJ5IGRlZmF1bHQg YW5kIHVuZmluaXNoZWQgPHJkYXI6Ly9wcm9ibGVtLzM4OTI1MDc3Pi4KK2h0dHAvdGVzdHMvbmF2 aWdhdGlvbi9wcm9jZXNzLXN3YXAtd2luZG93LW9wZW4uaHRtbCBbIFNraXAgXQogCiAjIENyb3Nz LU9yaWdpbi1SZXNvdXJjZS1Qb2xpY3kgcmVzcG9uc2UgaGVhZGVyIGlzIG9ubHkgaW1wbGVtZW50 ZWQgaW4gV2ViS2l0Mi4KIGh0dHAvd3B0L2Nyb3NzLW9yaWdpbi1yZXNvdXJjZS1wb2xpY3kvIFsg UGFzcyBdCg== 359168 2019-01-15 09:44:50 -0800 2019-01-15 09:47:44 -0800 Patch bug-193361-20190115094449.patch text/plain 106045 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5OTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQzNGM2ZGZkZDNhNWQ5 YmMxZjQ2MjZkNTVmOWY0OTg3MWNhNDA1Yi4uOGY3NjUzMTJiNmNhOWY2MzY2Zjc5YzRhY2Q4ZGYy YmYyODhkY2JiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAxLTE1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBW aWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAg ICAgIFdoZW4gcmVzdG9yaW5nIGZyb20gUGFnZUNhY2hlLCBtYWtlIHN1cmUgd2Ugbm90aWZ5IHRo ZSBjbGllbnQgdGhhdCB0aGUgbG9hZCB3YXMgY29tbWl0dGVkCisgICAgICAgICpiZWZvcmUqIHdl IHRlbGwgaXQgdGhhdCB0aGUgbmF2aWdhdGlvbiBpcyBjb21wbGV0ZS4gVGhpcyB3b3VsZCBjb25m dXNlIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eQorICAgICAgICBsb2dpYyBpbiB0aGUgVUlQcm9j ZXNzLgorCiAyMDE5LTAxLTE1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBBdWRpdDogcHJvdmlkZSBhIHdheSB0byBkZXRlcm1pbmUg d2hldGhlciBhIGdpdmUgbm9kZSBoYXMgZXZlbnQgbGlzdGVuZXJzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIxNTgw ZmMwNThiNTM3ZWQxYWRlNWY3NTJlMzE3NjZmY2UzYmQ0MDEuLjQxYjI4MmZiZGM1YmVkZTBiNWU1 YjE3ZDA5NTlkNjI3ZmQxMjFlN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAwIEBACisyMDE5LTAx LTE1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lv bihQU09OKSBWaWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25s b2FkIGxpbmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5MzM2MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGlzc3VlIHRyYWNrZWQgYnkg cmRhcjovL3Byb2JsZW0vNDcwOTk1NzMgaXMgdGhhdCBhIHByb3Zpc2lvbmFsIGxvYWQgbWF5IGdl dAorICAgICAgICBjYW5jZWxlZCAob3IgY29udmVydGVkIGludG8gYSBkb3dubG9hZCkgKmFmdGVy KiB3ZSd2ZSBkZWNpZGVkIHRvIHByb2Nlc3Mtc3dhcC4KKyAgICAgICAgSW4gc3VjaCBjYXNlcywg dGhlIHZpZXcgc2hvdWxkIGtlZXAgZGlzcGxheWluZyB0aGUgY3VycmVudCBzaXRlIGFuZCBpdCBz aG91bGQKKyAgICAgICAgc3RpbGwgYmUgaW50ZXJhY3RpdmUuIEhvd2V2ZXIsIHdpdGggdGhlIHBy ZXZpb3VzIFBTT04gbW9kZWwsIHRoZSB2aWV3IChwYWdlUHJveHkpCisgICAgICAgIHdvdWxkIGhh dmUgYWxyZWFkeSBzd2FwcGVkIHRvIHRoZSBuZXcgcHJvY2VzcyBhbmQgd291bGQgZW5kIHVwIGRp c3BsYXlpbmcgdGhlCisgICAgICAgIGluaXRpYWxseSBlbXB0eSBkb2N1bWVudC4KKworICAgICAg ICBUbyBhZGRyZXNzIHRoZSBpc3N1ZSwgdGhpcyBwYXRjaCBpbnRyb2R1Y2VzIHRoZSBjb25jZXB0 IG9mIGEgcHJvdmlzaW9uYWwgbG9hZAorICAgICAgICBpbiB0aGUgVUlQcm9jZXNzLCBoYW5kbGVk IGJ5IGEgUHJvdmlzaW9uYWxQYWdlUHJveHkgd2hpY2ggaGFzIGl0cyBvd24gcHJpdmlzaW9uYWwK KyAgICAgICAgcHJvY2Vzcy4gVGhlIFdlYlBhZ2VQcm94eSBvd25zIHRoZSBQcm92aXNpb25hbFBh Z2VQcm94eSBidXQgd2UgZG8gbm90IGNvbW1pdCB0aGUKKyAgICAgICAgcHJvdmlzaW9uYWwgcGFn ZSB1bnRpbCBhZnRlciB0aGUgbG9hZCB3YXMgY29tbWl0dGVkIGluIHRoZSBuZXcgcHJvY2Vzcy4g VGhpcyBtZWFucworICAgICAgICB0aGF0IHRoZSB2aWV3IC8gV2ViUGFnZVByb3h5IGtlZXBzIHVz aW5nIHRoZSBvbGQgcHJvY2VzcyBhbmQgZGlzcGxheXMgdGhlIGN1cnJlbnQKKyAgICAgICAgY29u dGVudCB1bnRpbCBhIGxvYWQgaGFzIGNvbW1pdHRlZCBpbiB0aGUgcHJvdmlzaW9uYWwgcGFnZS4g SWYgbm8gbG9hZCBjb21taXRzCisgICAgICAgIGluIHRoZSBwcm92aXNpb25hbCBwcm9jZXNzIChl LmcuIGJlY2F1c2UgdGhlIGxvYWQgaXMgY2FuY2VsbGVkIG9yIGNvbnZlcnRlZCBpbnRvCisgICAg ICAgIGEgZG93bmxvYWQpLCB0aGVuIHdlIG1lcmVseSBkZXN0cm95IHRoZSBQcm92aXNpb25hbFBh Z2VQcm94eSBhbmQgdGVybWluYXRlIGl0cworICAgICAgICBwcm9jZXNzLCB3aXRob3V0IGltcGFj dGluZyB0aGUgV2ViUGFnZVByb3h5LgorCisgICAgICAgICogU2hhcmVkL1dlYlBhZ2VDcmVhdGlv blBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJh bWV0ZXJzOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzLmg6CisgICAgICAgIFJlbmFtZSBpc1N3YXBGcm9tU3VzcGVuZGVkIHRvIGlzUHJvY2Vzc1N3 YXAgZm9yIGNsYXJpdHkgYXMgd2UgYWx3YXlzIHdhbnQgdG8KKyAgICAgICAgZGVsYXkgYXR0YWNo aW5nIHRoZSBkcmF3aW5nIGFyZWEgaW4gY2FzZSBvZiBhIHByb2Nlc3Mtc3dhcCwgbm8gbWF0dGVy IHdoYXQKKyAgICAgICAgbm93IHRoYXQgdGhlIHByZXZpb3VzIHByb2Nlc3MgaXMga2VwdCBhbGl2 ZSB1bnRpbCB0aGUgcHJvdmlzaW9uYWwgbG9hZCBpcworICAgICAgICBjb21taXR0ZWQgaW4gdGhl IG5ldyBwcm9jZXNzLgorCisgICAgICAgICogU2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oOgorICAg ICAgICBEcm9wIFN1c3BlbmQgcG9saWN5IGFjdGlvbi4gQXQgZGVjaWRlUG9saWN5Rm9yTmF2aWdh dGlvbkFjdGlvbiB0aW1lLCBpbiBjYXNlIG9mCisgICAgICAgIHByb2Nlc3Mtc3dhcCwgd2Ugbm93 IHRlbGwgdGhlIHByZXZpb3VzIHByb2Nlc3MgdG8gc2ltcGx5IGlnbm9yZSB0aGUgbG9hZCwgd2hp bGUKKyAgICAgICAgd2UgY3JlYXRlIGEgUHJvdmlzaW9uYWxQYWdlUHJveHkgdG8gZG8gdGhlIG5l dyBsb2FkIGluIGEgbmV3IHByb2Nlc3MuCisgICAgICAgIFN1c3BlbnNpb24gb2YgdGhlIHByZXZp b3VzIHBhZ2UgaW4gdGhlIG9sZCBwcm9jZXNzLCBoYXBwZW5zIGxhdGVyLCB3aGVuIGEgbG9hZAor ICAgICAgICBpcyBhY3R1YWxseSBjb21taXR0ZWQgaW4gdGhlIG5ldyBwcm9jZXNzLgorCisgICAg ICAgICogU291cmNlcy50eHQ6CisgICAgICAgIEFkZCBuZXcgUHJvdmlzaW9uYWxQYWdlUHJveHkg ZmlsZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAg ICAgICAoLVtXS1dlYlZpZXcgX2tpbGxXZWJDb250ZW50UHJvY2Vzc0FuZFJlc2V0U3RhdGVdKToK KyAgICAgICAgV2hlbiBjYWxsaW5nIF9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0YXRl IG9uIGEgV0tXZWJWaWV3LCBraWxsIGJvdGggdGhlIGN1cnJlbnQKKyAgICAgICAgcHJvY2VzcyBh bmQgdGhlIHByb3Zpc2lvbmFsIG9uZSwgdG8gbWFpbnRhaW4gcHJldmlvdXMgYmVoYXZpb3IgaW4g b3VyIEFQSSB0ZXN0cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlQ2xpZW50Lmg6CisgICAg ICAgIFRpbnkgYnVpbGQgZml4LgorCisgICAgICAgICogVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFn ZVByb3h5LmNwcDogQWRkZWQuCisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5 OjpQcm92aXNpb25hbFBhZ2VQcm94eSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFn ZVByb3h5Ojp+UHJvdmlzaW9uYWxQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6dGFrZURyYXdpbmdBcmVhKToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlz aW9uYWxQYWdlUHJveHk6OmNhbmNlbCk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFn ZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFs UGFnZVByb3h5Ojpsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24pOgorICAgICAgICAo V2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6Z29Ub0JhY2tGb3J3YXJkSXRlbSk6CisgICAg ICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOgor ICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25h bExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5Ojpk aWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6 UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKToKKyAgICAgICAgKFdlYktp dDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVTeW5jTWVzc2FnZSk6CisgICAgICAg ICogVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5Lmg6IEFkZGVkLgorICAgICAgICAoV2Vi S2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6cGFnZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zp c2lvbmFsUGFnZVByb3h5OjptYWluRnJhbWUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpQcm92 aXNpb25hbFBhZ2VQcm94eTo6cHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFs UGFnZVByb3h5Ojpwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IGNvbnN0KToKKyAgICAgICAg KFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6Om5hdmlnYXRpb25JRCBjb25zdCk6CisgICAg ICAgIEFkZCBuZXcgUHJvdmlzaW9uYWxQYWdlUHJveHkgY2xhc3MgdG8gd3JhcCB0aGUgcHJvdmlz aW9uYWwgbG9hZCBpbiB0aGUgbmV3IHByb2Nlc3MKKyAgICAgICAgYWZ0ZXIgYSBzd2FwLiBUaGUg cHJvdmlzaW9uYWwgcGFnZSBpcyBvd25lZCBieSB0aGUgV2ViUGFnZVByb3h5IGFuZCB3ZSBvbmx5 IGNvbW1pdAorICAgICAgICB0aGUgcHJvdmlzaW9uYWwgcGFnZSB3aGVuIHRoZSBsb2FkIGlzIGNv bW1pdHRlZC4gVW50aWwgdGhlbiwgdGhlIFdlYlBhZ2VQcm94eSBrZWVwcworICAgICAgICB1c2lu ZyB0aGUgb2xkIHByb2Nlc3MgYW5kIGRpc3BsYXlpbmcgdGhlIGN1cnJlbnQgY29udGVudC4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6On5TdXNwZW5kZWRQYWdlUHJveHkpOgorICAgICAgICAo V2ViS2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6OnVuc3VzcGVuZCk6CisgICAgICAgIChXZWJLaXQ6 OlN1c3BlbmRlZFBhZ2VQcm94eTo6ZGlkUHJvY2Vzc1JlcXVlc3RUb1N1c3BlbmQpOgorICAgICAg ICBVbnJlZ2lzdGVyIHRoZSBTdXNwZW5kZWRQYWdlUHJveHkgYXMgYW4gSVBDIG1lc3NhZ2UgcmVj ZWl2ZXIgYSBsaXR0bGUgYml0IGVhcmxpZXIKKyAgICAgICAgd2hlbiB3ZSdyZSBnb2luZyB0byB1 bnN1c3BlbmQgaXQuIFRoaXMgYXZvaWRzIGNvbmZsaWN0aW5nIHdpdGggdGhlIFByb3Zpc2lvbmFs UGFnZVByb3h5CisgICAgICAgIHdoaWNoIHRyaWVzIHRvIHJlZ2lzdGVyIGl0c2VsZiBhcyBhbiBJ UEMgbWVzc2FnZSByZWNlaXZlciBmb3IgdGhlIHNhbWUgcGFnZUlEIHdoZW4KKyAgICAgICAgYSBw cm9jZXNzLXN3YXAgb2NjdXJzIGFuZCB3ZSdyZSBzd2l0Y2hpbmcgdG8gYSBzdXNwZW5kZWQgcGFn ZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViRnJhbWVQcm94eTo6aXNNYWluRnJhbWUgY29uc3QpOgorICAgICAgICBXZWJGcmFt ZVByb3h5Ojppc01haW5GcmFtZSgpIHJlbGllcyBvbiBjaGVja2luZyB0aGF0IHRoZSBmcmFtZSBp cyB0aGUgV2ViUGFnZVByb3h5J3MgbV9tYWluRnJhbWUuCisgICAgICAgIE5vdyB0aGF0IHRoZSBX ZWJQYWdlUHJveHkgY2FuIGhhdmUgYSBQcm92aXNpb25hbFBhZ2VQcm94eSwgYWxzbyBjaGVjayBp ZiBpdCBpcyB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkncworICAgICAgICBtX21haW5GcmFtZSB0 byBtYWludGFpbiBwcmV2aW91cyBiZWhhdmlvci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnN3YXBUb1dlYlBy b2Nlc3MpOgorICAgICAgICBzd2FwVG9XZWJQcm9jZXNzKCkgbm8gbG9uZ2VyIHRha2VzIGNhcmUg b2YgdW5zdXNwZW5kaW5nIHRoZSBTdXNwZW5kZWRQYWdlIGJlY2F1c2Ugd2Ugbm93IGNhbGwgc3dh cFRvV2ViUHJvY2VzcygpCisgICAgICAgIGxhdGVyLCB3aGVuIGEgbG9hZCBpcyBhY3R1YWxseSBj b21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHBhZ2UgLyBwcm9jZXNzLiBzd2FwVG9XZWJQcm9j ZXNzKCkgbm93IGFsc28gbmVlZHMKKyAgICAgICAgdG8gaW5pdGlhbGl6ZSBzb21lIGRhdGEgbWVt YmVycyBzdWNoIGFzIHRoZSBkcmF3aW5nIGFyZWEgYW5kIHRoZSBtYWluIGZyYW1lIGFzIGl0IGlz IHRyYW5zZmVycmluZyB0aGVtIG92ZXIgZnJvbQorICAgICAgICB0aGUgUHJvdmlzaW9uYWxQYWdl UHJveHkgd2hpY2ggc3RhcnRlZCB0aGUgcHJvdmlzaW9uYWwgbG9hZC4KKworICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2Vzcyk6CisgICAgICAg IFdlIG5vIGxvbmdlciBuZWVkIElzU3dhcEZyb21TdXNwZW5kZWQgcGFyYW1ldGVyIGFzIHRoaXMg aXMgY2FsbGVkIGxhdGVyIG5vdywgYWZ0ZXIgYSBsb2FkIGhhcyBhY3R1YWxseSBiZWVuCisgICAg ICAgIGNvbW1pdHRlZCBpbiB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vzcy4KKworICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKToKKyAgICAgICAgLSBXZSBubyBs b25nZXIgbmVlZCBJc1N3YXBGcm9tU3VzcGVuZGVkIHBhcmFtZXRlciBhcyB0aGlzIGlzIGNhbGxl ZCBsYXRlciBub3csIGFmdGVyIGEgbG9hZCBoYXMgYWN0dWFsbHkgYmVlbgorICAgICAgICAgIGNv bW1pdHRlZCBpbiB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vzcy4KKyAgICAgICAgLSBGYWN0b3Igc29t ZSBjb2RlIG91dCB0byBXZWJQYWdlUHJveHk6OnNldERyYXdpbmdBcmVhKCkgc28gdGhhdCBpdCBj YW4gYmUgc2hhcmVkIHdpdGggc3dhcFRvV2ViUHJvY2VzcygpLgorCisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbik6CisgICAgICAgIE9ubHkg Y2FsbCBzZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCgpIGluIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRp b24oKSBvbmx5IGlmIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCBpcyBub3QKKyAgICAgICAg WWVzLiBUaGlzIGF2b2lkcyBoaXR0aW5nIHNvbWUgYXNzZXJ0aW9ucyBhcyB0aGlzIHdhcyBhbHJl YWR5IGNhbGxlZCBkdXJpbmcgdGhlIGZpcnN0IEFQSSBjYWxsIGlmIG5lZWRlZC4KKworICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9u KToKKyAgICAgICAgSW4gY2FzZSBvZiBwcm9jZXNzIHN3YXAsIHRlbGwgdGhlIHByZXZpb3VzIHBy b2Nlc3MgdG8gaWdub3JlIHRoZSBsb2FkIGluc3RlYWQgb2Ygc3VzcGVuZGluZyBpdCByaWdodCBh d2F5LgorICAgICAgICBTdXNwZW5zaW9uIG5vdyBoYXBwZW5zIGxhdGVyLCBvbmx5IGlmIHdlIGVu ZCB1cCBjb21taXR0aW5nIHRoZSBwcm92aXNpb25hbCBsb2FkIGluIHRoZSBuZXcgcHJvY2Vzcy4K KyAgICAgICAgQWxzbyBkaXNjYXJkIHRoZSBTdXNwZW5kZWRQYWdlIGlmIGl0IGZhaWxlZCB0byBz dXNwZW5kICh3ZSBvbmx5IHJldXNlIGl0cyBwcm9jZXNzIGluIHRoaXMgY2FzZSkuIFRoaXMgdXNl ZAorICAgICAgICB0byBoYXBwZW4gYSBiaXQgbGF0ZXIgYnV0IGl0IGlzIGNsZWFyZXIgaWYgd2Ug ZG8gdGhpcyBhcyBlYXJseSBhcyBwb3NzaWJsZSBJIHRoaW5rLgorCisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKToKKyAgICAgICAgV2hlbiB0aGUg bG9hZCBpcyBjb21taXR0ZWQgaW4gdGhlIG5ldyBwcm9jZXNzLCB3ZSBjYWxsIFdlYlBhZ2VQcm94 eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKCkuIEl0IHRha2VzIGNhcmUgb2Y6CisgICAgICAgIC0g QWN0dWFsbHkgc3dhcHBpbmcgdGhlIFdlYlBhZ2VQcm94eSB0byB0aGUgbmV3IHByb2Nlc3MgYnkg Y2FsbGluZyBwcm9jZXNzRGlkVGVybWluYXRlKCkgLyBzd2FwVG9XZWJQcm9jZXNzKCkuCisgICAg ICAgIC0gU3VzcGVuZGluZyB0aGUgY3VycmVudCBwYWdlLgorICAgICAgICAtIExldHRpbmcgdGhl IGNsaWVudCBrbm93IHRoZSBsb2FkIGlzIGNvbWl0dGVkCisgICAgICAgIC0gRGVzdHJveSB0aGUg UHJvdmlzaW9uYWxQYWdlUHJveHkuCisgICAgICAgIFRoaXMgd29yayB1c2VkIHRvIGhhcHBlbiBl YXJsaWVyIGluIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcygpLgorCisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKToKKyAg ICAgICAgTW92ZWQgc29tZSBvZiB0aGUgbG9naWMgdG8gY29tbWl0UHJvdmlzaW9uYWxQYWdlKCku IFdlIG5vdyBtZXJlbHkgc3RhcnQgdGhlIGxvYWQgaW4gYSBuZXcgUHJvdmlzaW9uYWxQYWdlUHJv eHksCisgICAgICAgIHdpdGhvdXQgYWN0dWFsbHkgaGF2aW5nIHRoZSBXZWJQYWdlUHJveHkgc3dp dGNoIHRvIHRoZSBuZXcgcHJvY2VzcyB5ZXQuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OmRpZENyZWF0ZVdpbmRvdyk6CisgICAgICAgIERyb3Agc29tZSBjb2RlIHRoYXQgaXMgbm8gbG9u Z2VyIG5lZWRlZCwgbm93IHRoYXQgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IHRha2VzIGNhcmUg b2YgdGhpcy4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZERlc3Ryb3lOYXZp Z2F0aW9uKToKKyAgICAgICAgT24gcHJvY2Vzcy1zd2FwLCB3aGVuIHRlbGxpbmcgdGhlIHByZXZp b3VzIHByb2Nlc3MgdG8gaWdub3JlIHRoZSBsb2FkIGFuZCBzdGFydGluZyB0aGUgbmV3IGxvYWQg aW4gYSBuZXcKKyAgICAgICAgUHJvdmlzaW9uYWxQYWdlUHJveHksIHRoZSBwcmV2aW91cyBXZWJQ YWdlIGF0dGVtcHRzIHRvIGRlc3Ryb3kgdGhlIG5hdmlnYXRpb24uIEluIHRoaXMgY2FzZSwgd2Ug aWdub3JlCisgICAgICAgIHRoZSBjYWxsIHNpbmNlIHRoZSBuYXZpZ2F0aW9uIGlzIG1lcmVseSB0 YWtlbiBvdmVyIGJ5IHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eS4KKworICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAg ICBNb3ZlZCBzb21lIFBTT04gbG9naWMgdG8gdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGluc3Rl YWQuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxM b2FkRm9yRnJhbWUpOgorICAgICAgICBXaGVuIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFt ZSgpIGlzIGNhbGxlZCBmb3IgYSBQcm92aXNpb25hbFBhZ2VQcm94eSwgZGVzdHJveSBpdC4KKwor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb25Bc3luYyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5 Rm9yUmVzcG9uc2UpOgorICAgICAgICBDYXB0dXJlIHRoZSBwcm9jZXNzIGluIHRoZSBsYW1iZGEs IHRvIG1ha2Ugc3VyZSB3ZSBzZW5kIHRoZSBwb2xpY3kgZGVjaXNpb24gdG8gdGhlIHNhbWUgcHJv Y2VzcyB0aGF0CisgICAgICAgIGFza2VkIGZvciBpdCwgc28gYXMgdG8gbm90IGdldCBjb25mdXNl ZCBieSBwcm9jZXNzIHN3YXBzLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVz ZXRTdGF0ZSk6CisgICAgICAgIERyb3Agc29tZSBjb2RlIHRoYXQgaXMgbm8gbG9uZ2VyIG5lZWRl ZC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycyk6 CisgICAgICAgIE1vdmUgdGhlIGhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyBmbGFnIGluaXRp YWxpemF0aW9uIGZyb20gdGhlIGNhbGwgc2l0ZSB0byBoZXJlIG5vdyB0aGF0IHdlIGhhdmUKKyAg ICAgICAgbW9yZSB0aGFuIG9uZSBjYWxsIHNpdGUuIFRoaXMgd2FzIGp1c3Qgc29tZSBiYWQgZmFj dG9yaW5nLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVy cmlkZTo6UGFnZVByb2Nlc3NPdmVycmlkZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6flBhZ2VQcm9jZXNzT3ZlcnJpZGUpOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 Ojp0ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2Vzcyk6CisgICAgICAgIEFkZCB1dGlsaXR5IGNsYXNz IHRvIHRlbXBvcmFyaWx5IG92ZXJyaWRlIHRoZSBXZWJQYWdlUHJveHkncyBtX3Byb2Nlc3Mgd2l0 aCB0aGUgcHJvdmlzaW9uYWwgb25lIHdoZW4KKyAgICAgICAgdGhlIFByb3Zpc2lvbmFsUGFnZVBy b3h5IGludGVyYWN0cyB3aXRoIHRoZSBXZWJQYWdlUHJveHkuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5 OjpoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ cm9jZXNzUHJveHk6OnVwZGF0ZUJhY2tGb3J3YXJkSXRlbSk6CisgICAgICAgIEJlZm9yZSB1cGRh dGluZyBhIEJhY2tGb3J3YXJkTGlzdEl0ZW0sIHdlIG5vcm1hbGx5IG1ha2Ugc3VyZSB0aGUgcHJv Y2VzcyBoYXMgYSBXZWJQYWdlUHJveHkgd2l0aCB0aGUKKyAgICAgICAgaXRlbSdzIHBhZ2VJRC4g V2UgaGF2ZSB0byB0d2VhayB0aGUgbG9naWMgYmVjYXVzZSB0aGVyZSBtYXkgbm93IGJlIG5vIFdl YlBhZ2VQcm94eSB3aXRoIHRoaXMgcGFnZUlECisgICAgICAgIGFzc29jaWF0ZWQgd2l0aCB0aGlz IHByb2Nlc3MgeWV0LCBiZWNhdXNlIGl0IGlzIHN0aWxsIGEgUHJvdmlzaW9uYWxQYWdlUHJveHku CisKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpjYW5UZXJtaW5hdGVDaGlsZFBy b2Nlc3MpOgorICAgICAgICBEbyBub3QgdGVybWluYXRlIHRoZSBXZWJQcm9jZXNzIGlmIHRoZXJl IGFyZSBQcm92aXNpb25hbFBhZ2VQcm94eSBvYmplY3RzIHVzaW5nIGl0LgorCisgICAgICAgICog VUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNz UHJveHk6OmFkZFByb3Zpc2lvbmFsUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzc1Byb3h5OjpyZW1vdmVQcm92aXNpb25hbFBhZ2VQcm94eSk6CisKKyAgICAgICAgKiBXZWJL aXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKworICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9XZWJGcmFtZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OnRvUG9saWN5QWN0aW9uKToKKyAg ICAgICAgKFdlYktpdDo6V2ViRnJhbWU6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbik6CisgICAg ICAgIFN0b3AgZGVhbGluZyB3aXRoIFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZCBhcyBpdCBubyBs b25nZXIgZXhpc3RzLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpyZWluaXRpYWxpemVXZWJQYWdlKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKToKKworICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRJc1N1c3BlbmRlZCk6CisgICAgICAgIFN1c3BlbmQgdGhl IFBhZ2Ugd2hlbiBzZXRJc1N1c3BlbmRlZCh0cnVlKSBpcyBjYWxsZWQsIG5vdyB0aGF0IHRoZXJl IGlzIG5vIGxvbmdlciBhIFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZC4KKyAgICAgICAgc2V0SXNT dXNwZW5kZWQodHJ1ZSkgSVBDIGlzIHNlbnQgd2hlbiB3ZSBhY3R1YWxseSBjb21taXQgdGhlIHBy b3Zpc2lvbmFsIHBhZ2UuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tOgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVB bmltYXRpb25EcmF3aW5nQXJlYTo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEpOgorCiAy MDE5LTAxLTE0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgU3BsaXQgaGVhZGVyVmFsdWVGb3JWYXJ5IGludG8gc3BlY2lhbGl6ZWQgZnVuY3Rp b25zIGZvciBOZXR3b3JrUHJvY2VzcyBhbmQgV2ViUHJvY2Vzcy9XZWJLaXRMZWdhY3kKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDRjMjZhNjk4MWI0NjRkYTU5MTZmMDVl YjczNTk2NjkxNTdlZTlmZmUuLmViZjk1MGJhNmMyZWQ5MWY2MjMyYmQyYjVlZmI5Zjc5NTU3YWI1 OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMjAzMiwxMSArMjAz MiwxMSBAQCB2b2lkIEZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQoKQogCiAgICAg ICAgIE9wdGlvbmFsPEhhc0luc2VjdXJlQ29udGVudD4gaGFzSW5zZWN1cmVDb250ZW50ID0gY2Fj aGVkUGFnZS0+Y2FjaGVkTWFpbkZyYW1lKCktPmhhc0luc2VjdXJlQ29udGVudCgpOwogCisgICAg ICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOworCiAgICAgICAg IC8vIEZJWE1FOiBUaGlzIEFQSSBzaG91bGQgYmUgdHVybmVkIGFyb3VuZCBzbyB0aGF0IHdlIGdy b3VuZCBDYWNoZWRQYWdlIGludG8gdGhlIFBhZ2UuCiAgICAgICAgIGNhY2hlZFBhZ2UtPnJlc3Rv cmUoKm1fZnJhbWUucGFnZSgpKTsKIAotICAgICAgICBkaXNwYXRjaERpZENvbW1pdExvYWQoaGFz SW5zZWN1cmVDb250ZW50KTsKLQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgICAgIG1f ZnJhbWUucGFnZSgpLT5jaHJvbWUoKS5zZXREaXNwYXRjaFZpZXdwb3J0RGF0YURpZENoYW5nZVN1 cHByZXNzZWQoZmFsc2UpOwogICAgICAgICBtX2ZyYW1lLnBhZ2UoKS0+Y2hyb21lKCkuZGlzcGF0 Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UobV9mcmFtZS5wYWdlKCktPnZpZXdwb3J0QXJn dW1lbnRzKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzLmNwcAppbmRleCBjYTJkZjQwZWUxZGQyY2EzNmYzYTQ4YTA0NzU3Zjk3YmRiYjYz NjQ3Li42ZDA3YzAzYWQ4YzkyN2U1NDUzYzVmZGE5NTk2NzA5YTc3MjYxZTJiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcApAQCAt NzMsNyArNzMsNyBAQCB2b2lkIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZShJUEM6 OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2Rlci5lbmNvZGVFbnVtKGxheWVySG9z dGluZ01vZGUpOwogICAgIGVuY29kZXIgPDwgbWltZVR5cGVzV2l0aEN1c3RvbUNvbnRlbnRQcm92 aWRlcnM7CiAgICAgZW5jb2RlciA8PCBjb250cm9sbGVkQnlBdXRvbWF0aW9uOwotICAgIGVuY29k ZXIgPDwgaXNTd2FwRnJvbVN1c3BlbmRlZDsKKyAgICBlbmNvZGVyIDw8IGlzUHJvY2Vzc1N3YXA7 CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgZW5jb2RlciA8PCBjb2xvclNwYWNlOwpAQCAtMjI3 LDcgKzIyNyw3IEBAIE9wdGlvbmFsPFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM+IFdlYlBhZ2VD cmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkRlY29kCiAgICAgICAgIHJldHVybiBXVEY6 Om51bGxvcHQ7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmNvbnRyb2xsZWRC eUF1dG9tYXRpb24pKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotICAgIGlmICghZGVj b2Rlci5kZWNvZGUocGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKSkKKyAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkpCiAgICAgICAgIHJldHVybiBX VEY6Om51bGxvcHQ7CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmggYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgKaW5kZXggYWU0MzI1Y2JkNWYxZTU2NzYx NjU4NmY1ZTlmYTczZWU1YjM1YjkzNy4uYjM4MmNlZWRkNDQ5YThkOWEwZjg2OTQ3MzVmMjZjMDU5 NWRkZWNkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBh cmFtZXRlcnMuaApAQCAtMTI5LDcgKzEyOSw3IEBAIHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJh bWV0ZXJzIHsKICAgICBWZWN0b3I8U3RyaW5nPiBtaW1lVHlwZXNXaXRoQ3VzdG9tQ29udGVudFBy b3ZpZGVyczsKIAogICAgIGJvb2wgY29udHJvbGxlZEJ5QXV0b21hdGlvbjsKLSAgICBib29sIGlz U3dhcEZyb21TdXNwZW5kZWQgeyBmYWxzZSB9OworICAgIGJvb2wgaXNQcm9jZXNzU3dhcCB7IGZh bHNlIH07CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgQ29sb3JTcGFjZURhdGEgY29sb3JTcGFj ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oIGIv U291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKaW5kZXggMTQyYTUxOGRmMDk3 ZTVlZjJmYTE4MDQ4NGUwOWQwMzMzYzEwNWI4MS4uMzk3MTc5NWM0NmE1MWIzODgxOGM1NWI3NmQ2 NTNhMzRiNTI4OWU5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5 QWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKQEAg LTI5LDExICsyOSwxMSBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorLy8gRklYTUU6IFJlbW92 ZSB0aGlzIHR5cGUgYW5kIHVzZSBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gaW5zdGVhZC4KIGVudW0g Y2xhc3MgV2ViUG9saWN5QWN0aW9uIDogdWludDhfdCB7CiAgICAgVXNlLAogICAgIERvd25sb2Fk LAotICAgIElnbm9yZSwKLSAgICBTdXNwZW5kCisgICAgSWdub3JlCiB9OwogCiB9CkBAIC00NSw4 ICs0NSw3IEBAIHRlbXBsYXRlPD4gc3RydWN0IEVudW1UcmFpdHM8V2ViS2l0OjpXZWJQb2xpY3lB Y3Rpb24+IHsKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb24sCiAgICAgICAgIFdlYktp dDo6V2ViUG9saWN5QWN0aW9uOjpVc2UsCiAgICAgICAgIFdlYktpdDo6V2ViUG9saWN5QWN0aW9u OjpEb3dubG9hZCwKLSAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246Oklnbm9yZSwKLSAg ICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQKKyAgICAgICAgV2ViS2l0OjpX ZWJQb2xpY3lBY3Rpb246Oklnbm9yZQogICAgID47CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1NvdXJjZXMudHh0IGIvU291cmNlL1dlYktpdC9Tb3VyY2VzLnR4dAppbmRleCBhMGI2 ZjcyODQ2MDQxYzI2M2E1NDc2NzEwZWFjOTg3ZmVkMWQxNjA0Li44YWVjYjg2NDcyNTAyZDAyN2Ez NGFmMzcxOWRkODI4YjAwN2RiMTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMu dHh0CisrKyBiL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQKQEAgLTIzMCw2ICsyMzAsNyBAQCBV SVByb2Nlc3MvSW5zcGVjdG9yVGFyZ2V0UHJveHkuY3BwCiBVSVByb2Nlc3MvUGFnZUxvYWRTdGF0 ZS5jcHAKIFVJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcAogVUlQcm9jZXNzL1Byb2Nlc3NU aHJvdHRsZXIuY3BwCitVSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCiBVSVByb2Nl c3MvUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkuY3BwCiBVSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NU aW1lci5jcHAKIFVJUHJvY2Vzcy9TZXJ2aWNlV29ya2VyUHJvY2Vzc1Byb3h5LmNwcApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMDc0Y2Rk ZmQyNzg0ZTg2OTEyOGQwMjBiZWQ1OTIxM2ExY2JkZGU2OC4uNGRmYWQ2NGUwMTU0MzU5MjgwZTYx NjhiMWYxZWQ1ZWJlNmQ3ZDliYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJWaWV3Lm1tCkBAIC00NCw2ICs0NCw3IEBACiAjaW1wb3J0ICJOYXZpZ2F0aW9u U3RhdGUuaCIKICNpbXBvcnQgIk9iakNPYmplY3RHcmFwaC5oIgogI2ltcG9ydCAiUGFnZUNsaWVu dC5oIgorI2ltcG9ydCAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbXBvcnQgIlJlbW90ZUxh eWVyVHJlZVNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YS5oIgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJU cmVlVHJhbnNhY3Rpb24uaCIKICNpbXBvcnQgIlJlbW90ZU9iamVjdFJlZ2lzdHJ5LmgiCkBAIC00 NzAwLDYgKzQ3MDEsMTEgQEAgLSAodm9pZClfa2lsbFdlYkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRT dGF0ZQogewogICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nlc3NQcm94eT4gcHJvdGVjdGVkUHJvY2Vz c1Byb3h5KF9wYWdlLT5wcm9jZXNzKCkpOwogICAgIHByb3RlY3RlZFByb2Nlc3NQcm94eS0+cmVx dWVzdFRlcm1pbmF0aW9uKFdlYktpdDo6UHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpSZXF1ZXN0 ZWRCeUNsaWVudCk7CisKKyAgICBpZiAoYXV0byogcHJvdmlzaW9uYWxQYWdlUHJveHkgPSBfcGFn ZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKSkgeworICAgICAgICBSZWY8V2ViS2l0OjpXZWJQcm9j ZXNzUHJveHk+IHByb3RlY3RlZFByb2Nlc3NQcm94eShwcm92aXNpb25hbFBhZ2VQcm94eS0+cHJv Y2VzcygpKTsKKyAgICAgICAgcHJvdGVjdGVkUHJvY2Vzc1Byb3h5LT5yZXF1ZXN0VGVybWluYXRp b24oV2ViS2l0OjpQcm9jZXNzVGVybWluYXRpb25SZWFzb246OlJlcXVlc3RlZEJ5Q2xpZW50KTsK KyAgICB9CiB9CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xp ZW50LmgKaW5kZXggMTQ5NzE0YWIxZDIyNjVhNjgzNGQ1N2VmNDdiMTE2ZWE0ZTI5ZTM1MS4uODJj NzczMjJmMmRmODdlM2FlZDVlMDA0YzYxYjJmNzkzOTUwZTM4OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1BhZ2VDbGllbnQuaApAQCAtNDgsNiArNDgsNyBAQAogCiBPQkpDX0NMQVNTIENBTGF5ZXI7 CiBPQkpDX0NMQVNTIE5TRmlsZVdyYXBwZXI7CitPQkpDX0NMQVNTIE5TTWVudTsKIE9CSkNfQ0xB U1MgTlNTZXQ7CiBPQkpDX0NMQVNTIFdLRHJhd2luZ1ZpZXc7CiBPQkpDX0NMQVNTIF9XS1JlbW90 ZU9iamVjdFJlZ2lzdHJ5OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJv dmlzaW9uYWxQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9u YWxQYWdlUHJveHkuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjVlYjQ0ZTlkNDg3OWI3MmJmZTcxNmM4MWQyZGRm ODAzMjJmZjBjOTMKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Q cm92aXNpb25hbFBhZ2VQcm94eS5jcHAKQEAgLTAsMCArMSwzMDUgQEAKKy8qCisgKiBDb3B5cmln aHQgKEMpIDIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZv bGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9m IHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4K KyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUg YWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFu ZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoK KyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRS SUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJ RVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFO VElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICog UFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJ VFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJ TkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFH RVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VC U1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7 IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkg VEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFC SUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFS SVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisj aW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKKwor I2luY2x1ZGUgIkFQSU5hdmlnYXRpb24uaCIKKyNpbmNsdWRlICJEcmF3aW5nQXJlYVByb3h5Lmgi CisjaW5jbHVkZSAiTG9nZ2luZy5oIgorI2luY2x1ZGUgIlBhZ2VDbGllbnQuaCIKKyNpbmNsdWRl ICJXZWJCYWNrRm9yd2FyZExpc3QuaCIKKyNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3RJdGVt LmgiCisjaW5jbHVkZSAiV2ViRXJyb3JzLmgiCisjaW5jbHVkZSAiV2ViTmF2aWdhdGlvblN0YXRl LmgiCisjaW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2VzLmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5 LmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5TWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQcm9j ZXNzTWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNzUHJveHkuaCIKKyNpbmNsdWRlIDxX ZWJDb3JlL1Nob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZC5oPgorCituYW1lc3BhY2UgV2ViS2l0 IHsKKworI2RlZmluZSBSRUxFQVNFX0xPR19JRl9BTExPV0VEKGNoYW5uZWwsIGZtdCwgLi4uKSBS RUxFQVNFX0xPR19JRihtX3BhZ2UuaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCksIGNoYW5uZWws ICIlcCAtIFByb3Zpc2lvbmFsUGFnZVByb3h5OjoiIGZtdCwgdGhpcywgIyNfX1ZBX0FSR1NfXykK KworUHJvdmlzaW9uYWxQYWdlUHJveHk6OlByb3Zpc2lvbmFsUGFnZVByb3h5KFdlYlBhZ2VQcm94 eSYgcGFnZSwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVuaXF1ZV9wdHI8 U3VzcGVuZGVkUGFnZVByb3h5PiBzdXNwZW5kZWRQYWdlLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQs IGJvb2wgaXNTZXJ2ZXJSZWRpcmVjdCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBy ZXF1ZXN0LCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVk QnlDbGllbnQpCisgICAgOiBtX3BhZ2UocGFnZSkKKyAgICAsIG1fcHJvY2VzcyhXVEZNb3ZlKHBy b2Nlc3MpKQorICAgICwgbV9uYXZpZ2F0aW9uSUQobmF2aWdhdGlvbklEKQorICAgICwgbV9pc1Nl cnZlclJlZGlyZWN0KGlzU2VydmVyUmVkaXJlY3QpCisgICAgLCBtX3JlcXVlc3QocmVxdWVzdCkK KyAgICAsIG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudChwcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50KQorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgLCBtX3N1c3BlbnNpb25U b2tlbihtX3Byb2Nlc3MtPnRocm90dGxlcigpLmZvcmVncm91bmRBY3Rpdml0eVRva2VuKCkpCisj ZW5kaWYKK3sKKyAgICBtX3Byb2Nlc3MtPmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSwgKnRoaXMp OworICAgIG1fcHJvY2Vzcy0+YWRkUHJvdmlzaW9uYWxQYWdlUHJveHkoKnRoaXMpOworCisgICAg Ly8gSWYgd2UgYXJlIHJlYXR0YWNoaW5nIHRvIGEgU3VzcGVuZGVkUGFnZSwgdGhlbiB0aGUgV2Vi UHJvY2VzcycgV2ViUGFnZSBhbHJlYWR5IGV4aXN0cyBhbmQKKyAgICAvLyBXZWJQYWdlUHJveHk6 OmRpZENyZWF0ZU1haW5GcmFtZSgpIHdpbGwgbm90IGJlIGNhbGxlZCB0byBpbml0aWFsaXplIG1f bWFpbkZyYW1lLiBJbiBzdWNoCisgICAgLy8gY2FzZSwgd2UgbmVlZCB0byBpbml0aWFsaXplIG1f bWFpbkZyYW1lIHRvIHJlZmxlY3QgdGhlIGZhY3QgdGhlIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdl CisgICAgLy8gYWxyZWFkeSBleGlzdHMgYW5kIGFscmVhZHkgaGFzIGEgbWFpbiBmcmFtZS4KKyAg ICBpZiAoc3VzcGVuZGVkUGFnZSkgeworICAgICAgICBBU1NFUlQoJnN1c3BlbmRlZFBhZ2UtPnBy b2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpOworICAgICAgICBzdXNwZW5kZWRQYWdlLT51bnN1 c3BlbmQoKTsKKyAgICAgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5OjpjcmVhdGUobV9w YWdlLCBzdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpKTsKKyAgICAgICAgbV9wcm9jZXNzLT5m cmFtZUNyZWF0ZWQoc3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSwgKm1fbWFpbkZyYW1lKTsK KyAgICB9CisKKyAgICBpbml0aWFsaXplV2ViUGFnZSgpOworfQorCitQcm92aXNpb25hbFBhZ2VQ cm94eTo6flByb3Zpc2lvbmFsUGFnZVByb3h5KCkKK3sKKyAgICBtX3Byb2Nlc3MtPnJlbW92ZVBy b3Zpc2lvbmFsUGFnZVByb3h5KCp0aGlzKTsKKworICAgIGlmIChtX3dhc0NvbW1pdHRlZCkKKyAg ICAgICAgcmV0dXJuOworCisgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVz c2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlE KCkpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9w YWdlLnBhZ2VJRCgpKTsKKworICAgIGlmIChtX2RyYXdpbmdBcmVhKSB7CisgICAgICAgIGF1dG8g cGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2Vzcyht X3Byb2Nlc3MpOworICAgICAgICBtX2RyYXdpbmdBcmVhID0gbnVsbHB0cjsKKyAgICB9CisKKyAg ICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3Byb2Nlc3MgPSBtX3Byb2Nlc3MuY29weVJlZigp XSB7CisgICAgICAgIHByb2Nlc3MtPm1heWJlU2h1dERvd24oKTsKKyAgICB9KTsKK30KKwordm9p ZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6cHJvY2Vzc0RpZFRlcm1pbmF0ZSgpCit7CisgICAgbV9w YWdlLnByb3Zpc2lvbmFsUHJvY2Vzc0RpZFRlcm1pbmF0ZSgpOworfQorCitzdGQ6OnVuaXF1ZV9w dHI8RHJhd2luZ0FyZWFQcm94eT4gUHJvdmlzaW9uYWxQYWdlUHJveHk6OnRha2VEcmF3aW5nQXJl YSgpCit7CisgICAgcmV0dXJuIFdURk1vdmUobV9kcmF3aW5nQXJlYSk7Cit9CisKK3ZvaWQgUHJv dmlzaW9uYWxQYWdlUHJveHk6OmNhbmNlbCgpCit7CisgICAgLy8gSWYgdGhlIHByb3Zpc2lvbmFs IGxvYWQgc3RhcnRlZCwgdGhlbiBpbmRpY2F0ZSB0aGF0IGl0IGZhaWxlZCBkdWUgdG8gY2FuY2Vs bGF0aW9uIGJ5IGNhbGxpbmcgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKCkuCisgICAg aWYgKG1fcHJvdmlzaW9uYWxMb2FkVVJMLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOworCisg ICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJjYW5jZWw6IFNpbXVs YXRpbmcgYSBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUgZm9yIHBhZ2VJRCA9ICUiIFBS SXU2NCwgbV9wYWdlLnBhZ2VJRCgpKTsKKyAgICBBU1NFUlQobV9tYWluRnJhbWUpOworICAgIGF1 dG8gZXJyb3IgPSBXZWJLaXQ6OmNhbmNlbGxlZEVycm9yKG1fcmVxdWVzdCk7CisgICAgZXJyb3Iu c2V0VHlwZShXZWJDb3JlOjpSZXNvdXJjZUVycm9yOjpUeXBlOjpDYW5jZWxsYXRpb24pOworICAg IGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZShtX21haW5GcmFtZS0+ZnJhbWVJRCgpLCB7 IH0sIG1fbmF2aWdhdGlvbklELCBtX3Byb3Zpc2lvbmFsTG9hZFVSTCwgZXJyb3IsIFVzZXJEYXRh IHsgfSk7IC8vIFdpbGwgZGVsZXRlIHx0aGlzfC4KK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQ cm94eTo6cHJvY2Vzc0RpZEZpbmlzaExhdW5jaGluZygpCit7CisgICAgZmluaXNoSW5pdGlhbGl6 aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCgpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFn ZVByb3h5OjpmaW5pc2hJbml0aWFsaXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNoKCkKK3sK KyAgICBBU1NFUlQobV9wcm9jZXNzLT5zdGF0ZSgpID09IFdlYlByb2Nlc3NQcm94eTo6U3RhdGU6 OlJ1bm5pbmcpOworCisgICAgLy8gRklYTUU6IFRoZSBXZWJQYWdlUHJveHkgZGVsYXlzIGFkZGlu ZyB0aGUgdmlzaXRlZCBsaW5rIHN0b3JlIHVudGlsIGFmdGVyIHRoZSBwcm9jZXNzIGhhcyBsYXVu Y2hlZAorICAgIC8vIHNvIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eSBkb2VzIHRoZSBzYW1lLiBI b3dldmVyLCBkbyB3ZSByZWFsbHkgbmVlZCB0bz8KKyAgICBtX3Byb2Nlc3MtPmFkZFZpc2l0ZWRM aW5rU3RvcmUobV9wYWdlLnZpc2l0ZWRMaW5rU3RvcmUoKSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9u YWxQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKCkKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNz T3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsK KyAgICBtX2RyYXdpbmdBcmVhID0gbV9wYWdlLnBhZ2VDbGllbnQoKS5jcmVhdGVEcmF3aW5nQXJl YVByb3h5KCk7CisKKyAgICBhdXRvIHBhcmFtZXRlcnMgPSBtX3BhZ2UuY3JlYXRpb25QYXJhbWV0 ZXJzKCk7CisgICAgcGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwID0gdHJ1ZTsKKyAgICBtX3Byb2Nl c3MtPnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OkNyZWF0ZVdlYlBhZ2UobV9wYWdlLnBhZ2VJ RCgpLCBwYXJhbWV0ZXJzKSwgMCk7CisKKyAgICBpZiAobV9wcm9jZXNzLT5zdGF0ZSgpID09IFdl YlByb2Nlc3NQcm94eTo6U3RhdGU6OlJ1bm5pbmcpCisgICAgICAgIGZpbmlzaEluaXRpYWxpemlu Z1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2goKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQ cm94eTo6bG9hZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24s IGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgZGF0YSwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwg Y29uc3QgU3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVj dCogdXNlckRhdGEsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGlj aWVzKQoreworICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3Jhcmls eU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgIG1fcGFnZS5sb2FkRGF0YVdpdGhOYXZp Z2F0aW9uKG5hdmlnYXRpb24sIGRhdGEsIE1JTUVUeXBlLCBlbmNvZGluZywgYmFzZVVSTCwgdXNl ckRhdGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3Zl KHdlYnNpdGVQb2xpY2llcykpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2Fk UmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFs VVJMc1BvbGljeSBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNl ckRhdGEsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQor eworICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJy aWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgIG1fcGFnZS5sb2FkUmVxdWVzdFdpdGhOYXZpZ2F0 aW9uKG5hdmlnYXRpb24sIFdURk1vdmUocmVxdWVzdCksIHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQ b2xpY3ksIHVzZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6Olll cywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQ cm94eTo6Z29Ub0JhY2tGb3J3YXJkSXRlbShBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIFdl YkJhY2tGb3J3YXJkTGlzdEl0ZW0mIGl0ZW0sIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+ JiYgd2Vic2l0ZVBvbGljaWVzKQoreworICAgIGF1dG8gaXRlbVN0YXRlcyA9IG1fcGFnZS5iYWNr Rm9yd2FyZExpc3QoKS5maWx0ZXJlZEl0ZW1TdGF0ZXMoW3RoaXMsIHRhcmdldEl0ZW0gPSAmaXRl bV0oYXV0byYgaXRlbSkgeworICAgICAgICBpZiAoYXV0byogcGFnZSA9IGl0ZW0uc3VzcGVuZGVk UGFnZSgpKSB7CisgICAgICAgICAgICBpZiAoJnBhZ2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nlc3Mu cHRyKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CisgICAgICAg IHJldHVybiAmaXRlbSAhPSB0YXJnZXRJdGVtOworICAgIH0pOworICAgIG1fcHJvY2Vzcy0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6VXBkYXRlQmFja0ZvcndhcmRMaXN0Rm9yUmVhdHRhY2goV1RG TW92ZShpdGVtU3RhdGVzKSksIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgbV9wcm9jZXNzLT5zZW5k KE1lc3NhZ2VzOjpXZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtKG5hdmlnYXRpb24ubmF2aWdh dGlvbklEKCksIGl0ZW0uaXRlbUlEKCksICpuYXZpZ2F0aW9uLmJhY2tGb3J3YXJkRnJhbWVMb2Fk VHlwZSgpLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92 ZSh3ZWJzaXRlUG9saWNpZXMpKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKyAgICBtX3Byb2Nlc3MtPnJl c3BvbnNpdmVuZXNzVGltZXIoKS5zdGFydCgpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVBy b3h5OjpkaWRDcmVhdGVNYWluRnJhbWUodWludDY0X3QgZnJhbWVJRCkKK3sKKyAgICBSRUxFQVNF X0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZENyZWF0ZU1haW5GcmFtZTogcGFn ZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSwg ZnJhbWVJRCk7CisgICAgQVNTRVJUKCFtX21haW5GcmFtZSk7CisKKyAgICBtX21haW5GcmFtZSA9 IFdlYkZyYW1lUHJveHk6OmNyZWF0ZShtX3BhZ2UsIGZyYW1lSUQpOworCisgICAgLy8gQWRkIHRo ZSBmcmFtZSB0byB0aGUgcHJvY2VzcyB3aWRlIG1hcC4KKyAgICBtX3Byb2Nlc3MtPmZyYW1lQ3Jl YXRlZChmcmFtZUlELCAqbV9tYWluRnJhbWUpOworCisgICAgLy8gVGhpcyBuYXZpZ2F0aW9uIHdh cyBkZXN0cm95ZWQgc28gbm8gbmVlZCB0byBub3RpZnkgb2YgcmVkaXJlY3QuCisgICAgaWYgKCFt X3BhZ2UubmF2aWdhdGlvblN0YXRlKCkuaGFzTmF2aWdhdGlvbihtX25hdmlnYXRpb25JRCkpCisg ICAgICAgIHJldHVybjsKKworICAgIC8vIFJlc3RvcmUgdGhlIG1haW4gZnJhbWUncyBjb21taXR0 ZWQgVVJMIGFzIHNvbWUgY2xpZW50cyBtYXkgcmVseSBvbiBpdCB1bnRpbCB0aGUgbmV4dCBsb2Fk IGlzIGNvbW1pdHRlZC4KKyAgICBpZiAoYXV0byogbWFpbkZyYW1lID0gbV9wYWdlLm1haW5GcmFt ZSgpKQorICAgICAgICBtX21haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5zZXRVUkwobWFpbkZy YW1lLT5mcmFtZUxvYWRTdGF0ZSgpLnVybCgpKTsKKworICAgIC8vIE5vcm1hbGx5LCBub3RpZmlj YXRpb24gb2YgYSBzZXJ2ZXIgcmVkaXJlY3QgY29tZXMgZnJvbSB0aGUgV2ViQ29udGVudCBwcm9j ZXNzLgorICAgIC8vIElmIHdlIGFyZSBwcm9jZXNzIHN3YXBwaW5nIGluIHJlc3BvbnNlIHRvIGEg c2VydmVyIHJlZGlyZWN0IHRoZW4gdGhhdCBub3RpZmljYXRpb24gd2lsbCBub3QgY29tZSBmcm9t IHRoZSBuZXcgV2ViQ29udGVudCBwcm9jZXNzLgorICAgIC8vIEluIHRoaXMgY2FzZSB3ZSBoYXZl IHRoZSBVSVByb2Nlc3Mgc3ludGhlc2l6ZSB0aGUgcmVkaXJlY3Qgbm90aWZpY2F0aW9uIGF0IHRo ZSBhcHByb3ByaWF0ZSB0aW1lLgorICAgIGlmIChtX2lzU2VydmVyUmVkaXJlY3QpIHsKKyAgICAg ICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkuZGlkU3RhcnRQcm92aXNpb25hbExvYWQo bV9yZXF1ZXN0LnVybCgpKTsKKworICAgICAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBt X3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICAgICAgbV9w YWdlLmRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKG1f bWFpbkZyYW1lLT5mcmFtZUlEKCksIG1fbmF2aWdhdGlvbklELCBXVEZNb3ZlKG1fcmVxdWVzdCks IHsgfSk7CisgICAgfQorfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRTdGFydFBy b3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRp b25JRCwgVVJMJiYgdXJsLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmIHVz ZXJEYXRhKQoreworICAgIC8vIElmIHRoZSBwcmV2aW91cyBwcm92aXNpb25hbCBsb2FkIHVzZWQg dGhlIHNhbWUgcHJvY2Vzcywgd2UgbWF5IHJlY2VpdmUgSVBDIGZvciB0aGlzIHByZXZpb3VzIHBy b3Zpc2lvbmFsJ3MgbWFpbiBmcmFtZSB0aGF0IHdlIG5lZWQgdG8gaWdub3JlLgorICAgIGlmICgh bV9tYWluRnJhbWUgfHwgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSAhPSBmcmFtZUlEKQorICAgICAg ICByZXR1cm47CisKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywg ImRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBm cmFtZUlEID0gJSIgUFJJdTY0ICIsIG5hdmlnYXRpb25JRCA9ICUiIFBSSXU2NCwgbV9wYWdlLnBh Z2VJRCgpLCBmcmFtZUlELCBuYXZpZ2F0aW9uSUQpOworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFs TG9hZFVSTC5pc051bGwoKSk7CisgICAgbV9wcm92aXNpb25hbExvYWRVUkwgPSB1cmw7CisKKyAg ICAvLyBNZXJlbHkgZm9sbG93aW5nIGEgc2VydmVyIHNpZGUgcmVkaXJlY3Qgc28gdGhlcmUgaXMg bm8gbmVlZCB0byBzZW5kIGEgZGlkU3RhcnRQcm92aXNpb25hbExvYWQgYWdhaW4uCisgICAgaWYg KG1faXNTZXJ2ZXJSZWRpcmVjdCkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gQ2xpZW50cyBl eHBlY3QgdGhlIFBhZ2UncyBtYWluIGZyYW1lJ3MgZXhwZWN0ZWRVUkwgdG8gYmUgdGhlIHByb3Zp c2lvbmFsIG9uZSB3aGVuIGEgcHJvdmlzaW9uYWwgbG9hZCBpcyBzdGFydGVkLgorICAgIGlmIChh dXRvKiBwYWdlTWFpbkZyYW1lID0gbV9wYWdlLm1haW5GcmFtZSgpKQorICAgICAgICBwYWdlTWFp bkZyYW1lLT5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZCh1cmwpOworCisgICAgYXV0byBwYWdlUHJv Y2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vz cyk7CisgICAgbV9wYWdlLmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoZnJhbWVJRCwg bmF2aWdhdGlvbklELCBXVEZNb3ZlKHVybCksIFdURk1vdmUodW5yZWFjaGFibGVVUkwpLCB1c2Vy RGF0YSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25h bExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9y aWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29u c3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYg ZXJyb3IsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNz T3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsK KworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiZGlkRmFpbFBy b3Zpc2lvbmFsTG9hZEZvckZyYW1lOiBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUi IFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSwgZnJh bWVJRCwgbmF2aWdhdGlvbklEKTsKKyAgICBtX3Byb3Zpc2lvbmFsTG9hZFVSTCA9IHsgfTsKKwor ICAgIC8vIE1ha2Ugc3VyZSB0aGUgUGFnZSdzIG1haW4gZnJhbWUncyBleHBlY3RlZFVSTCBnZXRz IGNsZWFyZWQgc2luY2Ugd2UgdXBkYXRlZCBpdCBpbiBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZC4K KyAgICBpZiAoYXV0byogcGFnZU1haW5GcmFtZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAg ICAgcGFnZU1haW5GcmFtZS0+ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZCgpOworCisgICAgbV9wYWdl LmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZShmcmFtZUlELCBmcmFtZVNlY3VyaXR5T3Jp Z2luLCBuYXZpZ2F0aW9uSUQsIHByb3Zpc2lvbmFsVVJMLCBlcnJvciwgdXNlckRhdGEpOyAvLyBX aWxsIGRlbGV0ZSB8dGhpc3wuCit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZENv bW1pdExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQs IGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlk ZXIsIHVpbnQzMl90IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5m byYgY2VydGlmaWNhdGVJbmZvLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFs PFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBj b25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCit7CisgICAgLy8gSWYgdGhlIHByZXZpb3VzIHByb3Zp c2lvbmFsIGxvYWQgdXNlZCB0aGUgc2FtZSBwcm9jZXNzLCB3ZSBtYXkgcmVjZWl2ZSBJUEMgZm9y IHRoaXMgcHJldmlvdXMgcHJvdmlzaW9uYWwncyBtYWluIGZyYW1lIHRoYXQgd2UgbmVlZCB0byBp Z25vcmUuCisgICAgaWYgKCFtX21haW5GcmFtZSB8fCBtX21haW5GcmFtZS0+ZnJhbWVJRCgpICE9 IGZyYW1lSUQpCisgICAgICAgIHJldHVybjsKKworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQo UHJvY2Vzc1N3YXBwaW5nLCAiZGlkQ29tbWl0TG9hZEZvckZyYW1lOiBwYWdlSUQgPSAlIiBQUkl1 NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgPSAlIiBQUkl1NjQsIG1f cGFnZS5wYWdlSUQoKSwgZnJhbWVJRCwgbmF2aWdhdGlvbklEKTsKKyAgICBtX3Byb3Zpc2lvbmFs TG9hZFVSTCA9IHsgfTsKKyAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNz YWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQo KSk7CisKKyAgICBtX3dhc0NvbW1pdHRlZCA9IHRydWU7CisgICAgbV9wYWdlLmNvbW1pdFByb3Zp c2lvbmFsUGFnZShmcmFtZUlELCBuYXZpZ2F0aW9uSUQsIG1pbWVUeXBlLCBmcmFtZUhhc0N1c3Rv bUNvbnRlbnRQcm92aWRlciwgZnJhbWVMb2FkVHlwZSwgY2VydGlmaWNhdGVJbmZvLCBjb250YWlu c1BsdWdpbkRvY3VtZW50LCBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIHVzZXJEYXRhKTsgLy8g V2lsbCBkZWxldGUgfHRoaXN8LgorfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRS ZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIElQQzo6RGVjb2RlciYg ZGVjb2RlcikKK3sKKyAgICBBU1NFUlQoZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkgPT0g TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpKTsKKworICAgIGlm IChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU3Rh cnRQcm9ncmVzczo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBN ZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDaGFuZ2VQcm9ncmVzczo6bmFtZSgpCisgICAgICAg IHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpCYWNr Rm9yd2FyZEFkZEl0ZW06Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkg PT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6TG9nRGlhZ25vc3RpY01lc3NhZ2U6Om5hbWUoKQor ICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6TG9nRGlhZ25vc3RpY01lc3NhZ2VXaXRoRW5oYW5jZWRQcml2YWN5OjpuYW1lKCkKKyAgICAg ICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNl dE5ldHdvcmtSZXF1ZXN0c0luUHJvZ3Jlc3M6Om5hbWUoKQorI2lmIFBMQVRGT1JNKENPQ09BKQor ICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6UmVnaXN0ZXJXZWJQcm9jZXNzQWNjZXNzaWJpbGl0eVRva2VuOjpuYW1lKCkKKyNlbmRpZgor ICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jOjpuYW1lKCkKKyAgICAgICAg fHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlN0YXJ0 VVJMU2NoZW1lVGFzazo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9 PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEZWNpZGVQb2xpY3lGb3JSZXNwb25zZTo6bmFtZSgp CisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpEaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3Q6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVy Lm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ2hhbmdlUHJvdmlz aW9uYWxVUkxGb3JGcmFtZTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUo KSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0 YTo6bmFtZSgpKQorICAgIHsKKyAgICAgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9w YWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgICAgIG1fcGFn ZS5kaWRSZWNlaXZlTWVzc2FnZShjb25uZWN0aW9uLCBkZWNvZGVyKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6RGlkQ3JlYXRlTWFpbkZyYW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpo YW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENyZWF0ZU1haW5GcmFtZT4o ZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUp OworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUo KSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQ YWdlUHJveHk6OkRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMs ICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgp ID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFt ZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjpEaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQ cm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKTsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0g TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ29tbWl0TG9hZEZvckZyYW1lOjpuYW1lKCkpIHsK KyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENv bW1pdExvYWRGb3JGcmFtZT4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5Ojpk aWRDb21taXRMb2FkRm9yRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgTE9H KFByb2Nlc3NTd2FwcGluZywgIlVuaGFuZGxlZCBtZXNzYWdlICVzOjolcyBmcm9tIHByb3Zpc2lv bmFsIHByb2Nlc3MiLCBkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKS50b1N0cmluZygpLmRh dGEoKSwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgpKTsKK30KKwordm9p ZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVj dGlvbiYgY29ubmVjdGlvbiwgSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBzdGQ6OnVuaXF1ZV9wdHI8 SVBDOjpFbmNvZGVyPiYgZW5jb2RlcikKK3sKKyAgICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUg PSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3MobV9wcm9jZXNzKTsKKyAgICBtX3Bh Z2UuZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKGNvbm5lY3Rpb24sIGRlY29kZXIsIGVuY29kZXIpOwor fQorCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Q cm92aXNpb25hbFBhZ2VQcm94eS5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjhhMGY3MWRmOGNiNGM3NjI0MjUxZTQx ZGM5M2FjZTE4MzY0OTFjM2UKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oCkBAIC0wLDAgKzEsOTUgQEAKKy8qCisgKiBDb3B5 cmlnaHQgKEMpIDIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0 aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgor ICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENP TlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJB TlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FS UkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgor ICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBP UiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNU LCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERB TUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICog U1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJ VFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBB TlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBM SUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAq IEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLwor CisjcHJhZ21hIG9uY2UKKworI2luY2x1ZGUgIk1lc3NhZ2VSZWNlaXZlci5oIgorI2luY2x1ZGUg PHd0Zi9XZWFrUHRyLmg+CisKK25hbWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNzIFJlc291cmNlUmVx dWVzdDsKK30KKworbmFtZXNwYWNlIFdlYktpdCB7CisKK2NsYXNzIERyYXdpbmdBcmVhUHJveHk7 CitjbGFzcyBTdXNwZW5kZWRQYWdlUHJveHk7CitjbGFzcyBXZWJGcmFtZVByb3h5OworY2xhc3Mg V2ViUGFnZVByb3h5OworY2xhc3MgV2ViUHJvY2Vzc1Byb3h5OworCitjbGFzcyBQcm92aXNpb25h bFBhZ2VQcm94eSA6IHB1YmxpYyBJUEM6Ok1lc3NhZ2VSZWNlaXZlciwgcHVibGljIENhbk1ha2VX ZWFrUHRyPFByb3Zpc2lvbmFsUGFnZVByb3h5PiB7CisgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FU RUQ7CitwdWJsaWM6CisgICAgUHJvdmlzaW9uYWxQYWdlUHJveHkoV2ViUGFnZVByb3h5JiwgUmVm PFdlYlByb2Nlc3NQcm94eT4mJiwgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4s IHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgYm9vbCBpc1NlcnZlclJlZGlyZWN0LCBjb25zdCBXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KTsKKyAg ICB+UHJvdmlzaW9uYWxQYWdlUHJveHkoKTsKKworICAgIFdlYlBhZ2VQcm94eSYgcGFnZSgpIHsg cmV0dXJuIG1fcGFnZTsgfQorICAgIFdlYkZyYW1lUHJveHkqIG1haW5GcmFtZSgpIGNvbnN0IHsg cmV0dXJuIG1fbWFpbkZyYW1lLmdldCgpOyB9CisgICAgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNz KCkgeyByZXR1cm4gbV9wcm9jZXNzLmdldCgpOyB9CisgICAgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRC eUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KCkgY29uc3QgeyByZXR1cm4gbV9w cm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50OyB9CisgICAgdWludDY0X3QgbmF2aWdhdGlvbklE KCkgY29uc3QgeyByZXR1cm4gbV9uYXZpZ2F0aW9uSUQ7IH0KKworICAgIERyYXdpbmdBcmVhUHJv eHkqIGRyYXdpbmdBcmVhKCkgY29uc3QgeyByZXR1cm4gbV9kcmF3aW5nQXJlYS5nZXQoKTsgfQor ICAgIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiB0YWtlRHJhd2luZ0FyZWEoKTsK KworICAgIHZvaWQgbG9hZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBjb25z dCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJp bmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0 YSwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7CisgICAg dm9pZCBsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYsIFdlYkNvcmU6 OlJlc291cmNlUmVxdWVzdCYmLCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5 LCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYg PSBXVEY6Om51bGxvcHQpOworICAgIHZvaWQgZ29Ub0JhY2tGb3J3YXJkSXRlbShBUEk6Ok5hdmln YXRpb24mLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtJiwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVz RGF0YT4mJik7CisgICAgdm9pZCBjYW5jZWwoKTsKKworICAgIHZvaWQgcHJvY2Vzc0RpZEZpbmlz aExhdW5jaGluZygpOworICAgIHZvaWQgcHJvY2Vzc0RpZFRlcm1pbmF0ZSgpOworCitwcml2YXRl OgorICAgIC8vIElQQzo6TWVzc2FnZVJlY2VpdmVyCisgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2Fn ZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImKSBmaW5hbDsKKyAgICB2b2lkIGRpZFJl Y2VpdmVTeW5jTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImLCBzdGQ6OnVu aXF1ZV9wdHI8SVBDOjpFbmNvZGVyPiYpIGZpbmFsOworCisgICAgdm9pZCBkaWRDcmVhdGVNYWlu RnJhbWUodWludDY0X3QgZnJhbWVJRCk7CisgICAgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9h ZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYs IFVSTCYmIHVucmVhY2hhYmxlVVJMLCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkQ29t bWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwg Y29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRl ciwgdWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZv JiwgYm9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNl Y3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmKTsK KyAgICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlE LCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4s IHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIGNvbnN0IFVzZXJEYXRhJik7CisKKyAgICB2b2lk IGluaXRpYWxpemVXZWJQYWdlKCk7CisgICAgdm9pZCBmaW5pc2hJbml0aWFsaXppbmdXZWJQYWdl QWZ0ZXJQcm9jZXNzTGF1bmNoKCk7CisKKyAgICBXZWJQYWdlUHJveHkmIG1fcGFnZTsKKyAgICBS ZWY8V2ViUHJvY2Vzc1Byb3h5PiBtX3Byb2Nlc3M7CisgICAgc3RkOjp1bmlxdWVfcHRyPERyYXdp bmdBcmVhUHJveHk+IG1fZHJhd2luZ0FyZWE7CisgICAgUmVmUHRyPFdlYkZyYW1lUHJveHk+IG1f bWFpbkZyYW1lOworICAgIHVpbnQ2NF90IG1fbmF2aWdhdGlvbklEOworICAgIGJvb2wgbV9pc1Nl cnZlclJlZGlyZWN0OworICAgIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCBtX3JlcXVlc3Q7Cisg ICAgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBtX3Byb2Nlc3NTd2FwUmVxdWVzdGVkQnlD bGllbnQ7CisgICAgYm9vbCBtX3dhc0NvbW1pdHRlZCB7IGZhbHNlIH07CisgICAgVVJMIG1fcHJv dmlzaW9uYWxMb2FkVVJMOworCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAgICBQcm9jZXNz VGhyb3R0bGVyOjpCYWNrZ3JvdW5kQWN0aXZpdHlUb2tlbiBtX3N1c3BlbnNpb25Ub2tlbjsKKyNl bmRpZgorfTsKKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcAppbmRleCBmMTk4YTgxNTMzZjc2YjJlOGUyYmY3 MWQ0YTNiOWQyNzQwYzk1MDc4Li5mZjc2ZDlmN2Y5N2FjNmZhNGZiYjMwMmY2NDY2NjFkMTY3OGFl MjU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJv eHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5j cHAKQEAgLTEwMCw3ICsxMDAsOSBAQCBTdXNwZW5kZWRQYWdlUHJveHk6On5TdXNwZW5kZWRQYWdl UHJveHkoKQogICAgIC8vIElmIHRoZSBzdXNwZW5kZWQgcGFnZSB3YXMgbm90IGNvbnN1bWVkIGJl Zm9yZSBnZXR0aW5nIGRlc3Ryb3llZCwgdGhlbiBjbG9zZSB0aGUgY29ycmVzcG9uZGluZyBwYWdl CiAgICAgLy8gb24gdGhlIFdlYlByb2Nlc3Mgc2lkZS4KICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OkNsb3NlKCksIG1fcGFnZS5wYWdlSUQoKSk7Ci0gICAgbV9wcm9jZXNz LT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJl Y2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAgaWYgKG1fc3VzcGVuc2lvblN0 YXRlID09IFN1c3BlbnNpb25TdGF0ZTo6U3VzcGVuZGluZykKKyAgICAgICAgbV9wcm9jZXNzLT5y ZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2Vp dmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOwogCiAgICAgLy8gV2UgY2FsbCBtYXliZVNodXRE b3duKCkgYXN5bmNocm9ub3VzbHkgc2luY2UgdGhlIFN1c3BlbmRlZFBhZ2UgaXMgY3VycmVudGx5 IGJlaW5nIHJlbW92ZWQgZnJvbSB0aGUgV2ViUHJvY2Vzc1Bvb2wKICAgICAvLyBhbmQgd2Ugd2Fu dCB0byBhdm9pZCByZS1lbnRlcmluZyBXZWJQcm9jZXNzUG9vbCBtZXRob2RzLgpAQCAtMTM0LDcg KzEzNiw2IEBAIHZvaWQgU3VzcGVuZGVkUGFnZVByb3h5Ojp1bnN1c3BlbmQoKQogICAgIEFTU0VS VChtX3N1c3BlbnNpb25TdGF0ZSA9PSBTdXNwZW5zaW9uU3RhdGU6OlN1c3BlbmRlZCk7CiAKICAg ICBtX3N1c3BlbnNpb25TdGF0ZSA9IFN1c3BlbnNpb25TdGF0ZTo6UmVzdW1lZDsKLSAgICBtX3By b2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNz YWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CiAgICAgbV9wcm9jZXNzLT5zZW5k KE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRJc1N1c3BlbmRlZChmYWxzZSksIG1fcGFnZS5wYWdlSUQo KSk7CiB9CiAKQEAgLTE1MSw2ICsxNTIsOCBAQCB2b2lkIFN1c3BlbmRlZFBhZ2VQcm94eTo6ZGlk UHJvY2Vzc1JlcXVlc3RUb1N1c3BlbmQoU3VzcGVuc2lvblN0YXRlIG5ld1N1c3BlbnNpbwogICAg IG1fc3VzcGVuc2lvblRva2VuID0gbnVsbHB0cjsKICNlbmRpZgogCisgICAgbV9wcm9jZXNzLT5y ZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2Vp dmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCiAgICAgaWYgKG1fcmVhZHlUb1Vuc3VzcGVu ZEhhbmRsZXIpCiAgICAgICAgIG1fcmVhZHlUb1Vuc3VzcGVuZEhhbmRsZXIodGhpcyk7CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCmluZGV4IGM3N2EyNmI3NDI3 YzMxYzgyOGUyZWFhMjIxZjgwNzBiNzdhZGQyNjIuLjUzYzcxOTZjMmFhMGEzM2QyMjA3NTgxOTBj ZDRiZDk1YTVjZDAyNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZy YW1lUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHku Y3BwCkBAIC0yNyw2ICsyNyw3IEBACiAjaW5jbHVkZSAiV2ViRnJhbWVQcm94eS5oIgogCiAjaW5j bHVkZSAiQVBJTmF2aWdhdGlvbi5oIgorI2luY2x1ZGUgIlByb3Zpc2lvbmFsUGFnZVByb3h5Lmgi CiAjaW5jbHVkZSAiV2ViQ2VydGlmaWNhdGVJbmZvLmgiCiAjaW5jbHVkZSAiV2ViRnJhbWVQb2xp Y3lMaXN0ZW5lclByb3h5LmgiCiAjaW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2VzLmgiCkBAIC03NCw3 ICs3NSw3IEBAIGJvb2wgV2ViRnJhbWVQcm94eTo6aXNNYWluRnJhbWUoKSBjb25zdAogICAgIGlm ICghbV9wYWdlKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICByZXR1cm4gdGhpcyA9PSBt X3BhZ2UtPm1haW5GcmFtZSgpOworICAgIHJldHVybiB0aGlzID09IG1fcGFnZS0+bWFpbkZyYW1l KCkgfHwgKG1fcGFnZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKSAmJiB0aGlzID09IG1fcGFnZS0+ cHJvdmlzaW9uYWxQYWdlUHJveHkoKS0+bWFpbkZyYW1lKCkpOwogfQogCiB2b2lkIFdlYkZyYW1l UHJveHk6OmxvYWRVUkwoY29uc3QgVVJMJiB1cmwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcAppbmRleCBjOGFiNzAzMzNiNDAzOWE4Nzc5YzRjYTNmMzFlMTkwNzU2M2Ez MzY5Li4yNjdlNWNkM2ZjZDAyOGI0ZTJmOTJjZDhiOTAwYTE3OTdlNWUwN2ZmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTc3LDYgKzc3LDcgQEAKICNpbmNs dWRlICJQbHVnaW5JbmZvcm1hdGlvbi5oIgogI2luY2x1ZGUgIlBsdWdpblByb2Nlc3NNYW5hZ2Vy LmgiCiAjaW5jbHVkZSAiUHJpbnRJbmZvLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJv eHkuaCIKICNpbmNsdWRlICJTYWZlQnJvd3NpbmdXYXJuaW5nLmgiCiAjaW5jbHVkZSAiU2hhcmVT aGVldENhbGxiYWNrSUQuaCIKICNpbmNsdWRlICJTaGFyZWRCdWZmZXJEYXRhUmVmZXJlbmNlLmgi CkBAIC01NDUsNiArNTQ2LDEzIEBAIFBBTDo6U2Vzc2lvbklEIFdlYlBhZ2VQcm94eTo6c2Vzc2lv bklEKCkgY29uc3QKICAgICByZXR1cm4gbV93ZWJzaXRlRGF0YVN0b3JlLT5zZXNzaW9uSUQoKTsK IH0KIAorRHJhd2luZ0FyZWFQcm94eSogV2ViUGFnZVByb3h5OjpkcmF3aW5nQXJlYSgpIGNvbnN0 Cit7CisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlICYmIG1fcHJvY2Vzcy5wdHIoKSA9PSAmbV9w cm92aXNpb25hbFBhZ2UtPnByb2Nlc3MoKSAmJiBtX3Byb3Zpc2lvbmFsUGFnZS0+ZHJhd2luZ0Fy ZWEoKSkKKyAgICAgICAgcmV0dXJuIG1fcHJvdmlzaW9uYWxQYWdlLT5kcmF3aW5nQXJlYSgpOwor ICAgIHJldHVybiBtX2RyYXdpbmdBcmVhLmdldCgpOworfQorCiB2b2lkIFdlYlBhZ2VQcm94eTo6 Y2hhbmdlV2Vic2l0ZURhdGFTdG9yZShXZWJzaXRlRGF0YVN0b3JlJiB3ZWJzaXRlRGF0YVN0b3Jl KQogewogICAgIG1fcHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKS5wYWdlRW5kVXNpbmdXZWJzaXRlRGF0 YVN0b3JlKCp0aGlzKTsKQEAgLTc2OCwzOCArNzc2LDI2IEBAIGJvb2wgV2ViUGFnZVByb3h5Ojpz dXNwZW5kQ3VycmVudFBhZ2VJZlBvc3NpYmxlKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwg T3B0CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojpzd2FwVG9XZWJQ cm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2Vzcywgc3RkOjp1bmlxdWVfcHRyPFN1 c3BlbmRlZFBhZ2VQcm94eT4mJiBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UsIElzU3dhcEZyb21T dXNwZW5kZWQgaXNTd2FwRnJvbVN1c3BlbmRlZCkKK3ZvaWQgV2ViUGFnZVByb3h5Ojpzd2FwVG9X ZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2Vzcywgc3RkOjp1bmlxdWVfcHRy PERyYXdpbmdBcmVhUHJveHk+JiYgZHJhd2luZ0FyZWEsIFJlZlB0cjxXZWJGcmFtZVByb3h5PiYm IG1haW5GcmFtZSkKIHsKICAgICBBU1NFUlQoIW1faXNDbG9zZWQpOwogICAgIFJFTEVBU0VfTE9H X0lGX0FMTE9XRUQoTG9hZGluZywgInN3YXBUb1dlYlByb2Nlc3M6IHdlYlBJRCA9ICVpLCBwYWdl SUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQp OwogCiAgICAgbV9wcm9jZXNzID0gV1RGTW92ZShwcm9jZXNzKTsKKyAgICBBU1NFUlQoIW1fZHJh d2luZ0FyZWEpOworICAgIHNldERyYXdpbmdBcmVhKFdURk1vdmUoZHJhd2luZ0FyZWEpKTsKKyAg ICBBU1NFUlQoIW1fbWFpbkZyYW1lKTsKKyAgICBtX21haW5GcmFtZSA9IFdURk1vdmUobWFpbkZy YW1lKTsKICAgICBtX2lzVmFsaWQgPSB0cnVlOwogCi0gICAgLy8gSWYgd2UgYXJlIHJlYXR0YWNo aW5nIHRvIGEgU3VzcGVuZGVkUGFnZSwgdGhlbiB0aGUgV2ViUHJvY2VzcycgV2ViUGFnZSBhbHJl YWR5IGV4aXN0cyBhbmQKLSAgICAvLyBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZU1haW5GcmFtZSgp IHdpbGwgbm90IGJlIGNhbGxlZCB0byBpbml0aWFsaXplIG1fbWFpbkZyYW1lLiBJbiBzdWNoCi0g ICAgLy8gY2FzZSwgd2UgbmVlZCB0byBpbml0aWFsaXplIG1fbWFpbkZyYW1lIHRvIHJlZmxlY3Qg dGhlIGZhY3QgdGhlIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdlCi0gICAgLy8gYWxyZWFkeSBleGlz dHMgYW5kIGFscmVhZHkgaGFzIGEgbWFpbiBmcmFtZS4KLSAgICBpZiAoZGVzdGluYXRpb25TdXNw ZW5kZWRQYWdlKSB7Ci0gICAgICAgIGlmICghZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5mYWls ZWRUb1N1c3BlbmQoKSkgewotICAgICAgICAgICAgQVNTRVJUKCFtX21haW5GcmFtZSk7Ci0gICAg ICAgICAgICBBU1NFUlQoJmRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZS0+cHJvY2VzcygpID09IG1f cHJvY2Vzcy5wdHIoKSk7Ci0gICAgICAgICAgICBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPnVu c3VzcGVuZCgpOwotICAgICAgICAgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5OjpjcmVh dGUoKnRoaXMsIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSk7Ci0gICAg ICAgICAgICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2Ut Pm1haW5GcmFtZUlEKCksICptX21haW5GcmFtZSk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAg ICAgICAvLyBXZSBmYWlsZWQgdG8gc3VzcGVuZCB0aGUgcGFnZSBzbyBkZXN0cm95IGl0IG5vdyBh bmQgbWVyZWx5IHJldXNlIGl0cyBXZWJDb250ZW50IHByb2Nlc3MuCi0gICAgICAgICAgICBkZXN0 aW5hdGlvblN1c3BlbmRlZFBhZ2UgPSBudWxscHRyOwotICAgICAgICB9Ci0gICAgfQotCiAgICAg bV9wcm9jZXNzLT5hZGRFeGlzdGluZ1dlYlBhZ2UoKnRoaXMsIG1fcGFnZUlELCBXZWJQcm9jZXNz UHJveHk6OkJlZ2luc1VzaW5nRGF0YVN0b3JlOjpObyk7CiAgICAgbV9wcm9jZXNzLT5hZGRNZXNz YWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgp LCBtX3BhZ2VJRCwgKnRoaXMpOwogCi0gICAgZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKGlz U3dhcEZyb21TdXNwZW5kZWQpOworICAgIC8vIE5vIG5lZWQgdG8gaW5pdGlhbGl6ZSB0aGUgV2Vi UGFnZSBzaW5jZSBpdCB3YXMgY3JlYXRlZCB3aGVuIHdlIGNyZWF0ZWQgdGhlIFByb3Zpc2lvbmFs UGFnZVByb3h5LgorICAgIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhTaG91bGRJbml0aWFs aXplV2ViUGFnZTo6Tm8pOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNoaW5n VG9XZWJQcm9jZXNzKElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1c3BlbmRlZCkKK3Zv aWQgV2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoU2hvdWxkSW5pdGlh bGl6ZVdlYlBhZ2Ugc2hvdWxkSW5pdGlhbGl6ZVBhZ2UpCiB7CiAgICAgQVNTRVJUKG1fcHJvY2Vz cy0+c3RhdGUoKSAhPSBDaGlsZFByb2Nlc3NQcm94eTo6U3RhdGU6OlRlcm1pbmF0ZWQpOwogCkBA IC04MzUsNyArODMxLDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2Vi UHJvY2VzcyhJc1N3YXBGcm9tU3VzcGVuZGVkIGlzU3dhcEZyb21TdXMKICAgICBtX2VkaXRhYmxl SW1hZ2VDb250cm9sbGVyID0gc3RkOjptYWtlX3VuaXF1ZTxFZGl0YWJsZUltYWdlQ29udHJvbGxl cj4oKnRoaXMpOwogI2VuZGlmCiAKLSAgICBpbml0aWFsaXplV2ViUGFnZShpc1N3YXBGcm9tU3Vz cGVuZGVkKTsKKyAgICBpZiAoc2hvdWxkSW5pdGlhbGl6ZVBhZ2UgPT0gU2hvdWxkSW5pdGlhbGl6 ZVdlYlBhZ2U6OlllcykKKyAgICAgICAgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsKIAogICAgIG1faW5z cGVjdG9yLT51cGRhdGVGb3JOZXdQYWdlUHJvY2Vzcyh0aGlzKTsKIApAQCAtOTAwLDEyICs4OTcs MTEgQEAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gV2ViUGFnZVByb3h5OjpyZWF0dGFjaFRvV2Vi UHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tGb3J3YXIKICAgICByZXR1cm4gV1RGTW92ZShuYXZpZ2F0 aW9uKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKElzU3dhcEZy b21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1c3BlbmRlZCkKK3ZvaWQgV2ViUGFnZVByb3h5OjpzZXRE cmF3aW5nQXJlYShzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4mJiBkcmF3aW5nQXJl YSkKIHsKLSAgICBBU1NFUlQoaXNWYWxpZCgpKTsKLQotICAgIG1fZHJhd2luZ0FyZWEgPSBwYWdl Q2xpZW50KCkuY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpOwotICAgIEFTU0VSVChtX2RyYXdpbmdB cmVhKTsKKyAgICBtX2RyYXdpbmdBcmVhID0gV1RGTW92ZShkcmF3aW5nQXJlYSk7CisgICAgaWYg KCFtX2RyYXdpbmdBcmVhKQorICAgICAgICByZXR1cm47CiAKICNpZiBFTkFCTEUoQVNZTkNfU0NS T0xMSU5HKSAmJiBQTEFURk9STShDT0NPQSkKICAgICBpZiAobV9kcmF3aW5nQXJlYS0+dHlwZSgp ID09IERyYXdpbmdBcmVhVHlwZVJlbW90ZUxheWVyVHJlZSkgewpAQCAtOTE2LDE1ICs5MTIsMTYg QEAgdm9pZCBXZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKElzU3dhcEZyb21TdXNwZW5k ZWQgaXNTd2FwRnJvbVN1c3BlbmRlZCkKICNlbmRpZgogICAgIH0KICNlbmRpZgorfQogCi0gICAg YXV0byBwYXJhbWV0ZXJzID0gY3JlYXRpb25QYXJhbWV0ZXJzKCk7Ci0gICAgcGFyYW1ldGVycy5p c1N3YXBGcm9tU3VzcGVuZGVkID0gaXNTd2FwRnJvbVN1c3BlbmRlZCA9PSBJc1N3YXBGcm9tU3Vz cGVuZGVkOjpZZXM7Cit2b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoKQorewor ICAgIEFTU0VSVChpc1ZhbGlkKCkpOwogCi0jaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQotICAg IHBhcmFtZXRlcnMuaGFzUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXJzID0gcHJvY2VzcygpLnByb2Nl c3NQb29sKCkubWF5SGF2ZVJlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyhtX3dlYnNpdGVEYXRhU3Rv cmUpOwotI2VuZGlmCisgICAgc2V0RHJhd2luZ0FyZWEocGFnZUNsaWVudCgpLmNyZWF0ZURyYXdp bmdBcmVhUHJveHkoKSk7CisgICAgQVNTRVJUKG1fZHJhd2luZ0FyZWEpOwogCi0gICAgcHJvY2Vz cygpLnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OkNyZWF0ZVdlYlBhZ2UobV9wYWdlSUQsIHBh cmFtZXRlcnMpLCAwKTsKKyAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6 Q3JlYXRlV2ViUGFnZShtX3BhZ2VJRCwgY3JlYXRpb25QYXJhbWV0ZXJzKCkpLCAwKTsKIAogICAg IG1fbmVlZHNUb0ZpbmlzaEluaXRpYWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2ggPSB0 cnVlOwogICAgIGZpbmlzaEluaXRpYWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2goKTsK QEAgLTEwNzYsNyArMTA3Myw4IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhO YXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgUmVzb3VyCiAgICAgYXV0byB0 cmFuc2FjdGlvbiA9IG1fcGFnZUxvYWRTdGF0ZS50cmFuc2FjdGlvbigpOwogCiAgICAgYXV0byB1 cmwgPSByZXF1ZXN0LnVybCgpOwotICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVx dWVzdFVSTCh0cmFuc2FjdGlvbiwgdXJsKTsKKyAgICBpZiAoc2hvdWxkVHJlYXRBc0NvbnRpbnVp bmdMb2FkICE9IFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzKQorICAgICAgICBtX3Bh Z2VMb2FkU3RhdGUuc2V0UGVuZGluZ0FQSVJlcXVlc3RVUkwodHJhbnNhY3Rpb24sIHVybCk7CiAK ICAgICBpZiAoIWlzVmFsaWQoKSkKICAgICAgICAgcmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsKQEAg LTEyOTQsNiArMTI5MiwxMCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c3RvcExvYWRpbmcoKQogICAg IH0KIAogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U3RvcExvYWRpbmco KSwgbV9wYWdlSUQpOworICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZSkgeworICAgICAgICBtX3By b3Zpc2lvbmFsUGFnZS0+Y2FuY2VsKCk7CisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlID0gbnVs bHB0cjsKKyAgICB9CiAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQo KTsKIH0KIApAQCAtMjY5OCw3ICsyNzAwLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVk TmF2aWdhdGlvblBvbGljeURlY2lzaW9uKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24KICAg ICAgICAgfQogCiAgICAgICAgIGlmIChwcm9jZXNzRm9yTmF2aWdhdGlvbi5wdHIoKSAhPSAmcHJv Y2VzcygpKSB7Ci0gICAgICAgICAgICBwb2xpY3lBY3Rpb24gPSBpc1BhZ2VPcGVuZWRCeURPTVNo b3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpID8gV2ViUG9saWN5QWN0aW9uOjpJZ25vcmUgOiBX ZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQ7CisgICAgICAgICAgICBwb2xpY3lBY3Rpb24gPSBXZWJQ b2xpY3lBY3Rpb246Oklnbm9yZTsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQo UHJvY2Vzc1N3YXBwaW5nLCAiZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiwgc3dhcHBp bmcgcHJvY2VzcyAlaSB3aXRoIHByb2Nlc3MgJWkgZm9yIG5hdmlnYXRpb24sIHJlYXNvbjogJXtw dWJsaWN9cyIsIHByb2Nlc3NJZGVudGlmaWVyKCksIHByb2Nlc3NGb3JOYXZpZ2F0aW9uLT5wcm9j ZXNzSWRlbnRpZmllcigpLCByZWFzb24udXRmOCgpLmRhdGEoKSk7CiAgICAgICAgICAgICBMT0co UHJvY2Vzc1N3YXBwaW5nLCAiKFByb2Nlc3NTd2FwcGluZykgU3dpdGNoaW5nIGZyb20gcHJvY2Vz cyAlaSB0byBuZXcgcHJvY2VzcyAoJWkpIGZvciBuYXZpZ2F0aW9uICUiIFBSSXU2NCAiICclcyci LCBwcm9jZXNzSWRlbnRpZmllcigpLCBwcm9jZXNzRm9yTmF2aWdhdGlvbi0+cHJvY2Vzc0lkZW50 aWZpZXIoKSwgbmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24tPmxvZ2dpbmdT dHJpbmcoKSk7CiAgICAgICAgIH0gZWxzZQpAQCAtMjcwNyw4ICsyNzA5LDE0IEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpyZWNlaXZlZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbihXZWJQb2xpY3lBY3Rp b24gcG9saWN5QWN0aW9uCiAgICAgICAgIGJvb2wgc2hvdWxkUHJvY2Vzc1N3YXAgPSBwcm9jZXNz Rm9yTmF2aWdhdGlvbi5wdHIoKSAhPSAmcHJvY2VzcygpOwogICAgICAgICByZWNlaXZlZFBvbGlj eURlY2lzaW9uKHBvbGljeUFjdGlvbiwgbmF2aWdhdGlvbi5wdHIoKSwgc2hvdWxkUHJvY2Vzc1N3 YXAgPyBXVEY6Om51bGxvcHQgOiBXVEZNb3ZlKGRhdGEpLCBXVEZNb3ZlKHNlbmRlcikpOwogCi0g ICAgICAgIGlmIChzaG91bGRQcm9jZXNzU3dhcCkKLSAgICAgICAgICAgIGNvbnRpbnVlTmF2aWdh dGlvbkluTmV3UHJvY2VzcyhuYXZpZ2F0aW9uLCBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UgPyBw cm9jZXNzKCkucHJvY2Vzc1Bvb2woKS50YWtlU3VzcGVuZGVkUGFnZSgqZGVzdGluYXRpb25TdXNw ZW5kZWRQYWdlKSA6IG51bGxwdHIsIFdURk1vdmUocHJvY2Vzc0Zvck5hdmlnYXRpb24pLCBwcm9j ZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBXVEZNb3ZlKGRhdGEpKTsKKyAgICAgICAgaWYgKCFz aG91bGRQcm9jZXNzU3dhcCkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBhdXRvIHN1 c3BlbmRlZFBhZ2UgPSBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UgPyBwcm9jZXNzKCkucHJvY2Vz c1Bvb2woKS50YWtlU3VzcGVuZGVkUGFnZSgqZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlKSA6IG51 bGxwdHI7CisgICAgICAgIGlmIChzdXNwZW5kZWRQYWdlICYmIHN1c3BlbmRlZFBhZ2UtPmZhaWxl ZFRvU3VzcGVuZCgpKQorICAgICAgICAgICAgc3VzcGVuZGVkUGFnZSA9IG51bGxwdHI7CisKKyAg ICAgICAgY29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKG5hdmlnYXRpb24sIFdURk1vdmUo c3VzcGVuZGVkUGFnZSksIFdURk1vdmUocHJvY2Vzc0Zvck5hdmlnYXRpb24pLCBwcm9jZXNzU3dh cFJlcXVlc3RlZEJ5Q2xpZW50LCBXVEZNb3ZlKGRhdGEpKTsKICAgICB9KTsKIH0KIApAQCAtMjc0 NCwyNCArMjc1Miw0NSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVjZWl2ZWRQb2xpY3lEZWNpc2lv bihXZWJQb2xpY3lBY3Rpb24gYWN0aW9uLCBBUEk6Ok5hdmlnYXRpbwogICAgIHNlbmRlci0+c2Vu ZChhY3Rpb24sIG5hdmlnYXRpb24gPyBuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSA6IDAsIGRv d25sb2FkSUQsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiB9CiAKLXZvaWQgV2ViUGFnZVBy b3h5Ojpjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpOYXZpZ2F0aW9uJiBuYXZp Z2F0aW9uLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmIHN1c3BlbmRlZFBh Z2VQcm94eSwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBQcm9jZXNzU3dhcFJlcXVl c3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIE9wdGlvbmFsPFdlYnNp dGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQordm9pZCBXZWJQYWdlUHJveHk6OmNv bW1pdFByb3Zpc2lvbmFsUGFnZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9u SUQsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJv dmlkZXIsIHVpbnQzMl90IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRl SW5mbyYgY2VydGlmaWNhdGVJbmZvLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlv bmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50 LCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCiB7Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RChMb2FkaW5nLCAiY29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzOiB3ZWJQSUQgPSAlaSwg cGFnZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFn ZUlEKTsKLSAgICBMT0coTG9hZGluZywgIkNvbnRpbnVpbmcgbmF2aWdhdGlvbiAlIiBQUkl1NjQg IiAnJXMnIGluIGEgbmV3IHdlYiBwcm9jZXNzIiwgbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwg bmF2aWdhdGlvbi5sb2dnaW5nU3RyaW5nKCkpOworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFn ZSk7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiY29tbWl0UHJvdmlzaW9u YWxQYWdlOiBwcmV2aW91c1BJRCA9ICVpLCBuZXdQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0 LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcHJvdmlzaW9uYWxQYWdlLT5wcm9j ZXNzKCkucHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQpOwogCi0gICAgUmVmPFdlYlByb2Nl c3NQcm94eT4gcHJldmlvdXNQcm9jZXNzID0gbV9wcm9jZXNzLmNvcHlSZWYoKTsKICAgICBPcHRp b25hbDx1aW50NjRfdD4gbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcyA9IG1fbWFpbkZyYW1l ID8gbWFrZU9wdGlvbmFsKG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkpIDogV1RGOjpudWxsb3B0Owot ICAgIGF1dG8gbWFpbkZyYW1lVVJMID0gbV9tYWluRnJhbWUgPyBtX21haW5GcmFtZS0+dXJsKCkg OiBVUkwoKTsKIAotICAgIEFTU0VSVChtX3Byb2Nlc3MucHRyKCkgIT0gcHJvY2Vzcy5wdHIoKSk7 CisgICAgQVNTRVJUKG1fcHJvY2Vzcy5wdHIoKSAhPSAmbV9wcm92aXNpb25hbFBhZ2UtPnByb2Nl c3MoKSk7CiAKICAgICBwcm9jZXNzRGlkVGVybWluYXRlKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNv bjo6TmF2aWdhdGlvblN3YXApOwogCiAgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2 ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2VJ RCk7Ci0gICAgYm9vbCBkaWRTdXNwZW5kUHJldmlvdXNQYWdlID0gc3VzcGVuZEN1cnJlbnRQYWdl SWZQb3NzaWJsZShuYXZpZ2F0aW9uLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzLCBwcm9j ZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KTsKKyAgICBhdXRvKiBuYXZpZ2F0aW9uID0gbmF2aWdh dGlvblN0YXRlKCkubmF2aWdhdGlvbihtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkp OworICAgIGJvb2wgZGlkU3VzcGVuZFByZXZpb3VzUGFnZSA9IG5hdmlnYXRpb24gPyBzdXNwZW5k Q3VycmVudFBhZ2VJZlBvc3NpYmxlKCpuYXZpZ2F0aW9uLCBtYWluRnJhbWVJREluUHJldmlvdXNQ cm9jZXNzLCBtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCgp KSA6IGZhbHNlOwogICAgIG1fcHJvY2Vzcy0+cmVtb3ZlV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQs IFdlYlByb2Nlc3NQcm94eTo6RW5kc1VzaW5nRGF0YVN0b3JlOjpObyk7CiAKLSAgICBzd2FwVG9X ZWJQcm9jZXNzKFdURk1vdmUocHJvY2VzcyksIFdURk1vdmUoc3VzcGVuZGVkUGFnZVByb3h5KSwg ZGlkU3VzcGVuZFByZXZpb3VzUGFnZSA/IElzU3dhcEZyb21TdXNwZW5kZWQ6OlllcyA6IElzU3dh cEZyb21TdXNwZW5kZWQ6Ok5vKTsKKyAgICAvLyBUaGVyZSBpcyBubyB3YXkgd2UnbGwgYmUgYWJs ZSB0byByZXR1cm4gdG8gdGhlIHBhZ2UgaW4gdGhlIHByZXZpb3VzIHBhZ2Ugc28gY2xvc2UgaXQu CisgICAgaWYgKCFkaWRTdXNwZW5kUHJldmlvdXNQYWdlKQorICAgICAgICBtX3Byb2Nlc3MtPnNl bmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNsb3NlKCksIHBhZ2VJRCgpKTsKKworICAgIHN3YXBUb1dl YlByb2Nlc3MobV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3MoKSwgbV9wcm92aXNpb25hbFBhZ2Ut PnRha2VEcmF3aW5nQXJlYSgpLCBtX3Byb3Zpc2lvbmFsUGFnZS0+bWFpbkZyYW1lKCkpOworCisg ICAgZGlkQ29tbWl0TG9hZEZvckZyYW1lKGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgbWltZVR5cGUs IGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCBmcmFtZUxvYWRUeXBlLCBjZXJ0aWZpY2F0 ZUluZm8sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwg dXNlckRhdGEpOworCisgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBudWxscHRyOworfQorCit2b2lk IFdlYlBhZ2VQcm94eTo6Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKEFQSTo6TmF2aWdh dGlvbiYgbmF2aWdhdGlvbiwgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiBz dXNwZW5kZWRQYWdlUHJveHksIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgbmV3UHJvY2VzcywgUHJv Y2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBP cHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJjb250aW51ZU5hdmlnYXRpb25Jbk5ld1By b2Nlc3M6IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vz c0lkZW50aWZpZXIoKSwgbV9wYWdlSUQpOworICAgIExPRyhMb2FkaW5nLCAiQ29udGludWluZyBu YXZpZ2F0aW9uICUiIFBSSXU2NCAiICclcycgaW4gYSBuZXcgd2ViIHByb2Nlc3MiLCBuYXZpZ2F0 aW9uLm5hdmlnYXRpb25JRCgpLCBuYXZpZ2F0aW9uLmxvZ2dpbmdTdHJpbmcoKSk7CisKKyAgICBp ZiAobV9wcm92aXNpb25hbFBhZ2UpIHsKKyAgICAgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlLT5u YXZpZ2F0aW9uSUQoKSAhPSBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpKQorICAgICAgICAgICAg bV9wcm92aXNpb25hbFBhZ2UtPmNhbmNlbCgpOworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9 IG51bGxwdHI7CisgICAgfQorCisgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBzdGQ6Om1ha2VfdW5p cXVlPFByb3Zpc2lvbmFsUGFnZVByb3h5PigqdGhpcywgbmV3UHJvY2Vzcy5jb3B5UmVmKCksIFdU Rk1vdmUoc3VzcGVuZGVkUGFnZVByb3h5KSwgbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2 aWdhdGlvbi5jdXJyZW50UmVxdWVzdElzUmVkaXJlY3QoKSwgbmF2aWdhdGlvbi5jdXJyZW50UmVx dWVzdCgpLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KTsKIAogICAgIGlmIChhdXRvKiBp dGVtID0gbmF2aWdhdGlvbi50YXJnZXRJdGVtKCkpIHsKICAgICAgICAgTE9HKExvYWRpbmcsICJX ZWJQYWdlUHJveHkgJXAgY29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzIHRvIGJhY2sgaXRl bSBVUkwgJXMiLCB0aGlzLCBpdGVtLT51cmwoKS51dGY4KCkuZGF0YSgpKTsKQEAgLTI3NjksNjcg KzI3OTgsMjIgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJv Y2VzcyhBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIHMKICAgICAgICAgYXV0byB0cmFuc2Fj dGlvbiA9IG1fcGFnZUxvYWRTdGF0ZS50cmFuc2FjdGlvbigpOwogICAgICAgICBtX3BhZ2VMb2Fk U3RhdGUuc2V0UGVuZGluZ0FQSVJlcXVlc3RVUkwodHJhbnNhY3Rpb24sIGl0ZW0tPnVybCgpKTsK IAotICAgICAgICBhdXRvIGl0ZW1TdGF0ZXMgPSBtX2JhY2tGb3J3YXJkTGlzdC0+ZmlsdGVyZWRJ dGVtU3RhdGVzKFt0aGlzLCB0YXJnZXRJdGVtID0gaXRlbV0oV2ViQmFja0ZvcndhcmRMaXN0SXRl bSYgaXRlbSkgewotICAgICAgICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBpdGVtLnN1c3BlbmRlZFBh Z2UoKSkgewotICAgICAgICAgICAgICAgIGlmICgmcGFnZS0+cHJvY2VzcygpID09IG1fcHJvY2Vz cy5wdHIoKSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAg fQotICAgICAgICAgICAgcmV0dXJuICZpdGVtICE9IHRhcmdldEl0ZW07Ci0gICAgICAgIH0pOwot ICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlVwZGF0ZUJhY2tGb3J3 YXJkTGlzdEZvclJlYXR0YWNoKFdURk1vdmUoaXRlbVN0YXRlcykpLCBtX3BhZ2VJRCk7Ci0gICAg ICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRl bShuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBpdGVtLT5pdGVtSUQoKSwgKm5hdmlnYXRpb24u YmFja0ZvcndhcmRGcmFtZUxvYWRUeXBlKCksIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6 WWVzLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpLCBtX3BhZ2VJRCk7Ci0gICAgICAgIG1fcHJv Y2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7Ci0KKyAgICAgICAgbV9wcm92aXNp b25hbFBhZ2UtPmdvVG9CYWNrRm9yd2FyZEl0ZW0obmF2aWdhdGlvbiwgKml0ZW0sIFdURk1vdmUo d2Vic2l0ZVBvbGljaWVzKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBpZiAobV9i YWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkgJiYgKG5hdmlnYXRpb24ubG9ja0JhY2tGb3J3 YXJkTGlzdCgpID09IExvY2tCYWNrRm9yd2FyZExpc3Q6OlllcyB8fCBuYXZpZ2F0aW9uLmxvY2tI aXN0b3J5KCkgPT0gTG9ja0hpc3Rvcnk6OlllcykpIHsKICAgICAgICAgLy8gSWYgV2ViQ29yZSBp cyBzdXBwb3NlZCB0byBsb2NrIHRoZSBoaXN0b3J5IGZvciB0aGlzIGxvYWQsIHRoZW4gdGhlIG5l dyBwcm9jZXNzIG5lZWRzIHRvIGtub3cgYWJvdXQgdGhlIGN1cnJlbnQgaGlzdG9yeSBpdGVtIHNv IGl0IGNhbiB1cGRhdGUKICAgICAgICAgLy8gaXQgaW5zdGVhZCBvZiBjcmVhdGluZyBhIG5ldyBv bmUuCi0gICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0Q3VycmVu dEhpc3RvcnlJdGVtRm9yUmVhdHRhY2gobV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkt Pml0ZW1TdGF0ZSgpKSwgbV9wYWdlSUQpOworICAgICAgICBuZXdQcm9jZXNzLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlOjpTZXRDdXJyZW50SGlzdG9yeUl0ZW1Gb3JSZWF0dGFjaChtX2JhY2tGb3J3 YXJkTGlzdC0+Y3VycmVudEl0ZW0oKS0+aXRlbVN0YXRlKCkpLCBtX3BhZ2VJRCk7CiAgICAgfQog CiAgICAgLy8gRklYTUU6IFdvcmsgb3V0IHRpbWluZyBvZiByZXNwb25kaW5nIHdpdGggdGhlIGxh c3QgcG9saWN5IGRlbGVnYXRlLCBldGMKICAgICBBU1NFUlQoIW5hdmlnYXRpb24uY3VycmVudFJl cXVlc3QoKS5pc0VtcHR5KCkpOwogICAgIGlmIChhdXRvJiBzdWJzdGl0dXRlRGF0YSA9IG5hdmln YXRpb24uc3Vic3RpdHV0ZURhdGEoKSkKLSAgICAgICAgbG9hZERhdGFXaXRoTmF2aWdhdGlvbihu YXZpZ2F0aW9uLCB7IHN1YnN0aXR1dGVEYXRhLT5jb250ZW50LmRhdGEoKSwgc3Vic3RpdHV0ZURh dGEtPmNvbnRlbnQuc2l6ZSgpIH0sIHN1YnN0aXR1dGVEYXRhLT5NSU1FVHlwZSwgc3Vic3RpdHV0 ZURhdGEtPmVuY29kaW5nLCBzdWJzdGl0dXRlRGF0YS0+YmFzZVVSTCwgc3Vic3RpdHV0ZURhdGEt PnVzZXJEYXRhLmdldCgpLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92 ZSh3ZWJzaXRlUG9saWNpZXMpKTsKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UtPmxvYWREYXRh V2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgeyBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5kYXRh KCksIHN1YnN0aXR1dGVEYXRhLT5jb250ZW50LnNpemUoKSB9LCBzdWJzdGl0dXRlRGF0YS0+TUlN RVR5cGUsIHN1YnN0aXR1dGVEYXRhLT5lbmNvZGluZywgc3Vic3RpdHV0ZURhdGEtPmJhc2VVUkws IHN1YnN0aXR1dGVEYXRhLT51c2VyRGF0YS5nZXQoKSwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMp KTsKICAgICBlbHNlCi0gICAgICAgIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24obmF2aWdhdGlv biwgUmVzb3VyY2VSZXF1ZXN0IHsgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpIH0sIFdlYkNv cmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZEFsbG93RXh0ZXJuYWxTY2hl bWVzLCBudWxscHRyLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3 ZWJzaXRlUG9saWNpZXMpKTsKLQotICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOwotICAgIG1fbWFp bkZyYW1lQ3JlYXRpb25IYW5kbGVyID0gW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRo aXMpLCBuYXZpZ2F0aW9uSUQgPSBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCByZXF1ZXN0ID0g IG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKSwgbWFpbkZyYW1lVVJMLCBpc1NlcnZlclJlZGly ZWN0ID0gbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdElzUmVkaXJlY3QoKV0oKSBtdXRhYmxlIHsK LSAgICAgICAgaWYgKCF3ZWFrVGhpcykKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBB U1NFUlQobV9tYWluRnJhbWUpOwotICAgICAgICAvLyBUaGlzIG5hdmlnYXRpb24gd2FzIGRlc3Ry b3llZCBzbyBubyBuZWVkIHRvIG5vdGlmeSBvZiByZWRpcmVjdC4KLSAgICAgICAgaWYgKCFuYXZp Z2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCkpCi0gICAgICAgICAgICByZXR1 cm47Ci0KLSAgICAgICAgLy8gUmVzdG9yZSB0aGUgbWFpbiBmcmFtZSdzIGNvbW1pdHRlZCBVUkwg YXMgc29tZSBjbGllbnRzIG1heSByZWx5IG9uIGl0IHVudGlsIHRoZSBuZXh0IGxvYWQgaXMgY29t bWl0dGVkLgotICAgICAgICBtX21haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5zZXRVUkwobWFp bkZyYW1lVVJMKTsKLQotICAgICAgICAvLyBOb3JtYWxseSwgbm90aWZpY2F0aW9uIG9mIGEgc2Vy dmVyIHJlZGlyZWN0IGNvbWVzIGZyb20gdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KLSAgICAgICAg Ly8gSWYgd2UgYXJlIHByb2Nlc3Mgc3dhcHBpbmcgaW4gcmVzcG9uc2UgdG8gYSBzZXJ2ZXIgcmVk aXJlY3QgdGhlbiB0aGF0IG5vdGlmaWNhdGlvbiB3aWxsIG5vdCBjb21lIGZyb20gdGhlIG5ldyBX ZWJDb250ZW50IHByb2Nlc3MuCi0gICAgICAgIC8vIEluIHRoaXMgY2FzZSB3ZSBoYXZlIHRoZSBV SVByb2Nlc3Mgc3ludGhlc2l6ZSB0aGUgcmVkaXJlY3Qgbm90aWZpY2F0aW9uIGF0IHRoZSBhcHBy b3ByaWF0ZSB0aW1lLgotICAgICAgICBpZiAoaXNTZXJ2ZXJSZWRpcmVjdCkgewotICAgICAgICAg ICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkuZGlkU3RhcnRQcm92aXNpb25hbExvYWQo cmVxdWVzdC51cmwoKSk7Ci0gICAgICAgICAgICBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQ cm92aXNpb25hbExvYWRGb3JGcmFtZShtX21haW5GcmFtZS0+ZnJhbWVJRCgpLCBuYXZpZ2F0aW9u SUQsIFdURk1vdmUocmVxdWVzdCksIHsgfSk7Ci0gICAgICAgIH0KLSAgICB9OwotCi0gICAgaWYg KCFtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkuY29uZmlndXJhdGlvbigpLnByb2Nlc3NTd2Fwc09u V2luZG93T3BlbldpdGhPcGVuZXIoKSB8fCAhaXNQYWdlT3BlbmVkQnlET01TaG93aW5nSW5pdGlh bEVtcHR5RG9jdW1lbnQoKSB8fCAhbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcykgewotICAg ICAgICAvLyBUaGVyZSBpcyBubyB3YXkgd2UnbGwgYmUgYWJsZSB0byByZXR1cm4gdG8gdGhlIHBh Z2UgaW4gdGhlIHByZXZpb3VzIHBhZ2Ugc28gY2xvc2UgaXQuCi0gICAgICAgIGlmICghZGlkU3Vz cGVuZFByZXZpb3VzUGFnZSkKLSAgICAgICAgICAgIHByZXZpb3VzUHJvY2Vzcy0+c2VuZChNZXNz YWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9wYWdlSUQpOwotICAgICAgICByZXR1cm47Ci0gICAg fQotCi0gICAgbV9tYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIgPSBbdGhpcywgcHJldmlv dXNQcm9jZXNzID0gV1RGTW92ZShwcmV2aW91c1Byb2Nlc3MpLCBtYWluRnJhbWVJREluUHJldmlv dXNQcm9jZXNzID0gKm1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3NdKGNvbnN0IEdsb2JhbFdp bmRvd0lkZW50aWZpZXImIHdpbmRvd0lkZW50aWZpZXIpIHsKLSAgICAgICAgQVNTRVJUKG1fbWFp bkZyYW1lKTsKLSAgICAgICAgR2xvYmFsRnJhbWVJZGVudGlmaWVyIG5hdmlnYXRlZEZyYW1lSWRl bnRpZmllckluTmV3UHJvY2VzcyB7IHBhZ2VJRCgpLCBtX21haW5GcmFtZS0+ZnJhbWVJRCgpIH07 Ci0gICAgICAgIHByZXZpb3VzUHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RnJhbWVC ZWNhbWVSZW1vdGUobWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcywgbmF2aWdhdGVkRnJhbWVJ ZGVudGlmaWVySW5OZXdQcm9jZXNzLCB3aW5kb3dJZGVudGlmaWVyKSwgcGFnZUlEKCkpOwotICAg IH07CisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5sb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9u KG5hdmlnYXRpb24sIFJlc291cmNlUmVxdWVzdCB7IG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3Qo KSB9LCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGRBbGxvd0V4 dGVybmFsU2NoZW1lcywgbnVsbHB0ciwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKIH0KIAog Ym9vbCBXZWJQYWdlUHJveHk6OmlzUGFnZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURv Y3VtZW50KCkgY29uc3QKQEAgLTM2OTQsMTEgKzM2NzgsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 ZGlkQ3JlYXRlTWFpbkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCiAKICAgICAvLyBBZGQgdGhlIGZy YW1lIHRvIHRoZSBwcm9jZXNzIHdpZGUgbWFwLgogICAgIG1fcHJvY2Vzcy0+ZnJhbWVDcmVhdGVk KGZyYW1lSUQsICptX21haW5GcmFtZSk7Ci0KLSAgICBpZiAobV9tYWluRnJhbWVDcmVhdGlvbkhh bmRsZXIpIHsKLSAgICAgICAgbV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIoKTsKLSAgICAgICAg bV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIgPSBudWxscHRyOwotICAgIH0KIH0KIAogdm9pZCBX ZWJQYWdlUHJveHk6OmRpZENyZWF0ZVN1YmZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCkBAIC0zNzIz LDEwICszNzAyLDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVN1YmZyYW1lKHVpbnQ2 NF90IGZyYW1lSUQpCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVXaW5kb3codWludDY0 X3QgZnJhbWVJRCwgR2xvYmFsV2luZG93SWRlbnRpZmllciYmIHdpbmRvd0lkZW50aWZpZXIpCiB7 Ci0gICAgaWYgKG1fbWFpbkZyYW1lICYmIG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkgPT0gZnJhbWVJ RCkgewotICAgICAgICBpZiAoYXV0byBtYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIgPSBX VEZNb3ZlKG1fbWFpbkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyKSkKLSAgICAgICAgICAgIG1h aW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlcih3aW5kb3dJZGVudGlmaWVyKTsKLSAgICB9CiB9 CiAKIGRvdWJsZSBXZWJQYWdlUHJveHk6OmVzdGltYXRlZFByb2dyZXNzKCkgY29uc3QKQEAgLTM3 NzksNiArMzc1NCwxMCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRGVzdHJveU5hdmlnYXRpb24o dWludDY0X3QgbmF2aWdhdGlvbklEKQogewogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVj dG9yKHBhZ2VDbGllbnQoKSk7CiAKKyAgICAvLyBPbiBwcm9jZXNzLXN3YXAsIHRoZSBwcmV2aW91 cyBwcm9jZXNzIHRyaWVzIHRvIGRlc3Ryb3kgdGhlIG5hdmlnYXRpb24gYnV0IHRoZSBwcm92aXNp b25hbCBwcm9jZXNzIGlzIGFjdHVhbGx5IHRha2luZyBvdmVyIHRoZSBuYXZpZ2F0aW9uLgorICAg IGlmIChtX3Byb3Zpc2lvbmFsUGFnZSAmJiBtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklE KCkgPT0gbmF2aWdhdGlvbklEKQorICAgICAgICByZXR1cm47CisKICAgICAvLyBGSVhNRTogTWVz c2FnZSBjaGVjayB0aGUgbmF2aWdhdGlvbklELgogICAgIG1fbmF2aWdhdGlvblN0YXRlLT5kaWRE ZXN0cm95TmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpOwogfQpAQCAtMzc5NiwxNCArMzc3NSw2IEBA IHZvaWQgV2ViUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2 NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hCiAgICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpICYm IG5hdmlnYXRpb25JRCkKICAgICAgICAgbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25TdGF0ZSgpLm5h dmlnYXRpb24obmF2aWdhdGlvbklEKTsKIAotICAgIC8vIElmIHRoaXMgc2VlbWluZ2x5IG5ldyBs b2FkIGlzIGFjdHVhbGx5IGNvbnRpbnVpbmcgYSBzZXJ2ZXIgcmVkaXJlY3QgZm9yIGEgcHJldmlv dXMgbmF2aWdhdGlvbiBpbiBhIG5ldyBwcm9jZXNzLAotICAgIC8vIHRoZW4gd2UgaWdub3JlIHRo aXMgbm90aWZpY2F0aW9uLgotICAgIGlmIChuYXZpZ2F0aW9uICYmIG5hdmlnYXRpb24tPmN1cnJl bnRSZXF1ZXN0SXNSZWRpcmVjdCgpKSB7Ci0gICAgICAgIGF1dG8gbmF2aWdhdGlvblByb2Nlc3NJ ZGVudGlmaWVyID0gbmF2aWdhdGlvbi0+Y3VycmVudFJlcXVlc3RQcm9jZXNzSWRlbnRpZmllcigp OwotICAgICAgICBpZiAobmF2aWdhdGlvblByb2Nlc3NJZGVudGlmaWVyICYmICpuYXZpZ2F0aW9u UHJvY2Vzc0lkZW50aWZpZXIgIT0gbV9wcm9jZXNzLT5jb3JlUHJvY2Vzc0lkZW50aWZpZXIoKSkK LSAgICAgICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBMT0coTG9hZGluZywgIldlYlBhZ2VQ cm94eSAlIiBQUkl1NjQgIiBpbiBwcm9jZXNzIHBpZCAlaSBkaWRTdGFydFByb3Zpc2lvbmFsTG9h ZEZvckZyYW1lIHRvIGZyYW1lSUQgJSIgUFJJdTY0ICIsIG5hdmlnYXRpb25JRCAlIiBQUkl1NjQg IiwgdXJsICVzIiwgbV9wYWdlSUQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgZnJh bWVJRCwgbmF2aWdhdGlvbklELCB1cmwuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgUkVM RUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JG cmFtZTogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJ dTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlELCBmcmFtZUlEKTsK IApAQCAtMzkxMSw2ICszODgyLDExIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlz aW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2VjdXJpCiAKICAgICBQ YWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCisgICAgaWYgKG1f cHJvdmlzaW9uYWxQYWdlICYmIG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSA9PSBu YXZpZ2F0aW9uSUQgJiYgJm1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCkgIT0gbV9wcm9jZXNz LnB0cigpKSB7CisgICAgICAgIC8vIFRoZSBsb2FkIGRpZCBub3QgZmFpbCwgaXQgbWVyZWx5IGhh cHBlbmluZyBpbiBhIG5ldyBwcm92aXNpb25hbCBwcm9jZXNzLgorICAgICAgICByZXR1cm47Cisg ICAgfQorCiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZy YW1lSUQpOwogICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOwogCkBAIC0zOTQ5LDYgKzM5MjUsMTAg QEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50 NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cmkKICAgICB9CiAKICAgICBtX2ZhaWxpbmdQcm92aXNp b25hbExvYWRVUkwgPSB7IH07CisKKyAgICAvLyBJZiB0aGUgcHJvdmlzaW9uYWwgcGFnZSdzIGxv YWQgZmFpbHMgdGhlbiB3ZSBkZXN0cm95IHRoZSBwcm92aXNpb25hbCBwYWdlLgorICAgIGlmICht X3Byb3Zpc2lvbmFsUGFnZSAmJiBtX3Byb3Zpc2lvbmFsUGFnZS0+bWFpbkZyYW1lKCkgPT0gZnJh bWUpCisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlID0gbnVsbHB0cjsKIH0KIAogdm9pZCBXZWJQ YWdlUHJveHk6OmNsZWFyTG9hZERlcGVuZGVudENhbGxiYWNrcygpCkBAIC00MzQwLDggKzQzMjAs OCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFz eW5jKHVpbnQ2NF90IGZyYW1lSUQsIFdlYkNvcgogICAgIGF1dG8qIGZyYW1lID0gbV9wcm9jZXNz LT53ZWJGcmFtZShmcmFtZUlEKTsKICAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKIAotICAgIGRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oKmZyYW1lLCBXVEZNb3ZlKGZyYW1lU2VjdXJp dHlPcmlnaW4pLCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUobmF2aWdhdGlvbkFjdGlvbkRhdGEpLCBX VEZNb3ZlKGZyYW1lSW5mb0RhdGEpLCBvcmlnaW5hdGluZ1BhZ2VJRCwgb3JpZ2luYWxSZXF1ZXN0 LCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKHJlcXVlc3RCb2R5KSwgV1RGTW92ZShyZWRpcmVj dFJlc3BvbnNlKSwgdXNlckRhdGEsIFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMs IHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRF0gKGF1 dG8uLi4gYXJncykgewotICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6 OkRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwg bV9wYWdlSUQpOworICAgIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oKmZyYW1lLCBX VEZNb3ZlKGZyYW1lU2VjdXJpdHlPcmlnaW4pLCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUobmF2aWdh dGlvbkFjdGlvbkRhdGEpLCBXVEZNb3ZlKGZyYW1lSW5mb0RhdGEpLCBvcmlnaW5hdGluZ1BhZ2VJ RCwgb3JpZ2luYWxSZXF1ZXN0LCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKHJlcXVlc3RCb2R5 KSwgV1RGTW92ZShyZWRpcmVjdFJlc3BvbnNlKSwgdXNlckRhdGEsIFBvbGljeURlY2lzaW9uU2Vu ZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZnJhbWVJ RCwgbGlzdGVuZXJJRCwgcHJvY2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCldIChhdXRvLi4uIGFy Z3MpIHsKKyAgICAgICAgcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkUmVjZWl2 ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4pLCBtX3BhZ2VJRCk7 CiAgICAgfSkpOwogfQogCkBAIC00NTc1LDEyICs0NTU1LDEyIEBAIHZvaWQgV2ViUGFnZVByb3h5 OjpkZWNpZGVQb2xpY3lGb3JSZXNwb25zZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cml0 eU9yaWdpCiAgICAgTUVTU0FHRV9DSEVDS19VUkwocmVzcG9uc2UudXJsKCkpOwogCiAgICAgUmVm UHRyPEFQSTo6TmF2aWdhdGlvbj4gbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25JRCA/IG1fbmF2aWdh dGlvblN0YXRlLT5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCkgOiBudWxscHRyOwotICAgIGF1dG8g bGlzdGVuZXIgPSBtYWtlUmVmKGZyYW1lLT5zZXRVcFBvbGljeUxpc3RlbmVyUHJveHkoW3RoaXMs IHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRCwgbmF2 aWdhdGlvbiA9IFdURk1vdmUobmF2aWdhdGlvbildIChXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0 aW9uLCBBUEk6OldlYnNpdGVQb2xpY2llcyosIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQg cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgUmVmUHRyPFNhZmVCcm93c2luZ1dhcm5pbmc+ JiYgc2FmZUJyb3dzaW5nV2FybmluZykgbXV0YWJsZSB7CisgICAgYXV0byBsaXN0ZW5lciA9IG1h a2VSZWYoZnJhbWUtPnNldFVwUG9saWN5TGlzdGVuZXJQcm94eShbdGhpcywgcHJvdGVjdGVkVGhp cyA9IG1ha2VSZWYoKnRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklELCBuYXZpZ2F0aW9uID0gV1RG TW92ZShuYXZpZ2F0aW9uKSwgcHJvY2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCldIChXZWJQb2xp Y3lBY3Rpb24gcG9saWN5QWN0aW9uLCBBUEk6OldlYnNpdGVQb2xpY2llcyosIFByb2Nlc3NTd2Fw UmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgUmVmUHRyPFNh ZmVCcm93c2luZ1dhcm5pbmc+JiYgc2FmZUJyb3dzaW5nV2FybmluZykgbXV0YWJsZSB7CiAgICAg ICAgIC8vIEZJWE1FOiBBc3NlcnQgdGhlIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiBpcyBudWxscHRy IGhlcmUgb25jZSBjbGllbnRzIG9mIFdLRnJhbWVQb2xpY3lMaXN0ZW5lclVzZVdpdGhQb2xpY2ll cyBnbyBhd2F5LgogICAgICAgICBSRUxFQVNFX0FTU0VSVChwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5 Q2xpZW50ID09IFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQ6Ok5vKTsKICAgICAgICAgQVNT RVJUX1VOVVNFRChzYWZlQnJvd3NpbmdXYXJuaW5nLCAhc2FmZUJyb3dzaW5nV2FybmluZyk7Ci0g ICAgICAgIHJlY2VpdmVkUG9saWN5RGVjaXNpb24ocG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uLmdl dCgpLCBXVEY6Om51bGxvcHQsIFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMsIHBy b3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklE XSAoYXV0by4uLiBhcmdzKSB7Ci0gICAgICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6 OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBh cmdzLi4uKSwgbV9wYWdlSUQpOworICAgICAgICByZWNlaXZlZFBvbGljeURlY2lzaW9uKHBvbGlj eUFjdGlvbiwgbmF2aWdhdGlvbi5nZXQoKSwgV1RGOjpudWxsb3B0LCBQb2xpY3lEZWNpc2lvblNl bmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlz KSwgZnJhbWVJRCwgbGlzdGVuZXJJRCwgcHJvY2VzcyA9IFdURk1vdmUocHJvY2VzcyldIChhdXRv Li4uIGFyZ3MpIHsKKyAgICAgICAgICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6 OkRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwg bV9wYWdlSUQpOwogICAgICAgICB9KSk7CiAgICAgfSwgU2hvdWxkRXhwZWN0U2FmZUJyb3dzaW5n UmVzdWx0OjpObykpOwogCkBAIC02NDAwLDYgKzYzODAsMTMgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OnByb2Nlc3NEaWRUZXJtaW5hdGUoUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uIHJlYXNvbikKICAg ICBzdG9wQWxsVVJMU2NoZW1lVGFza3MoKTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OnByb3Zp c2lvbmFsUHJvY2Vzc0RpZFRlcm1pbmF0ZSgpCit7CisgICAgQVNTRVJUKG1fcHJvdmlzaW9uYWxQ YWdlKTsKKyAgICBtX3Byb3Zpc2lvbmFsUGFnZS0+Y2FuY2VsKCk7CisgICAgbV9wcm92aXNpb25h bFBhZ2UgPSBudWxscHRyOworfQorCiBzdGF0aWMgYm9vbCBzaG91bGRSZWxvYWRBZnRlclByb2Nl c3NUZXJtaW5hdGlvbihQcm9jZXNzVGVybWluYXRpb25SZWFzb24gcmVhc29uKQogewogICAgIHN3 aXRjaCAocmVhc29uKSB7CkBAIC02NDg3LDggKzY0NzQsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 cHJvY2Vzc1dpbGxCZWNvbWVGb3JlZ3JvdW5kKCkKIHZvaWQgV2ViUGFnZVByb3h5OjpyZXNldFN0 YXRlKFJlc2V0U3RhdGVSZWFzb24gcmVzZXRTdGF0ZVJlYXNvbikKIHsKICAgICBtX21haW5GcmFt ZSA9IG51bGxwdHI7Ci0gICAgbV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIgPSBudWxscHRyOwot ICAgIG1fbWFpbkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyID0gbnVsbHB0cjsKIAogI2lmIFBM QVRGT1JNKENPQ09BKQogICAgIG1fc2Nyb2xsaW5nUGVyZm9ybWFuY2VEYXRhID0gbnVsbHB0cjsK QEAgLTY3NzksNiArNjc2NCwxMCBAQCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQ cm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKCkKICAgICBwYXJhbWV0ZXJzLmFwcGxpY2F0aW9uTWFu aWZlc3QgPSBtX2NvbmZpZ3VyYXRpb24tPmFwcGxpY2F0aW9uTWFuaWZlc3QoKSA/IE9wdGlvbmFs PFdlYkNvcmU6OkFwcGxpY2F0aW9uTWFuaWZlc3Q+KG1fY29uZmlndXJhdGlvbi0+YXBwbGljYXRp b25NYW5pZmVzdCgpLT5hcHBsaWNhdGlvbk1hbmlmZXN0KCkpIDogV1RGOjpudWxsb3B0OwogI2Vu ZGlmCiAKKyNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCisgICAgcGFyYW1ldGVycy5oYXNSZWdp c3RlcmVkU2VydmljZVdvcmtlcnMgPSBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS5tYXlIYXZlUmVn aXN0ZXJlZFNlcnZpY2VXb3JrZXJzKG1fd2Vic2l0ZURhdGFTdG9yZSk7CisjZW5kaWYKKwogICAg IHBhcmFtZXRlcnMubmVlZHNGb250QXR0cmlidXRlcyA9IG1fbmVlZHNGb250QXR0cmlidXRlczsK IAogICAgIG1fcHJvY2Vzcy0+YWRkV2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJveHkobV91c2Vy Q29udGVudENvbnRyb2xsZXIsIHBhcmFtZXRlcnMpOwpAQCAtODU0MCw2ICs4NTI5LDIxIEBAIHZv aWQgV2ViUGFnZVByb3h5OjpzaW11bGF0ZURldmljZU9yaWVudGF0aW9uQ2hhbmdlKGRvdWJsZSBh bHBoYSwgZG91YmxlIGJldGEsIGRvCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQ YWdlOjpTaW11bGF0ZURldmljZU9yaWVudGF0aW9uQ2hhbmdlKGFscGhhLCBiZXRhLCBnYW1tYSks IG1fcGFnZUlEKTsKIH0KIAorV2ViUGFnZVByb3h5OjpQYWdlUHJvY2Vzc092ZXJyaWRlOjpQYWdl UHJvY2Vzc092ZXJyaWRlKFdlYlBhZ2VQcm94eSYgcGFnZSwgV2ViUHJvY2Vzc1Byb3h5JiBuZXdQ cm9jZXNzKQorICAgIDogbV9wYWdlKCZwYWdlKQorICAgICwgbV9wcmV2aW91c1Byb2Nlc3MocGFn ZS5wcm9jZXNzKCkpCit7CisgICAgcGFnZS5tX3Byb2Nlc3MgPSBuZXdQcm9jZXNzOworfQorCitX ZWJQYWdlUHJveHk6OlBhZ2VQcm9jZXNzT3ZlcnJpZGU6OlBhZ2VQcm9jZXNzT3ZlcnJpZGUoUGFn ZVByb2Nlc3NPdmVycmlkZSYmKSA9IGRlZmF1bHQ7CisKK1dlYlBhZ2VQcm94eTo6UGFnZVByb2Nl c3NPdmVycmlkZTo6flBhZ2VQcm9jZXNzT3ZlcnJpZGUoKQoreworICAgIGlmIChtX3BhZ2UpCisg ICAgICAgIG1fcGFnZS0+bV9wcm9jZXNzID0gV1RGTW92ZShtX3ByZXZpb3VzUHJvY2Vzcyk7Cit9 CisKICNpZiBFTkFCTEUoREFUQV9ERVRFQ1RJT04pCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkZXRl Y3REYXRhSW5BbGxGcmFtZXMoV2ViQ29yZTo6RGF0YURldGVjdG9yVHlwZXMgdHlwZXMsIENvbXBs ZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgRGF0YURldGVjdGlvblJlc3VsdCYpPiYmIGNvbXBsZXRp b25IYW5kbGVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBkZTk4 Njk0YWEzN2RiM2M3ZjJjZTI3Y2M4MjlhOTIwMDIxMWRlMTBkLi40NTgyZjBhMTdmZTExNzgxNjcz YmViZWM2NWNmZDJiMGU0NWZmODAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaApAQCAtMjI1LDYgKzIyNSw3IEBAIGNsYXNzIE5hdGl2ZVdlYktleWJvYXJkRXZlbnQ7CiBj bGFzcyBOYXRpdmVXZWJNb3VzZUV2ZW50OwogY2xhc3MgTmF0aXZlV2ViV2hlZWxFdmVudDsKIGNs YXNzIFBhZ2VDbGllbnQ7CitjbGFzcyBQcm92aXNpb25hbFBhZ2VQcm94eTsKIGNsYXNzIFJlbW90 ZUxheWVyVHJlZUhvc3Q7CiBjbGFzcyBSZW1vdGVMYXllclRyZWVTY3JvbGxpbmdQZXJmb3JtYW5j ZURhdGE7CiBjbGFzcyBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjsKQEAgLTM1Niw3ICszNTcs NyBAQCBwdWJsaWM6CiAgICAgV2ViRnJhbWVQcm94eSogZm9jdXNlZEZyYW1lKCkgY29uc3QgeyBy ZXR1cm4gbV9mb2N1c2VkRnJhbWUuZ2V0KCk7IH0KICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZVNl dExhcmdlc3RGcmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fZnJhbWVTZXRMYXJnZXN0RnJhbWUuZ2V0 KCk7IH0KIAotICAgIERyYXdpbmdBcmVhUHJveHkqIGRyYXdpbmdBcmVhKCkgY29uc3QgeyByZXR1 cm4gbV9kcmF3aW5nQXJlYS5nZXQoKTsgfQorICAgIERyYXdpbmdBcmVhUHJveHkqIGRyYXdpbmdB cmVhKCkgY29uc3Q7CiAKICAgICBXZWJOYXZpZ2F0aW9uU3RhdGUmIG5hdmlnYXRpb25TdGF0ZSgp IHsgcmV0dXJuICptX25hdmlnYXRpb25TdGF0ZS5nZXQoKTsgfQogCkBAIC0zNzksNiArMzgwLDcg QEAgcHVibGljOgogCiAgICAgYm9vbCBhZGRzVmlzaXRlZExpbmtzKCkgY29uc3QgeyByZXR1cm4g bV9hZGRzVmlzaXRlZExpbmtzOyB9CiAgICAgdm9pZCBzZXRBZGRzVmlzaXRlZExpbmtzKGJvb2wg YWRkc1Zpc2l0ZWRMaW5rcykgeyBtX2FkZHNWaXNpdGVkTGlua3MgPSBhZGRzVmlzaXRlZExpbmtz OyB9CisgICAgVmlzaXRlZExpbmtTdG9yZSYgdmlzaXRlZExpbmtTdG9yZSgpIHsgcmV0dXJuIG1f dmlzaXRlZExpbmtTdG9yZTsgfQogCiAgICAgdm9pZCBleGl0RnVsbHNjcmVlbkltbWVkaWF0ZWx5 KCk7CiAgICAgdm9pZCBmdWxsc2NyZWVuTWF5UmV0dXJuVG9JbmxpbmUoKTsKQEAgLTQ1OCw4ICs0 NjAsOCBAQCBwdWJsaWM6CiAgICAgQVBJOjpJY29uTG9hZGluZ0NsaWVudCYgaWNvbkxvYWRpbmdD bGllbnQoKSB7IHJldHVybiAqbV9pY29uTG9hZGluZ0NsaWVudDsgfQogICAgIHZvaWQgc2V0SWNv bkxvYWRpbmdDbGllbnQoc3RkOjp1bmlxdWVfcHRyPEFQSTo6SWNvbkxvYWRpbmdDbGllbnQ+JiYp OwogCi0gICAgZW51bSBjbGFzcyBJc1N3YXBGcm9tU3VzcGVuZGVkIHsgTm8sIFllcyB9OwotICAg IHZvaWQgaW5pdGlhbGl6ZVdlYlBhZ2UoSXNTd2FwRnJvbVN1c3BlbmRlZCA9IElzU3dhcEZyb21T dXNwZW5kZWQ6Ok5vKTsKKyAgICB2b2lkIGluaXRpYWxpemVXZWJQYWdlKCk7CisgICAgdm9pZCBz ZXREcmF3aW5nQXJlYShzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4mJik7CiAKICAg ICBXZWFrUHRyPFNlY0tleVByb3h5U3RvcmU+IHNlY0tleVByb3h5U3RvcmUoY29uc3QgV2ViQ29y ZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2UmKTsKICAgICAgICAgCkBAIC05OTcsNiArOTk5LDcg QEAgcHVibGljOgogICAgIHZvaWQgcHJvY2Vzc0RpZEJlY29tZVVucmVzcG9uc2l2ZSgpOwogICAg IHZvaWQgcHJvY2Vzc0RpZEJlY29tZVJlc3BvbnNpdmUoKTsKICAgICB2b2lkIHByb2Nlc3NEaWRU ZXJtaW5hdGUoUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uKTsKKyAgICB2b2lkIHByb3Zpc2lvbmFs UHJvY2Vzc0RpZFRlcm1pbmF0ZSgpOwogICAgIHZvaWQgZGlzcGF0Y2hQcm9jZXNzRGlkVGVybWlu YXRlKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbik7CiAgICAgdm9pZCB3aWxsQ2hhbmdlUHJvY2Vz c0lzUmVzcG9uc2l2ZSgpOwogICAgIHZvaWQgZGlkQ2hhbmdlUHJvY2Vzc0lzUmVzcG9uc2l2ZSgp OwpAQCAtMTAyNSw2ICsxMDI4LDE5IEBAIHB1YmxpYzoKICAgICBXZWJQcm9jZXNzUHJveHkmIHBy b2Nlc3MoKSB7IHJldHVybiBtX3Byb2Nlc3M7IH0KICAgICBQcm9jZXNzSUQgcHJvY2Vzc0lkZW50 aWZpZXIoKSBjb25zdDsKIAorICAgIGNsYXNzIFBhZ2VQcm9jZXNzT3ZlcnJpZGUgeworICAgIHB1 YmxpYzoKKyAgICAgICAgUGFnZVByb2Nlc3NPdmVycmlkZShXZWJQYWdlUHJveHkmLCBXZWJQcm9j ZXNzUHJveHkmIG5ld1Byb2Nlc3MpOworICAgICAgICBQYWdlUHJvY2Vzc092ZXJyaWRlKFBhZ2VQ cm9jZXNzT3ZlcnJpZGUmJik7CisgICAgICAgIH5QYWdlUHJvY2Vzc092ZXJyaWRlKCk7CisKKyAg ICBwcml2YXRlOgorICAgICAgICBSZWZQdHI8V2ViUGFnZVByb3h5PiBtX3BhZ2U7CisgICAgICAg IFJlZjxXZWJQcm9jZXNzUHJveHk+IG1fcHJldmlvdXNQcm9jZXNzOworICAgIH07CisKKyAgICBQ YWdlUHJvY2Vzc092ZXJyaWRlIHRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKFdlYlByb2Nlc3NQ cm94eSYgbmV3UHJvY2VzcykgeyByZXR1cm4gUGFnZVByb2Nlc3NPdmVycmlkZSgqdGhpcywgbmV3 UHJvY2Vzcyk7IH0KKwogICAgIFdlYlByZWZlcmVuY2VzJiBwcmVmZXJlbmNlcygpIHsgcmV0dXJu IG1fcHJlZmVyZW5jZXM7IH0KICAgICB2b2lkIHNldFByZWZlcmVuY2VzKFdlYlByZWZlcmVuY2Vz Jik7CiAKQEAgLTE0MTUsNiArMTQzMSwyMSBAQCBwdWJsaWM6CiAgICAgRWRpdGFibGVJbWFnZUNv bnRyb2xsZXImIGVkaXRhYmxlSW1hZ2VDb250cm9sbGVyKCkgeyByZXR1cm4gKm1fZWRpdGFibGVJ bWFnZUNvbnRyb2xsZXI7IH0KICNlbmRpZgogCisgICAgUHJvdmlzaW9uYWxQYWdlUHJveHkqIHBy b3Zpc2lvbmFsUGFnZVByb3h5KCkgY29uc3QgeyByZXR1cm4gbV9wcm92aXNpb25hbFBhZ2UuZ2V0 KCk7IH0KKyAgICB2b2lkIGNvbW1pdFByb3Zpc2lvbmFsUGFnZSh1aW50NjRfdCBmcmFtZUlELCB1 aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVI YXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdl YkNvcmU6OkNlcnRpZmljYXRlSW5mbyYsIGJvb2wgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0 aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRl bnQsIGNvbnN0IFVzZXJEYXRhJik7CisKKyAgICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2Fk Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiwg VVJMJiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRGYWls UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6 U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0 aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNvcmU6OlJlc291 cmNlRXJyb3ImLCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJl ZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0 X3QgbmF2aWdhdGlvbklELCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgY29uc3QgVXNlckRh dGEmKTsKKworICAgIHZvaWQgbG9hZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24m LCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25z dCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1 c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxX ZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKKyAgICB2b2lkIGxvYWRSZXF1 ZXN0V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0JiYsIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0 KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25h bDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKKworICAgIC8vIElQQzo6 TWVzc2FnZVJlY2VpdmVyCisgICAgLy8gSW1wbGVtZW50ZWQgaW4gZ2VuZXJhdGVkIFdlYlBhZ2VQ cm94eU1lc3NhZ2VSZWNlaXZlci5jcHAKKyAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6 Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIG92ZXJyaWRlOworICAgIHZvaWQgZGlkUmVjZWl2 ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYsIHN0ZDo6dW5pcXVl X3B0cjxJUEM6OkVuY29kZXI+Jikgb3ZlcnJpZGU7CisKIHByaXZhdGU6CiAgICAgV2ViUGFnZVBy b3h5KFBhZ2VDbGllbnQmLCBXZWJQcm9jZXNzUHJveHkmLCB1aW50NjRfdCBwYWdlSUQsIFJlZjxB UEk6OlBhZ2VDb25maWd1cmF0aW9uPiYmKTsKICAgICB2b2lkIHBsYXRmb3JtSW5pdGlhbGl6ZSgp OwpAQCAtMTQzOSwxMiArMTQ3MCw2IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHNldFVzZXJBZ2Vu dChTdHJpbmcmJik7CiAKLSAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgotICAgIC8vIEltcGxl bWVudGVkIGluIGdlbmVyYXRlZCBXZWJQYWdlUHJveHlNZXNzYWdlUmVjZWl2ZXIuY3BwCi0gICAg dm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImKSBv dmVycmlkZTsKLSAgICB2b2lkIGRpZFJlY2VpdmVTeW5jTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24m LCBJUEM6OkRlY29kZXImLCBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVyPiYpIG92ZXJyaWRl OwotCi0KICAgICAvLyBJUEM6Ok1lc3NhZ2VTZW5kZXIKICAgICBib29sIHNlbmRNZXNzYWdlKHN0 ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+LCBPcHRpb25TZXQ8SVBDOjpTZW5kT3B0aW9uPikg b3ZlcnJpZGU7CiAgICAgSVBDOjpDb25uZWN0aW9uKiBtZXNzYWdlU2VuZGVyQ29ubmVjdGlvbigp IG92ZXJyaWRlOwpAQCAtMTQ2NiwxMiArMTQ5MSw5IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaWRD cmVhdGVTdWJmcmFtZSh1aW50NjRfdCBmcmFtZUlEKTsKICAgICB2b2lkIGRpZENyZWF0ZVdpbmRv dyh1aW50NjRfdCBmcmFtZUlELCBXZWJDb3JlOjpHbG9iYWxXaW5kb3dJZGVudGlmaWVyJiYpOwog Ci0gICAgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1l SUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYsIFVSTCYmIHVucmVhY2hhYmxlVVJMLCBj b25zdCBVc2VyRGF0YSYpOwotICAgIHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlv bklELCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2 b2lkIHdpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBj b25zdCBTdHJpbmcmIHVybCwgZG91YmxlIGRlbGF5LCBXZWJDb3JlOjpMb2NrQmFja0ZvcndhcmRM aXN0KTsKICAgICB2b2lkIGRpZENhbmNlbENsaWVudFJlZGlyZWN0Rm9yRnJhbWUodWludDY0X3Qg ZnJhbWVJRCk7CiAgICAgdm9pZCBkaWRDaGFuZ2VQcm92aXNpb25hbFVSTEZvckZyYW1lKHVpbnQ2 NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYpOwotICAgIHZvaWQgZGlk RmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNv cmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2 aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJMLCBjb25zdCBXZWJDb3JlOjpS ZXNvdXJjZUVycm9yJiwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2b2lkIGRpZENvbW1pdExvYWRG b3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0 cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQz Ml90IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYsIGJvb2wg Y29udGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250 ZW50PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIGNvbnN0IFVzZXJEYXRhJik7CiAgICAgdm9p ZCBkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRf dCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCBkaWRGaW5pc2hMb2Fk Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBV c2VyRGF0YSYpOwpAQCAtMTU3NSwxOCArMTU5NywxNiBAQCBwcml2YXRlOgogICAgIHZvaWQgc2V0 Q2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRzKGJvb2wgY2FuU2hvcnRDaXJjdWl0 SG9yaXpvbnRhbFdoZWVsRXZlbnRzKSB7IG1fY2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVs RXZlbnRzID0gY2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRzOyB9CiAKICAgICB2 b2lkIHJlYXR0YWNoVG9XZWJQcm9jZXNzKCk7Ci0gICAgdm9pZCBzd2FwVG9XZWJQcm9jZXNzKFJl ZjxXZWJQcm9jZXNzUHJveHk+JiYsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+ JiYsIElzU3dhcEZyb21TdXNwZW5kZWQpOworICAgIHZvaWQgc3dhcFRvV2ViUHJvY2VzcyhSZWY8 V2ViUHJvY2Vzc1Byb3h5PiYmLCBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4mJiwg UmVmUHRyPFdlYkZyYW1lUHJveHk+JiYgbWFpbkZyYW1lKTsKICAgICB2b2lkIGRpZEZhaWxUb1N1 c3BlbmRBZnRlclByb2Nlc3NTd2FwKCk7CiAgICAgdm9pZCBkaWRTdXNwZW5kQWZ0ZXJQcm9jZXNz U3dhcCgpOwogCi0gICAgdm9pZCBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoSXNTd2FwRnJv bVN1c3BlbmRlZCA9IElzU3dhcEZyb21TdXNwZW5kZWQ6Ok5vKTsKKyAgICBlbnVtIGNsYXNzIFNo b3VsZEluaXRpYWxpemVXZWJQYWdlIHsgTm8sIFllcyB9OworICAgIHZvaWQgZmluaXNoQXR0YWNo aW5nVG9XZWJQcm9jZXNzKFNob3VsZEluaXRpYWxpemVXZWJQYWdlID0gU2hvdWxkSW5pdGlhbGl6 ZVdlYlBhZ2U6Olllcyk7CiAKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiByZWF0dGFjaFRv V2ViUHJvY2Vzc0ZvclJlbG9hZCgpOwogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IHJlYXR0 YWNoVG9XZWJQcm9jZXNzV2l0aEl0ZW0oV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYpOwogCi0gICAg dm9pZCBsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYsIGNvbnN0IElQQzo6 RGF0YVJlZmVyZW5jZSYsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5j b2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBXZWJD b3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2ll c0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOwotICAgIHZvaWQgbG9hZFJlcXVlc3RXaXRoTmF2aWdh dGlvbihBUEk6Ok5hdmlnYXRpb24mLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgV2ViQ29y ZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBX ZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIE9wdGlvbmFsPFdlYnNpdGVQb2xp Y2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOwotCiAgICAgdm9pZCByZXF1ZXN0Tm90aWZpY2F0 aW9uUGVybWlzc2lvbih1aW50NjRfdCBub3RpZmljYXRpb25JRCwgY29uc3QgU3RyaW5nJiBvcmln aW5TdHJpbmcpOwogICAgIHZvaWQgc2hvd05vdGlmaWNhdGlvbihjb25zdCBTdHJpbmcmIHRpdGxl LCBjb25zdCBTdHJpbmcmIGJvZHksIGNvbnN0IFN0cmluZyYgaWNvblVSTCwgY29uc3QgU3RyaW5n JiB0YWcsIGNvbnN0IFN0cmluZyYgbGFuZywgV2ViQ29yZTo6Tm90aWZpY2F0aW9uRGlyZWN0aW9u LCBjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZywgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQpOwog ICAgIHZvaWQgY2FuY2VsTm90aWZpY2F0aW9uKHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsKQEAg LTE5NTIsOCArMTk3Miw2IEBAIHByaXZhdGU6CiAgICAgUmVmPFdlYnNpdGVEYXRhU3RvcmU+IG1f d2Vic2l0ZURhdGFTdG9yZTsKIAogICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5PiBtX21haW5GcmFt ZTsKLSAgICBGdW5jdGlvbjx2b2lkKCk+IG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyOwotICAg IEZ1bmN0aW9uPHZvaWQoY29uc3QgV2ViQ29yZTo6R2xvYmFsV2luZG93SWRlbnRpZmllciYpPiBt X21haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlcjsKIAogICAgIFJlZlB0cjxXZWJGcmFtZVBy b3h5PiBtX2ZvY3VzZWRGcmFtZTsKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9mcmFtZVNl dExhcmdlc3RGcmFtZTsKQEAgLTIzMjQsNiArMjM0Miw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBt X25lZWRzRm9udEF0dHJpYnV0ZXMgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9tYXlIYXZlVW5pdmVy c2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5zaW9uIHsgZmFsc2UgfTsKIAorICAgIHN0ZDo6dW5pcXVl X3B0cjxQcm92aXNpb25hbFBhZ2VQcm94eT4gbV9wcm92aXNpb25hbFBhZ2U7CisKICNpZiBIQVZF KFBFTkNJTEtJVCkKICAgICBzdGQ6OnVuaXF1ZV9wdHI8RWRpdGFibGVJbWFnZUNvbnRyb2xsZXI+ IG1fZWRpdGFibGVJbWFnZUNvbnRyb2xsZXI7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCmluZGV4IGRiMWZkNThiOTNkZmY1ODY1ZDEzZmM1NDFi NmU1ZDg3NDZlYjhlMGEuLjZiZTlkYzM5OWUwMTQ4OGRhNjc4ZmI0NTY4ZWYzNmIyMWYzYzQ4NzYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAtMzQs NiArMzQsNyBAQAogI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJQbHVnaW5JbmZvU3Rv cmUuaCIKICNpbmNsdWRlICJQbHVnaW5Qcm9jZXNzTWFuYWdlci5oIgorI2luY2x1ZGUgIlByb3Zp c2lvbmFsUGFnZVByb3h5LmgiCiAjaW5jbHVkZSAiVGV4dENoZWNrZXIuaCIKICNpbmNsdWRlICJU ZXh0Q2hlY2tlclN0YXRlLmgiCiAjaW5jbHVkZSAiVUlNZXNzYWdlUG9ydENoYW5uZWxQcm92aWRl ci5oIgpAQCAtNTg0LDYgKzU4NSwxNSBAQCBib29sIFdlYlByb2Nlc3NQcm94eTo6ZnVsbEtleWJv YXJkQWNjZXNzRW5hYmxlZCgpCiB9CiAjZW5kaWYKIAorYm9vbCBXZWJQcm9jZXNzUHJveHk6Omhh c1Byb3Zpc2lvbmFsUGFnZVdpdGhJRCh1aW50NjRfdCBwYWdlSUQpIGNvbnN0Cit7CisgICAgZm9y IChhdXRvKiBwcm92aXNpb25hbFBhZ2UgOiBtX3Byb3Zpc2lvbmFsUGFnZXMpIHsKKyAgICAgICAg aWYgKHByb3Zpc2lvbmFsUGFnZS0+cGFnZSgpLnBhZ2VJRCgpID09IHBhZ2VJRCkKKyAgICAgICAg ICAgIHJldHVybiB0cnVlOworICAgIH0KKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIHZvaWQgV2Vi UHJvY2Vzc1Byb3h5Ojp1cGRhdGVCYWNrRm9yd2FyZEl0ZW0oY29uc3QgQmFja0ZvcndhcmRMaXN0 SXRlbVN0YXRlJiBpdGVtU3RhdGUpCiB7CiAgICAgaWYgKGF1dG8qIGl0ZW0gPSBXZWJCYWNrRm9y d2FyZExpc3RJdGVtOjppdGVtRm9ySUQoaXRlbVN0YXRlLmlkZW50aWZpZXIpKSB7CkBAIC01OTEs NyArNjAxLDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OnVwZGF0ZUJhY2tGb3J3YXJkSXRlbShj b25zdCBCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUmIGl0ZW0KICAgICAgICAgLy8gdGhlIGJhY2sv Zm9yd2FyZCBpdGVtcyBwYWdlLgogICAgICAgICAvLyBlLmcuIFRoZSBvbGQgd2ViIHByb2Nlc3Mg aXMgbmF2aWdhdGluZyB0byBhYm91dDpibGFuayBmb3Igc3VzcGVuc2lvbi4KICAgICAgICAgLy8g V2UgaWdub3JlIHRoZXNlIHVwZGF0ZXMuCi0gICAgICAgIGlmIChtX3BhZ2VNYXAuY29udGFpbnMo aXRlbS0+cGFnZUlEKCkpKQorICAgICAgICBpZiAobV9wYWdlTWFwLmNvbnRhaW5zKGl0ZW0tPnBh Z2VJRCgpKSB8fCBoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQoaXRlbS0+cGFnZUlEKCkpKQogICAg ICAgICAgICAgaXRlbS0+c2V0UGFnZVN0YXRlKGl0ZW1TdGF0ZS5wYWdlU3RhdGUpOwogICAgIH0K IH0KQEAgLTY5NCw2ICs3MDQsNyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6cHJvY2Vzc0RpZFRl cm1pbmF0ZU9yRmFpbGVkVG9MYXVuY2goKQogICAgICAgICB3ZWJDb25uZWN0aW9uLT5kaWRDbG9z ZSgpOwogCiAgICAgYXV0byBwYWdlcyA9IGNvcHlUb1ZlY3Rvck9mPFJlZlB0cjxXZWJQYWdlUHJv eHk+PihtX3BhZ2VNYXAudmFsdWVzKCkpOworICAgIGF1dG8gcHJvdmlzaW9uYWxQYWdlcyA9IFdU Rjo6bWFwKG1fcHJvdmlzaW9uYWxQYWdlcywgW10oYXV0byogcHJvdmlzaW9uYWxQYWdlKSB7IHJl dHVybiBtYWtlV2Vha1B0cihwcm92aXNpb25hbFBhZ2UpOyB9KTsKIAogICAgIHNodXREb3duKCk7 CiAKQEAgLTcwOCw2ICs3MTksMTEgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OnByb2Nlc3NEaWRU ZXJtaW5hdGVPckZhaWxlZFRvTGF1bmNoKCkKIAogICAgIGZvciAoYXV0byYgcGFnZSA6IHBhZ2Vz KQogICAgICAgICBwYWdlLT5wcm9jZXNzRGlkVGVybWluYXRlKFByb2Nlc3NUZXJtaW5hdGlvblJl YXNvbjo6Q3Jhc2gpOworCisgICAgZm9yIChhdXRvJiBwcm92aXNpb25hbFBhZ2UgOiBwcm92aXNp b25hbFBhZ2VzKSB7CisgICAgICAgIGlmIChwcm92aXNpb25hbFBhZ2UpCisgICAgICAgICAgICBw cm92aXNpb25hbFBhZ2UtPnByb2Nlc3NEaWRUZXJtaW5hdGUoKTsKKyAgICB9CiB9CiAKIHZvaWQg V2ViUHJvY2Vzc1Byb3h5OjpkaWRSZWNlaXZlSW52YWxpZE1lc3NhZ2UoSVBDOjpDb25uZWN0aW9u JiBjb25uZWN0aW9uLCBJUEM6OlN0cmluZ1JlZmVyZW5jZSBtZXNzYWdlUmVjZWl2ZXJOYW1lLCBJ UEM6OlN0cmluZ1JlZmVyZW5jZSBtZXNzYWdlTmFtZSkKQEAgLTc4MCw2ICs3OTYsMTIgQEAgdm9p ZCBXZWJQcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZyhQcm9jZXNzTGF1bmNoZXIqIGxh dW5jaGVyLCBJUEM6OkNvbm5lY3QKICAgICAgICAgcGFnZS0+cHJvY2Vzc0RpZEZpbmlzaExhdW5j aGluZygpOwogICAgIH0KIAorICAgIGZvciAoYXV0byogcHJvdmlzaW9uYWxQYWdlIDogbV9wcm92 aXNpb25hbFBhZ2VzKSB7CisgICAgICAgIEFTU0VSVCh0aGlzID09ICZwcm92aXNpb25hbFBhZ2Ut PnByb2Nlc3MoKSk7CisgICAgICAgIHByb3Zpc2lvbmFsUGFnZS0+cHJvY2Vzc0RpZEZpbmlzaExh dW5jaGluZygpOworICAgIH0KKworCiAgICAgUkVMRUFTRV9BU1NFUlQoIW1fd2ViQ29ubmVjdGlv bik7CiAgICAgbV93ZWJDb25uZWN0aW9uID0gV2ViQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6Y3Jl YXRlKHRoaXMpOwogCkBAIC04NzMsNyArODk1LDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6Om1h eWJlU2h1dERvd24oKQogCiBib29sIFdlYlByb2Nlc3NQcm94eTo6Y2FuVGVybWluYXRlQ2hpbGRQ cm9jZXNzKCkKIHsKLSAgICBpZiAoIW1fcGFnZU1hcC5pc0VtcHR5KCkgfHwgbV9wcm9jZXNzUG9v bC0+aGFzU3VzcGVuZGVkUGFnZUZvcigqdGhpcykpCisgICAgaWYgKCFtX3BhZ2VNYXAuaXNFbXB0 eSgpIHx8IG1fcHJvY2Vzc1Bvb2wtPmhhc1N1c3BlbmRlZFBhZ2VGb3IoKnRoaXMpIHx8ICFtX3By b3Zpc2lvbmFsUGFnZXMuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBp ZiAoIW1fcHJvY2Vzc1Bvb2wtPnNob3VsZFRlcm1pbmF0ZSh0aGlzKSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKaW5kZXggNzVmNjVhN2Y3ZWIxYWNjODE5OTkxY2U0 ZjlmNjk4NmM5NWI2MWZmMy4uNTA0MjYzMGRlMzcxZDg1YTgyODM3NDM0OGFhOTY5MTczOWM5Y2Q3 MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKQEAgLTcwLDYg KzcwLDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBjbGFzcyBOZXR3b3JrUHJvY2Vzc1Byb3h5Owog Y2xhc3MgT2JqQ09iamVjdEdyYXBoOwogY2xhc3MgUGFnZUNsaWVudDsKK2NsYXNzIFByb3Zpc2lv bmFsUGFnZVByb3h5OwogY2xhc3MgVXNlck1lZGlhQ2FwdHVyZU1hbmFnZXJQcm94eTsKIGNsYXNz IFZpc2l0ZWRMaW5rU3RvcmU7CiBjbGFzcyBXZWJCYWNrRm9yd2FyZExpc3RJdGVtOwpAQCAtMTI0 LDYgKzEyNSw5IEBAIHB1YmxpYzoKICAgICBlbnVtIGNsYXNzIEVuZHNVc2luZ0RhdGFTdG9yZSA6 IGJvb2wgeyBObywgWWVzIH07CiAgICAgdm9pZCByZW1vdmVXZWJQYWdlKFdlYlBhZ2VQcm94eSYs IHVpbnQ2NF90IHBhZ2VJRCwgRW5kc1VzaW5nRGF0YVN0b3JlKTsKIAorICAgIHZvaWQgYWRkUHJv dmlzaW9uYWxQYWdlUHJveHkoUHJvdmlzaW9uYWxQYWdlUHJveHkmIHByb3Zpc2lvbmFsUGFnZSkg eyBBU1NFUlQoIW1fcHJvdmlzaW9uYWxQYWdlcy5jb250YWlucygmcHJvdmlzaW9uYWxQYWdlKSk7 IG1fcHJvdmlzaW9uYWxQYWdlcy5hZGQoJnByb3Zpc2lvbmFsUGFnZSk7IH0KKyAgICB2b2lkIHJl bW92ZVByb3Zpc2lvbmFsUGFnZVByb3h5KFByb3Zpc2lvbmFsUGFnZVByb3h5JiBwcm92aXNpb25h bFBhZ2UpIHsgQVNTRVJUKG1fcHJvdmlzaW9uYWxQYWdlcy5jb250YWlucygmcHJvdmlzaW9uYWxQ YWdlKSk7IG1fcHJvdmlzaW9uYWxQYWdlcy5yZW1vdmUoJnByb3Zpc2lvbmFsUGFnZSk7IH0KKwog ICAgIHR5cGVuYW1lIFdlYlBhZ2VQcm94eU1hcDo6VmFsdWVzQ29uc3RJdGVyYXRvclJhbmdlIHBh Z2VzKCkgY29uc3QgeyByZXR1cm4gbV9wYWdlTWFwLnZhbHVlcygpOyB9CiAgICAgdW5zaWduZWQg cGFnZUNvdW50KCkgY29uc3QgeyByZXR1cm4gbV9wYWdlTWFwLnNpemUoKTsgfQogICAgIHVuc2ln bmVkIHZpc2libGVQYWdlQ291bnQoKSBjb25zdCB7IHJldHVybiBtX3Zpc2libGVQYWdlQ291bnRl ci52YWx1ZSgpOyB9CkBAIC0zMzAsNiArMzM0LDggQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgbG9n RGlhZ25vc3RpY01lc3NhZ2VGb3JSZXNvdXJjZUxpbWl0VGVybWluYXRpb24oY29uc3QgU3RyaW5n JiBsaW1pdEtleSk7CiAKKyAgICBib29sIGhhc1Byb3Zpc2lvbmFsUGFnZVdpdGhJRCh1aW50NjRf dCBwYWdlSUQpIGNvbnN0OworCiAgICAgZW51bSBjbGFzcyBJc1dlYWsgeyBObywgWWVzIH07CiAg ICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gY2xhc3MgV2Vha09yU3Ryb25nUHRyIHsKICAgICBwdWJs aWM6CkBAIC0zNzMsNiArMzc5LDcgQEAgcHJpdmF0ZToKIAogICAgIFdlYlBhZ2VQcm94eU1hcCBt X3BhZ2VNYXA7CiAgICAgV2ViRnJhbWVQcm94eU1hcCBtX2ZyYW1lTWFwOworICAgIEhhc2hTZXQ8 UHJvdmlzaW9uYWxQYWdlUHJveHkqPiBtX3Byb3Zpc2lvbmFsUGFnZXM7CiAgICAgVXNlckluaXRp YXRlZEFjdGlvbk1hcCBtX3VzZXJJbml0aWF0ZWRBY3Rpb25NYXA7CiAKICAgICBIYXNoU2V0PFZp c2l0ZWRMaW5rU3RvcmUqPiBtX3Zpc2l0ZWRMaW5rU3RvcmVzOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQv V2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggZGVkYmFkY2NkMzRmMGE0MzRk NmRlMTQ1NGM0NGE5ODkyMmNhMDFjZC4uZDdkYTI3YTA1MTI4OWU3ZTUxZjQ4ZTJjOWVjYTc5ZmE4 OTExMjQ1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5w Ynhwcm9qCkBAIC0zMDcwLDYgKzMwNzAsOCBAQAogCQk0NjZCQzAzODFGQTI2NkM5MDAyRkE5QzEg LyogV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jcHAuY3BwOyBwYXRoID0gV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NjZCQzAzOTFGQTI2NkM5MDAyRkE5QzEgLyogV2Vi U1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uaDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJNDY2QkMwM0ExRkEyNjZDOTAwMkZBOUMxIC8qIFdlYlNXQ29udGV4dE1hbmFn ZXJDb25uZWN0aW9uLm1lc3NhZ2VzLmluICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IFdlYlNXQ29u dGV4dE1hbmFnZXJDb25uZWN0aW9uLm1lc3NhZ2VzLmluOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OworCQk0NjgzNTY5QTIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQYWdlUHJveHku aCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gUHJvdmlzaW9uYWxQYWdlUHJveHku aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJNDY4MzU2OUIyMUU4MUNDNzAwNkUyN0Ez IC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNw cDsgcGF0aCA9IFByb3Zpc2lvbmFsUGFnZVByb3h5LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJNDZBMkI2MDYxRTU2NzVBMjAwQzNERURBIC8qIEJhY2tncm91bmRQcm9jZXNzUmVz cG9uc2l2ZW5lc3NUaW1lci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGgg PSBCYWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQk0NkEyQjYwNzFFNTY3NUEyMDBDM0RFREEgLyogQmFja2dyb3VuZFBy b2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0 aCA9IEJhY2tncm91bmRQcm9jZXNzUmVzcG9uc2l2ZW5lc3NUaW1lci5oOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQk0NkRGMDYzOTFGMzkwNUU1MDAxOTgwQkIgLyogTmV0d29ya0NPUlNQ cmVmbGlnaHRDaGVja2VyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9 IE5ldHdvcmtDT1JTUHJlZmxpZ2h0Q2hlY2tlci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CkBAIC03MzEyLDYgKzczMTQsOCBAQAogCQkJCTg2RTY3QTIyMTkwRjQxMTgwMDAwNEFCNyAv KiBQcm9jZXNzVGhyb3R0bGVyLmNwcCAqLywKIAkJCQk4NkU2N0EyMTE5MEY0MTE4MDAwMDRBQjcg LyogUHJvY2Vzc1Rocm90dGxlci5oICovLAogCQkJCTgzMDQ4QUU1MUFDQTQ1REMwMDgyQzgzMiAv KiBQcm9jZXNzVGhyb3R0bGVyQ2xpZW50LmggKi8sCisJCQkJNDY4MzU2OUIyMUU4MUNDNzAwNkUy N0EzIC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmNwcCAqLywKKwkJCQk0NjgzNTY5QTIxRTgxQ0M3 MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQYWdlUHJveHkuaCAqLywKIAkJCQlBNTVCQTgxQjFCQTI1 QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkuY3BwICovLAogCQkJCUE1NUJB ODE5MUJBMjVCMUUwMDdDRDMzRCAvKiBSZW1vdGVXZWJJbnNwZWN0b3JQcm94eS5oICovLAogCQkJ CUE1NUJBODFBMUJBMjVCMUUwMDdDRDMzRCAvKiBSZW1vdGVXZWJJbnNwZWN0b3JQcm94eS5tZXNz YWdlcy5pbiAqLywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYkZyYW1lLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1l LmNwcAppbmRleCAwMDc0OWI0NzdhMjRjZThjY2M4MjUwMWQ5NGUwOGI2MGVlMWE2MjYzLi5mZmVk MDBjODIwNmE5NGYwZTRmZmM3ZmYzYThhOWRmZjg2MTNmYWM4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwCkBAIC0yNjMsOCArMjYzLDYgQEAgc3Rh dGljIFdlYkNvcmU6OlBvbGljeUFjdGlvbiB0b1BvbGljeUFjdGlvbihXZWJQb2xpY3lBY3Rpb24g cG9saWN5QWN0aW9uKQogICAgICAgICByZXR1cm4gV2ViQ29yZTo6UG9saWN5QWN0aW9uOjpJZ25v cmU7CiAgICAgY2FzZSBXZWJQb2xpY3lBY3Rpb246OkRvd25sb2FkOgogICAgICAgICByZXR1cm4g V2ViQ29yZTo6UG9saWN5QWN0aW9uOjpEb3dubG9hZDsKLSAgICBjYXNlIFdlYlBvbGljeUFjdGlv bjo6U3VzcGVuZDoKLSAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOwogICAgIHJldHVybiBXZWJDb3JlOjpQb2xpY3lBY3Rpb246Oklnbm9yZTsKQEAgLTI3Miwx MSArMjcwLDggQEAgc3RhdGljIFdlYkNvcmU6OlBvbGljeUFjdGlvbiB0b1BvbGljeUFjdGlvbihX ZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uKQogCiB2b2lkIFdlYkZyYW1lOjpkaWRSZWNlaXZl UG9saWN5RGVjaXNpb24odWludDY0X3QgbGlzdGVuZXJJRCwgV2ViUG9saWN5QWN0aW9uIGFjdGlv biwgdWludDY0X3QgbmF2aWdhdGlvbklELCBEb3dubG9hZElEIGRvd25sb2FkSUQsIE9wdGlvbmFs PFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQogewotICAgIGlmICghbV9j b3JlRnJhbWUgfHwgIW1fcG9saWN5TGlzdGVuZXJJRCB8fCBsaXN0ZW5lcklEICE9IG1fcG9saWN5 TGlzdGVuZXJJRCB8fCAhbV9wb2xpY3lGdW5jdGlvbikgewotICAgICAgICBpZiAoYWN0aW9uID09 IFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZCkKLSAgICAgICAgICAgIHBhZ2UoKS0+c2VuZChNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpEaWRGYWlsVG9TdXNwZW5kQWZ0ZXJQcm9jZXNzU3dhcCgpKTsK KyAgICBpZiAoIW1fY29yZUZyYW1lIHx8ICFtX3BvbGljeUxpc3RlbmVySUQgfHwgbGlzdGVuZXJJ RCAhPSBtX3BvbGljeUxpc3RlbmVySUQgfHwgIW1fcG9saWN5RnVuY3Rpb24pCiAgICAgICAgIHJl dHVybjsKLSAgICB9CiAKICAgICBGcmFtZVBvbGljeUZ1bmN0aW9uIGZ1bmN0aW9uID0gV1RGTW92 ZShtX3BvbGljeUZ1bmN0aW9uKTsKICAgICBib29sIGZvck5hdmlnYXRpb25BY3Rpb24gPSBtX3Bv bGljeUZ1bmN0aW9uRm9yTmF2aWdhdGlvbkFjdGlvbiA9PSBGb3JOYXZpZ2F0aW9uQWN0aW9uOjpZ ZXM7CkBAIC0yOTIsMTYgKzI4Nyw3IEBAIHZvaWQgV2ViRnJhbWU6OmRpZFJlY2VpdmVQb2xpY3lE ZWNpc2lvbih1aW50NjRfdCBsaXN0ZW5lcklELCBXZWJQb2xpY3lBY3Rpb24gYWN0CiAgICAgICAg ICAgICBkb2N1bWVudExvYWRlci0+c2V0TmF2aWdhdGlvbklEKG5hdmlnYXRpb25JRCk7CiAgICAg fQogCi0gICAgYm9vbCBzaG91bGRTdXNwZW5kID0gZmFsc2U7Ci0gICAgaWYgKGFjdGlvbiA9PSBX ZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQpIHsKLSAgICAgICAgc2hvdWxkU3VzcGVuZCA9IHRydWU7 Ci0gICAgICAgIGFjdGlvbiA9IFdlYlBvbGljeUFjdGlvbjo6SWdub3JlOwotICAgIH0KLQogICAg IGZ1bmN0aW9uKHRvUG9saWN5QWN0aW9uKGFjdGlvbikpOwotCi0gICAgaWYgKHNob3VsZFN1c3Bl bmQpCi0gICAgICAgIHBhZ2UoKS0+c3VzcGVuZEZvclByb2Nlc3NTd2FwKCk7CiB9CiAKIHZvaWQg V2ViRnJhbWU6OnN0YXJ0RG93bmxvYWQoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBy ZXF1ZXN0LCBjb25zdCBTdHJpbmcmIHN1Z2dlc3RlZE5hbWUpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDgwM2JhOGI5OTVlZDNlYzgzMWFiNDZi NTM5N2M3NjYyZTZhODFjNjUuLjEwZTVhNzcyMzNjOTU3NjgxMmEzMDk3ZTA4M2ExNWY5MDBmZGVi ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBA IC00MDEsNyArNDAxLDcgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIFdlYlBh Z2VDcmVhdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQogICAgICwgbV9vdmVycmlkZUNvbnRl bnRTZWN1cml0eVBvbGljeSB7IHBhcmFtZXRlcnMub3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xp Y3kgfQogICAgICwgbV9jcHVMaW1pdChwYXJhbWV0ZXJzLmNwdUxpbWl0KQogI2lmIFBMQVRGT1JN KE1BQykKLSAgICAsIG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uKHBh cmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCkKKyAgICAsIG1fc2hvdWxkQXR0YWNoRHJhd2lu Z0FyZWFPblBhZ2VUcmFuc2l0aW9uKHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkKICNlbmRpZgog ewogICAgIEFTU0VSVChtX3BhZ2VJRCk7CkBAIC00NzEsOCArNDcxLDggQEAgV2ViUGFnZTo6V2Vi UGFnZSh1aW50NjRfdCBwYWdlSUQsIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0 ZXJzKQogICAgIG1fZHJhd2luZ0FyZWEtPnNldFBhaW50aW5nRW5hYmxlZChmYWxzZSk7CiAgICAg bV9kcmF3aW5nQXJlYS0+c2V0U2hvdWxkU2NhbGVWaWV3VG9GaXREb2N1bWVudChwYXJhbWV0ZXJz LnNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQpOwogCi0gICAgaWYgKHBhcmFtZXRlcnMuaXNT d2FwRnJvbVN1c3BlbmRlZCkKLSAgICAgICAgZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6 ZVJlYXNvbjo6U3dhcEZyb21TdXNwZW5kZWQpOworICAgIGlmIChwYXJhbWV0ZXJzLmlzUHJvY2Vz c1N3YXApCisgICAgICAgIGZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlBy b2Nlc3NTd2FwKTsKIAogI2lmIEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpCiAgICAgbV91c2VBc3lu Y1Njcm9sbGluZyA9IHBhcmFtZXRlcnMuc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZl cmVuY2VzS2V5Ojp0aHJlYWRlZFNjcm9sbGluZ0VuYWJsZWRLZXkoKSk7CkBAIC02OTYsNyArNjk2 LDcgQEAgdm9pZCBXZWJQYWdlOjpyZWluaXRpYWxpemVXZWJQYWdlKFdlYlBhZ2VDcmVhdGlvblBh cmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQogICAgICAgICBtX2RyYXdpbmdBcmVhLT51cGRhdGVQcmVm ZXJlbmNlcyhwYXJhbWV0ZXJzLnN0b3JlKTsKICAgICAgICAgbV9kcmF3aW5nQXJlYS0+c2V0UGFp bnRpbmdFbmFibGVkKHRydWUpOwogI2lmIFBMQVRGT1JNKE1BQykKLSAgICAgICAgbV9zaG91bGRB dHRhY2hEcmF3aW5nQXJlYU9uUGFnZVRyYW5zaXRpb24gPSBwYXJhbWV0ZXJzLmlzU3dhcEZyb21T dXNwZW5kZWQ7CisgICAgICAgIG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0 aW9uID0gcGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwOwogI2VuZGlmCiAgICAgICAgIHVuZnJlZXpl TGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6UGFnZVN1c3BlbmRlZCk7CiAgICAgfQpA QCAtMzA1MywxMiArMzA1Myw2IEBAIHZvaWQgV2ViUGFnZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lz aW9uKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IGxpc3RlbmVySUQsIFdlCiAgICAgV2ViRnJh bWUqIGZyYW1lID0gV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkud2ViRnJhbWUoZnJhbWVJRCk7CiAg ICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuOwotICAgIGlmIChwb2xpY3lBY3Rpb24gPT0g V2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kKSB7Ci0gICAgICAgIEFTU0VSVChmcmFtZSA9PSBtX21h aW5GcmFtZSk7Ci0gICAgICAgIHNldElzU3VzcGVuZGVkKHRydWUpOwotCi0gICAgICAgIFdlYlBy b2Nlc3M6OnNpbmdsZXRvbigpLnNlbmRQcmV3YXJtSW5mb3JtYXRpb24obWFpbldlYkZyYW1lKCkt PnVybCgpKTsKLSAgICB9CiAgICAgZnJhbWUtPmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihsaXN0 ZW5lcklELCBwb2xpY3lBY3Rpb24sIG5hdmlnYXRpb25JRCwgZG93bmxvYWRJRCwgV1RGTW92ZSh3 ZWJzaXRlUG9saWNpZXMpKTsKIH0KIApAQCAtMzEwMCw3ICszMDk0LDcgQEAgdm9pZCBXZWJQYWdl OjpkaWRDb21wbGV0ZVBhZ2VUcmFuc2l0aW9uKCkKIAogICAgIGJvb2wgaXNJbml0aWFsRW1wdHlE b2N1bWVudCA9ICFtX21haW5GcmFtZTsKICAgICBpZiAoIWlzSW5pdGlhbEVtcHR5RG9jdW1lbnQp Ci0gICAgICAgIHVuZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6U3dhcEZy b21TdXNwZW5kZWQpOworICAgICAgICB1bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVS ZWFzb246OlByb2Nlc3NTd2FwKTsKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICBpZiAobV9zaG91 bGRBdHRhY2hEcmF3aW5nQXJlYU9uUGFnZVRyYW5zaXRpb24gJiYgIWlzSW5pdGlhbEVtcHR5RG9j dW1lbnQpIHsKQEAgLTYzMTIsNiArNjMwNiwxMCBAQCB2b2lkIFdlYlBhZ2U6OnNldElzU3VzcGVu ZGVkKGJvb2wgc3VzcGVuZGVkKQogICAgIGlmIChtX2lzU3VzcGVuZGVkKSB7CiAgICAgICAgIC8v IFVuZnJvemVuIG9uIGRyYXdpbmcgYXJlYSByZXNldC4KICAgICAgICAgZnJlZXplTGF5ZXJUcmVl KExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6UGFnZVN1c3BlbmRlZCk7CisKKyAgICAgICAgV2ViUHJv Y2Vzczo6c2luZ2xldG9uKCkuc2VuZFByZXdhcm1JbmZvcm1hdGlvbihtYWluV2ViRnJhbWUoKS0+ dXJsKCkpOworCisgICAgICAgIHN1c3BlbmRGb3JQcm9jZXNzU3dhcCgpOwogICAgIH0gZWxzZQog ICAgICAgICBtX3Nob3VsZFJlc2V0RHJhd2luZ0FyZWFBZnRlclN1c3BlbmQgPSB0cnVlOwogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDcxNWUxMjQ1 MjBmZjA3NmI5NjBhZWQ3MGU5YjkyMDc1YTY1NTJhZWYuLmYzYjkzNGUyN2RhOWQ1ZWE1YTFiYmY1 NWYxNDlmNWE4NTEyNzM2ZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmgKQEAgLTY5Niw3ICs2OTYsNyBAQCBwdWJsaWM6CiAgICAgICAgIFByb2Nlc3NTdXNw ZW5kZWQgICAgICAgID0gMSA8PCAyLAogICAgICAgICBQYWdlU3VzcGVuZGVkICAgICAgICAgICA9 IDEgPDwgMywKICAgICAgICAgUHJpbnRpbmcgICAgICAgICAgICAgICAgPSAxIDw8IDQsCi0gICAg ICAgIFN3YXBGcm9tU3VzcGVuZGVkICAgICAgID0gMSA8PCA1LAorICAgICAgICBQcm9jZXNzU3dh cCAgICAgICAgICAgICA9IDEgPDwgNSwKICAgICB9OwogICAgIHZvaWQgZnJlZXplTGF5ZXJUcmVl KExheWVyVHJlZUZyZWV6ZVJlYXNvbik7CiAgICAgdm9pZCB1bmZyZWV6ZUxheWVyVHJlZShMYXll clRyZWVGcmVlemVSZWFzb24pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh Lm1tCmluZGV4IDkxYWQ3MWFkZTFiN2RiNGY5ZGNlNjRkNGYzMzA0NjdiMjJiODMzY2MuLjgzYjY1 OTkyNzBiNTFjN2JiMThlZmU3MzdhNTkyZTAyNTcxYTI4MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJl YS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KQEAgLTk3LDcgKzk3LDcgQEAgVGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWE6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhKFdlYlBhZ2UmIHdl YlBhZ2UsIGMKICAgICB1cGRhdGVMYXllckhvc3RpbmdDb250ZXh0KCk7CiAgICAgc2V0Q29sb3JT cGFjZShwYXJhbWV0ZXJzLmNvbG9yU3BhY2UpOwogCi0gICAgaWYgKCFwYXJhbWV0ZXJzLmlzU3dh cEZyb21TdXNwZW5kZWQpCisgICAgaWYgKCFwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXApCiAgICAg ICAgIGF0dGFjaCgpOwogfQogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9D aGFuZ2VMb2cKaW5kZXggOWEyNjI0MDRiZWNkYTVmMTk5ZjMxMWFjZTIwZWUxMzQzM2IxNzM1Ny4u MzI0OWY0M2UzNmI4ZTlmNTQ5NDcyZDkyMDRiMmM2ODFlMmE2OWUwMCAxMDA2NDQKLS0tIGEvVG9v bHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5 LTAxLTE1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVz c2lvbihQU09OKSBWaWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRv d25sb2FkIGxpbmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE5MzM2MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIEFQSSB0ZXN0IGNvdmVy YWdlLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNz U3dhcE9uTmF2aWdhdGlvbi5tbToKKyAgICAgICAgKC1bUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSB3 ZWJWaWV3OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25SZXNwb25zZTpkZWNpc2lvbkhhbmRsZXI6 XSk6CisKIDIwMTktMDEtMTUgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXSBVc2UgdGhlIGNvbnRhaW5pbmcgYmxvY2sncyBwYWRkaW5nIGJveCB0byBwb3Np dGlvbiBvdXQtb2YtZmxvdyBlbGVtZW50cy4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0gYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1t CmluZGV4IGYzNWQ4YmFhMzUzZjA3MDI0ZmQ0MGU3ZDUyNzQ1M2E3NDIxMGMzYmEuLmE0NDViZjFm OWNiYjJlMmM5NjIwNjY0NzI4ODFjNWVkNDlkMWNhOGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KKysr IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2 aWdhdGlvbi5tbQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTcgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDE3LTIwMTkg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFu ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9k aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k aXRpb25zCkBAIC03Miw2ICs3Miw3IEBAIHN0YXRpYyBib29sIHNlcnZlclJlZGlyZWN0ZWQ7CiBz dGF0aWMgSGFzaFNldDxwaWRfdD4gc2VlblBJRHM7CiBzdGF0aWMgYm9vbCB3aWxsUGVyZm9ybUNs aWVudFJlZGlyZWN0Owogc3RhdGljIGJvb2wgZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0Oworc3Rh dGljIGJvb2wgc2hvdWxkQ29udmVydFRvRG93bmxvYWQ7CiBzdGF0aWMgUmV0YWluUHRyPE5TVVJM PiBjbGllbnRSZWRpcmVjdFNvdXJjZVVSTDsKIHN0YXRpYyBSZXRhaW5QdHI8TlNVUkw+IGNsaWVu dFJlZGlyZWN0RGVzdGluYXRpb25VUkw7CiAKQEAgLTEyOCw2ICsxMjksMTEgQEAgLSAodm9pZCl3 ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rp b246KFdLTmF2aWdhdGkKICAgICBkaWRSZXBvbmRUb1BvbGljeURlY2lzaW9uQ2FsbCA9IHRydWU7 CiB9CiAKKy0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkZWNpZGVQb2xpY3lG b3JOYXZpZ2F0aW9uUmVzcG9uc2U6KFdLTmF2aWdhdGlvblJlc3BvbnNlICopbmF2aWdhdGlvblJl c3BvbnNlIGRlY2lzaW9uSGFuZGxlcjoodm9pZCAoXikoV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xp Y3kpKWRlY2lzaW9uSGFuZGxlcgoreworICAgIGRlY2lzaW9uSGFuZGxlcihzaG91bGRDb252ZXJ0 VG9Eb3dubG9hZCA/IF9XS05hdmlnYXRpb25SZXNwb25zZVBvbGljeUJlY29tZURvd25sb2FkIDog V0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3lBbGxvdyk7Cit9CisKIC0gKHZvaWQpd2ViVmlldzoo V0tXZWJWaWV3ICopd2ViVmlldyBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25h bE5hdmlnYXRpb246KFdLTmF2aWdhdGlvbiAqKW5hdmlnYXRpb24KIHsKICAgICBzZWVuUElEcy5h ZGQoW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7CkBAIC0xNDA1LDcgKzE0MTEsNyBA QCBURVNUKFByb2Nlc3NTd2FwLCBTZXJ2ZXJSZWRpcmVjdCkKIAogICAgIEVYUEVDVF9GQUxTRShz ZXJ2ZXJSZWRpcmVjdGVkKTsKICAgICBFWFBFQ1RfRVEoMywgbnVtYmVyT2ZEZWNpZGVQb2xpY3lD YWxscyk7Ci0gICAgRVhQRUNUX0VRKDJ1LCBzZWVuUElEcy5zaXplKCkpOworICAgIEVYUEVDVF9F USgzdSwgc2VlblBJRHMuc2l6ZSgpKTsKIH0KIAogVEVTVChQcm9jZXNzU3dhcCwgU2VydmVyUmVk aXJlY3QyKQpAQCAtMTQ2Nyw2ICsxNDczLDEwOSBAQCBURVNUKFByb2Nlc3NTd2FwLCBTZXJ2ZXJS ZWRpcmVjdDIpCiAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21h aW4xLmh0bWwiLCBbW3dlYlZpZXcgVVJMXSBhYnNvbHV0ZVN0cmluZ10pOwogfQogCitzdGF0aWMg Y29uc3QgY2hhciogbGlua1RvV2ViS2l0Qnl0ZXMgPSBSIlBTT05SRVNPVVJDRSgKKzxib2R5Pgor ICA8YSBpZD0idGVzdExpbmsiIGhyZWY9InBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwi Pkxpbms8L2E+Cis8L2JvZHk+CispUFNPTlJFU09VUkNFIjsKKworVEVTVChQcm9jZXNzU3dhcCwg UG9saWN5Q2FuY2VsQWZ0ZXJTZXJ2ZXJSZWRpcmVjdCkKK3sKKyAgICBhdXRvIHByb2Nlc3NQb29s Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gYWxs b2NdIGluaXRdKTsKKyAgICBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1N3 YXBzT25OYXZpZ2F0aW9uID0gWUVTOworICAgIGF1dG8gcHJvY2Vzc1Bvb2wgPSBhZG9wdE5TKFtb V0tQcm9jZXNzUG9vbCBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENv bmZpZ3VyYXRpb24uZ2V0KCldKTsKKworICAgIGF1dG8gd2ViVmlld0NvbmZpZ3VyYXRpb24gPSBh ZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJW aWV3Q29uZmlndXJhdGlvbiBzZXRQcm9jZXNzUG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07CisgICAg YXV0byBoYW5kbGVyID0gYWRvcHROUyhbW1BTT05TY2hlbWUgYWxsb2NdIGluaXRdKTsKKyAgICBb aGFuZGxlciBhZGRNYXBwaW5nRnJvbVVSTFN0cmluZzpAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9t YWluLmh0bWwiIHRvRGF0YTpsaW5rVG9XZWJLaXRCeXRlc107CisgICAgW2hhbmRsZXIgYWRkUmVk aXJlY3RGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCIgdG9V UkxTdHJpbmc6QCJwc29uOi8vd3d3LmFwcGxlLmNvbS9pZ25vcmUuaHRtbCJdOworICAgIFt3ZWJW aWV3Q29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJM U2NoZW1lOkAicHNvbiJdOworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmll dyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1 cmF0aW9uOndlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgYXV0byBuYXZpZ2F0aW9u RGVsZWdhdGUgPSBhZG9wdE5TKFtbUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0p OworICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpuYXZpZ2F0aW9uRGVsZWdhdGUu Z2V0KCldOworCisgICAgbmF2aWdhdGlvbkRlbGVnYXRlLT5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0 aW9uQWN0aW9uID0gXihXS05hdmlnYXRpb25BY3Rpb24gKmFjdGlvbiwgdm9pZCAoXmRlY2lzaW9u SGFuZGxlcikoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5KSkgeworICAgICAgICBpZiAoW2FjdGlv bi5yZXF1ZXN0LlVSTC5hYnNvbHV0ZVN0cmluZyBoYXNTdWZmaXg6QCJpZ25vcmUuaHRtbCJdKSB7 CisgICAgICAgICAgICBkZWNpc2lvbkhhbmRsZXIoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5Q2Fu Y2VsKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBkZWNpc2lvbkhh bmRsZXIoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5QWxsb3cpOworICAgIH07CisKKyAgICBOU1VS TFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBV UkxXaXRoU3RyaW5nOkAicHNvbjovL3d3dy5nb29nbGUuY29tL21haW4uaHRtbCJdXTsKKyAgICBb d2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6 OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworICAgIGF1dG8gcGlkQWZ0ZXJGaXJzdExv YWQgPSBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworCisgICAgRVhQRUNUX0VRKDEs IG51bWJlck9mRGVjaWRlUG9saWN5Q2FsbHMpOworCisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZh U2NyaXB0OkAidGVzdExpbmsuY2xpY2soKSIgY29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKworICAg IFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmFpbGVkKTsKKyAgICBmYWlsZWQgPSBmYWxzZTsK KyAgICBkb25lID0gZmFsc2U7CisKKyAgICBFWFBFQ1RfRVEoMywgbnVtYmVyT2ZEZWNpZGVQb2xp Y3lDYWxscyk7CisKKyAgICAvLyBXZSBzaG91bGQgc3RpbGwgYmUgb24gZ29vZ2xlLmNvbS4KKyAg ICBFWFBFQ1RfRVEocGlkQWZ0ZXJGaXJzdExvYWQsIFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRp Zmllcl0pOworICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWlu Lmh0bWwiLCBbW3dlYlZpZXcgVVJMXSBhYnNvbHV0ZVN0cmluZ10pOworCisgICAgW3dlYlZpZXcg ZXZhbHVhdGVKYXZhU2NyaXB0OkAidGVzdExpbmsuaW5uZXJUZXh0IiBjb21wbGV0aW9uSGFuZGxl cjogWyZdIChpZCBpbm5lclRleHQsIE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAgIEVYUEVDVF9X S19TVFJFUShAIkxpbmsiLCBpbm5lclRleHQpOworICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9 XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxz ZTsKK30KKworVEVTVChQcm9jZXNzU3dhcCwgQ3Jvc3NTaXRlRG93bmxvYWQpCit7CisgICAgYXV0 byBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25m aWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdl dCgpLnByb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbiA9IFlFUzsKKyAgICBhdXRvIHByb2Nlc3NQb29s ID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246 cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpXSk7CisKKyAgICBhdXRvIHdlYlZpZXdDb25m aWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRd KTsKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wu Z2V0KCldOworICAgIGF1dG8gaGFuZGxlciA9IGFkb3B0TlMoW1tQU09OU2NoZW1lIGFsbG9jXSBp bml0XSk7CisgICAgW2hhbmRsZXIgYWRkTWFwcGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3 Lmdvb2dsZS5jb20vbWFpbi5odG1sIiB0b0RhdGE6bGlua1RvV2ViS2l0Qnl0ZXNdOworICAgIFto YW5kbGVyIGFkZE1hcHBpbmdGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL21h aW4uaHRtbCIgdG9EYXRhOiJIZWxsbyJdOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRV UkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAicHNvbiJdOworCisg ICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFt ZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1 cmF0aW9uLmdldCgpXSk7CisgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBhZG9wdE5TKFtb UFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldE5h dmlnYXRpb25EZWxlZ2F0ZTpuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCldOworCisgICAgTlNVUkxS ZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJM V2l0aFN0cmluZzpAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiXV07CisgICAgW3dl YlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpy dW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKyAgICBhdXRvIHBpZEFmdGVyRmlyc3RMb2Fk ID0gW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKworICAgIHNob3VsZENvbnZlcnRU b0Rvd25sb2FkID0gdHJ1ZTsKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJ0ZXN0 TGluay5jbGljaygpIiBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOworCisgICAgVGVzdFdlYktpdEFQ STo6VXRpbDo6cnVuKCZmYWlsZWQpOworICAgIGZhaWxlZCA9IGZhbHNlOworICAgIHNob3VsZENv bnZlcnRUb0Rvd25sb2FkID0gZmFsc2U7CisKKyAgICAvLyBXZSBzaG91bGQgc3RpbGwgYmUgb24g Z29vZ2xlLmNvbS4KKyAgICBFWFBFQ1RfRVEocGlkQWZ0ZXJGaXJzdExvYWQsIFt3ZWJWaWV3IF93 ZWJQcm9jZXNzSWRlbnRpZmllcl0pOworICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cu Z29vZ2xlLmNvbS9tYWluLmh0bWwiLCBbW3dlYlZpZXcgVVJMXSBhYnNvbHV0ZVN0cmluZ10pOwor CisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAidGVzdExpbmsuaW5uZXJUZXh0IiBj b21wbGV0aW9uSGFuZGxlcjogWyZdIChpZCBpbm5lclRleHQsIE5TRXJyb3IgKmVycm9yKSB7Cisg ICAgICAgIEVYUEVDVF9XS19TVFJFUShAIkxpbmsiLCBpbm5lclRleHQpOworICAgICAgICBkb25l ID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOwor ICAgIGRvbmUgPSBmYWxzZTsKK30KKwogZW51bSBjbGFzcyBTaG91bGRFbmFibGVQU09OIHsgTm8s IFllcyB9Owogc3RhdGljIHZvaWQgcnVuQ2xpZW50U2lkZVJlZGlyZWN0VGVzdChTaG91bGRFbmFi bGVQU09OIHNob3VsZEVuYWJsZVBTT04pCiB7CkBAIC0yMjMyLDEyICsyMzQxLDI3IEBAIFRFU1Qo UHJvY2Vzc1N3YXAsIFBhZ2VTaG93SGlkZSkKIAogICAgIEVYUEVDVF9FUSg3dSwgW3JlY2VpdmVk TWVzc2FnZXMgY291bnRdKTsKICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtp dC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2Fn ZXMuZ2V0KClbMF0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9y Zy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgp WzFdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0 bWwgLSBwYWdlc2hvdyBOT1QgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7 Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0g cGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSk7Ci0gICAgRVhQ RUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93 IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNF0pOwotICAgIEVYUEVDVF9XS19T VFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0 ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJw c29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNl aXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAgICBpZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClb MV0gaGFzUHJlZml4OkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJdKSB7CisgICAg ICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBw YWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKKyAgICAgICAg RVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNo b3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOworICAgIH0gZWxz ZSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4u aHRtbCAtIHBhZ2VzaG93IE5PVCBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFd KTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4u aHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOwor ICAgIH0KKyAgICBpZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10gaGFzUHJlZml4OkAicHNv bjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIl0pIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVR KEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwg cmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBz b246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNl aXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKKyAgICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tf U1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lz dGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJF UShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIs IHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNF0pOworICAgIH0KKyAgICBpZiAoW3JlY2VpdmVkTWVz c2FnZXMuZ2V0KClbNV0gaGFzUHJlZml4OkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRt bCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9t YWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVd KTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5o dG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7Cisg ICAgfSBlbHNlIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5j b20vbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQo KVs1XSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9t YWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZd KTsKKyAgICB9CiB9CiAKIC8vIERpc2FibGluZyB0aGUgcGFnZSBjYWNoZSBleHBsaWNpdGx5IGlz IChmb3Igc29tZSByZWFzb24pIG5vdCBhdmFpbGFibGUgb24gaU9TLgpAQCAtMjMwNywxMiArMjQz MSwyNyBAQCBURVNUKFByb2Nlc3NTd2FwLCBMb2FkVW5sb2FkKQogCiAgICAgRVhQRUNUX0VRKDd1 LCBbcmVjZWl2ZWRNZXNzYWdlcyBjb3VudF0pOwogICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246 Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBsb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQo KVswXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4u aHRtbCAtIHVubG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0pOwotICAgIEVYUEVDVF9X S19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIGxvYWQiLCByZWNlaXZl ZE1lc3NhZ2VzLmdldCgpWzJdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFw cGxlLmNvbS9tYWluLmh0bWwgLSB1bmxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsK LSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0g bG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNF0pOwotICAgIEVYUEVDVF9XS19TVFJFUShA InBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSB1bmxvYWQiLCByZWNlaXZlZE1lc3Nh Z2VzLmdldCgpWzVdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNv bS9tYWluLmh0bWwgLSBsb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7CisgICAgaWYg KFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdIGhhc1ByZWZpeDpAInBzb246Ly93d3cud2Via2l0 Lm9yZy9tYWluLmh0bWwiXSkgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3 LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gdW5sb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsx XSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4u aHRtbCAtIGxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsKKyAgICB9IGVsc2Ugewor ICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwg LSBsb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7CisgICAgICAgIEVYUEVDVF9XS19T VFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSB1bmxvYWQiLCByZWNlaXZl ZE1lc3NhZ2VzLmdldCgpWzJdKTsKKyAgICB9CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdl dCgpWzNdIGhhc1ByZWZpeDpAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCJdKSB7Cisg ICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAt IHVubG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10pOworICAgICAgICBFWFBFQ1RfV0tf U1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gbG9hZCIsIHJlY2VpdmVk TWVzc2FnZXMuZ2V0KClbNF0pOworICAgIH0gZWxzZSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJF UShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBsb2FkIiwgcmVjZWl2ZWRNZXNz YWdlcy5nZXQoKVszXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBw bGUuY29tL21haW4uaHRtbCAtIHVubG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNF0pOwor ICAgIH0KKyAgICBpZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0gaGFzUHJlZml4OkAicHNv bjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJF UShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSB1bmxvYWQiLCByZWNlaXZlZE1l c3NhZ2VzLmdldCgpWzVdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5h cHBsZS5jb20vbWFpbi5odG1sIC0gbG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0pOwor ICAgIH0gZWxzZSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUu Y29tL21haW4uaHRtbCAtIGxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdKTsKKyAgICAg ICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHVu bG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAgIH0KIH0KIAogVEVTVChQcm9j ZXNzU3dhcCwgV2ViSW5zcGVjdG9yKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDA0YTg2ODY2ZWE2MDBkMjAxMDI5MWFiZmJi OTRiMzcyMWQ1OWRhNTQuLjM0YzUyODZkMzA1YTNhZmQ2ODU1MjUyMDgxZTI4NGM0NTc0MTA1MDMg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxOS0wMS0xNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpA YXBwbGUuY29tPgorCisgICAgICAgIFJlZ3Jlc3Npb24oUFNPTikgVmlldyBiZWNvbWVzIGJsYW5r IGFmdGVyIGNsaWNrIGEgY3Jvc3Mtc2l0ZSBkb3dubG9hZCBsaW5rCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMzNjEKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzQ3MDk5NTczPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFNraXAgdGVzdCB0ZXN0aW5nIHRoZSBjcm9zcy1wcm9jZXNzIERPTVdpbmRvdyBB UEkgYXMgSSBicm9rZSBpdCB3aXRoIHRoaXMgcGF0Y2guCisgICAgICAgIFRoZSBmZWF0dXJlIGlz IGZhciBmcm9tIHJlYWR5IGFuZCBvZmYgYnkgZGVmYXVsdCBhbnl3YXkuIEkgd2lsbCBhZGQgc3Vw cG9ydCBiYWNrCisgICAgICAgIGluIGEgZm9sbG93LXVwLgorCisgICAgICAgICogcGxhdGZvcm0v d2syL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTktMDEtMTUgIERldmluIFJvdXNzbyAgPGRyb3Vz c29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEF1ZGl0OiBwcm92aWRlIGEg d2F5IHRvIGRldGVybWluZSB3aGV0aGVyIGEgZ2l2ZSBub2RlIGhhcyBldmVudCBsaXN0ZW5lcnMK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggOGU5NTllZGFm ZmQ4OTI3ZWY5YzJhYWMzMTZlOWUzMTAwY2QxNDBjYi4uOWQ5MGJlOGI0OGU1N2M5NjBiY2RhNjg2 Y2UyNDQwZDcxMzhiYjBmNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rl c3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3Rh dGlvbnMKQEAgLTczMyw4ICs3MzMsOCBAQCBodHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0YXRpc3Rp Y3MvcmVtb3ZlLWJsb2NraW5nLWluLXJlZGlyZWN0Lmh0bWwgWyBTa2lwIF0KIGh0dHAvdGVzdHMv cmVzb3VyY2VMb2FkU3RhdGlzdGljcy9ub24tcHJldmFsZW50LXJlc291cmNlcy1jYW4tYWNjZXNz LWNvb2tpZXMtaW4tYS10aGlyZC1wYXJ0eS1jb250ZXh0Lmh0bWwgWyBTa2lwIF0KIGh0dHAvdGVz dHMvcmVzb3VyY2VMb2FkU3RhdGlzdGljcy9jYXAtY2FjaGUtbWF4LWFnZS1mb3ItcHJldmFsZW50 LXJlc291cmNlLmh0bWwgWyBTa2lwIF0KIAotIyBQcm9jZXNzIHN3YXBwaW5nIGlzIG9ubHkgaW1w bGVtZW50ZWQgb24gV2ViS2l0Mi4KLWh0dHAvdGVzdHMvbmF2aWdhdGlvbi9wcm9jZXNzLXN3YXAt d2luZG93LW9wZW4uaHRtbCBbIFBhc3MgXQorIyBUaGlzIGZlYXR1cmUgaXMgY3VycmVudGx5IGRp c2FibGVkIGJ5IGRlZmF1bHQgYW5kIHVuZmluaXNoZWQgPHJkYXI6Ly9wcm9ibGVtLzM4OTI1MDc3 Pi4KK2h0dHAvdGVzdHMvbmF2aWdhdGlvbi9wcm9jZXNzLXN3YXAtd2luZG93LW9wZW4uaHRtbCBb IFNraXAgXQogCiAjIENyb3NzLU9yaWdpbi1SZXNvdXJjZS1Qb2xpY3kgcmVzcG9uc2UgaGVhZGVy IGlzIG9ubHkgaW1wbGVtZW50ZWQgaW4gV2ViS2l0Mi4KIGh0dHAvd3B0L2Nyb3NzLW9yaWdpbi1y ZXNvdXJjZS1wb2xpY3kvIFsgUGFzcyBdCg== 359169 2019-01-15 09:54:02 -0800 2019-01-15 10:24:21 -0800 Patch bug-193361-20190115095402.patch text/plain 106781 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5OTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQzNGM2ZGZkZDNhNWQ5 YmMxZjQ2MjZkNTVmOWY0OTg3MWNhNDA1Yi4uOGY3NjUzMTJiNmNhOWY2MzY2Zjc5YzRhY2Q4ZGYy YmYyODhkY2JiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAxLTE1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBW aWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAg ICAgIFdoZW4gcmVzdG9yaW5nIGZyb20gUGFnZUNhY2hlLCBtYWtlIHN1cmUgd2Ugbm90aWZ5IHRo ZSBjbGllbnQgdGhhdCB0aGUgbG9hZCB3YXMgY29tbWl0dGVkCisgICAgICAgICpiZWZvcmUqIHdl IHRlbGwgaXQgdGhhdCB0aGUgbmF2aWdhdGlvbiBpcyBjb21wbGV0ZS4gVGhpcyB3b3VsZCBjb25m dXNlIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eQorICAgICAgICBsb2dpYyBpbiB0aGUgVUlQcm9j ZXNzLgorCiAyMDE5LTAxLTE1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBBdWRpdDogcHJvdmlkZSBhIHdheSB0byBkZXRlcm1pbmUg d2hldGhlciBhIGdpdmUgbm9kZSBoYXMgZXZlbnQgbGlzdGVuZXJzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIxNTgw ZmMwNThiNTM3ZWQxYWRlNWY3NTJlMzE3NjZmY2UzYmQ0MDEuLjQxYjI4MmZiZGM1YmVkZTBiNWU1 YjE3ZDA5NTlkNjI3ZmQxMjFlN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAwIEBACisyMDE5LTAx LTE1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lv bihQU09OKSBWaWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25s b2FkIGxpbmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5MzM2MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGlzc3VlIHRyYWNrZWQgYnkg cmRhcjovL3Byb2JsZW0vNDcwOTk1NzMgaXMgdGhhdCBhIHByb3Zpc2lvbmFsIGxvYWQgbWF5IGdl dAorICAgICAgICBjYW5jZWxlZCAob3IgY29udmVydGVkIGludG8gYSBkb3dubG9hZCkgKmFmdGVy KiB3ZSd2ZSBkZWNpZGVkIHRvIHByb2Nlc3Mtc3dhcC4KKyAgICAgICAgSW4gc3VjaCBjYXNlcywg dGhlIHZpZXcgc2hvdWxkIGtlZXAgZGlzcGxheWluZyB0aGUgY3VycmVudCBzaXRlIGFuZCBpdCBz aG91bGQKKyAgICAgICAgc3RpbGwgYmUgaW50ZXJhY3RpdmUuIEhvd2V2ZXIsIHdpdGggdGhlIHBy ZXZpb3VzIFBTT04gbW9kZWwsIHRoZSB2aWV3IChwYWdlUHJveHkpCisgICAgICAgIHdvdWxkIGhh dmUgYWxyZWFkeSBzd2FwcGVkIHRvIHRoZSBuZXcgcHJvY2VzcyBhbmQgd291bGQgZW5kIHVwIGRp c3BsYXlpbmcgdGhlCisgICAgICAgIGluaXRpYWxseSBlbXB0eSBkb2N1bWVudC4KKworICAgICAg ICBUbyBhZGRyZXNzIHRoZSBpc3N1ZSwgdGhpcyBwYXRjaCBpbnRyb2R1Y2VzIHRoZSBjb25jZXB0 IG9mIGEgcHJvdmlzaW9uYWwgbG9hZAorICAgICAgICBpbiB0aGUgVUlQcm9jZXNzLCBoYW5kbGVk IGJ5IGEgUHJvdmlzaW9uYWxQYWdlUHJveHkgd2hpY2ggaGFzIGl0cyBvd24gcHJpdmlzaW9uYWwK KyAgICAgICAgcHJvY2Vzcy4gVGhlIFdlYlBhZ2VQcm94eSBvd25zIHRoZSBQcm92aXNpb25hbFBh Z2VQcm94eSBidXQgd2UgZG8gbm90IGNvbW1pdCB0aGUKKyAgICAgICAgcHJvdmlzaW9uYWwgcGFn ZSB1bnRpbCBhZnRlciB0aGUgbG9hZCB3YXMgY29tbWl0dGVkIGluIHRoZSBuZXcgcHJvY2Vzcy4g VGhpcyBtZWFucworICAgICAgICB0aGF0IHRoZSB2aWV3IC8gV2ViUGFnZVByb3h5IGtlZXBzIHVz aW5nIHRoZSBvbGQgcHJvY2VzcyBhbmQgZGlzcGxheXMgdGhlIGN1cnJlbnQKKyAgICAgICAgY29u dGVudCB1bnRpbCBhIGxvYWQgaGFzIGNvbW1pdHRlZCBpbiB0aGUgcHJvdmlzaW9uYWwgcGFnZS4g SWYgbm8gbG9hZCBjb21taXRzCisgICAgICAgIGluIHRoZSBwcm92aXNpb25hbCBwcm9jZXNzIChl LmcuIGJlY2F1c2UgdGhlIGxvYWQgaXMgY2FuY2VsbGVkIG9yIGNvbnZlcnRlZCBpbnRvCisgICAg ICAgIGEgZG93bmxvYWQpLCB0aGVuIHdlIG1lcmVseSBkZXN0cm95IHRoZSBQcm92aXNpb25hbFBh Z2VQcm94eSBhbmQgdGVybWluYXRlIGl0cworICAgICAgICBwcm9jZXNzLCB3aXRob3V0IGltcGFj dGluZyB0aGUgV2ViUGFnZVByb3h5LgorCisgICAgICAgICogU2hhcmVkL1dlYlBhZ2VDcmVhdGlv blBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJh bWV0ZXJzOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzLmg6CisgICAgICAgIFJlbmFtZSBpc1N3YXBGcm9tU3VzcGVuZGVkIHRvIGlzUHJvY2Vzc1N3 YXAgZm9yIGNsYXJpdHkgYXMgd2UgYWx3YXlzIHdhbnQgdG8KKyAgICAgICAgZGVsYXkgYXR0YWNo aW5nIHRoZSBkcmF3aW5nIGFyZWEgaW4gY2FzZSBvZiBhIHByb2Nlc3Mtc3dhcCwgbm8gbWF0dGVy IHdoYXQKKyAgICAgICAgbm93IHRoYXQgdGhlIHByZXZpb3VzIHByb2Nlc3MgaXMga2VwdCBhbGl2 ZSB1bnRpbCB0aGUgcHJvdmlzaW9uYWwgbG9hZCBpcworICAgICAgICBjb21taXR0ZWQgaW4gdGhl IG5ldyBwcm9jZXNzLgorCisgICAgICAgICogU2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oOgorICAg ICAgICBEcm9wIFN1c3BlbmQgcG9saWN5IGFjdGlvbi4gQXQgZGVjaWRlUG9saWN5Rm9yTmF2aWdh dGlvbkFjdGlvbiB0aW1lLCBpbiBjYXNlIG9mCisgICAgICAgIHByb2Nlc3Mtc3dhcCwgd2Ugbm93 IHRlbGwgdGhlIHByZXZpb3VzIHByb2Nlc3MgdG8gc2ltcGx5IGlnbm9yZSB0aGUgbG9hZCwgd2hp bGUKKyAgICAgICAgd2UgY3JlYXRlIGEgUHJvdmlzaW9uYWxQYWdlUHJveHkgdG8gZG8gdGhlIG5l dyBsb2FkIGluIGEgbmV3IHByb2Nlc3MuCisgICAgICAgIFN1c3BlbnNpb24gb2YgdGhlIHByZXZp b3VzIHBhZ2UgaW4gdGhlIG9sZCBwcm9jZXNzLCBoYXBwZW5zIGxhdGVyLCB3aGVuIGEgbG9hZAor ICAgICAgICBpcyBhY3R1YWxseSBjb21taXR0ZWQgaW4gdGhlIG5ldyBwcm9jZXNzLgorCisgICAg ICAgICogU291cmNlcy50eHQ6CisgICAgICAgIEFkZCBuZXcgUHJvdmlzaW9uYWxQYWdlUHJveHkg ZmlsZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAg ICAgICAoLVtXS1dlYlZpZXcgX2tpbGxXZWJDb250ZW50UHJvY2Vzc0FuZFJlc2V0U3RhdGVdKToK KyAgICAgICAgV2hlbiBjYWxsaW5nIF9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0YXRl IG9uIGEgV0tXZWJWaWV3LCBraWxsIGJvdGggdGhlIGN1cnJlbnQKKyAgICAgICAgcHJvY2VzcyBh bmQgdGhlIHByb3Zpc2lvbmFsIG9uZSwgdG8gbWFpbnRhaW4gcHJldmlvdXMgYmVoYXZpb3IgaW4g b3VyIEFQSSB0ZXN0cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlQ2xpZW50Lmg6CisgICAg ICAgIFRpbnkgYnVpbGQgZml4LgorCisgICAgICAgICogVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFn ZVByb3h5LmNwcDogQWRkZWQuCisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5 OjpQcm92aXNpb25hbFBhZ2VQcm94eSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFn ZVByb3h5Ojp+UHJvdmlzaW9uYWxQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6dGFrZURyYXdpbmdBcmVhKToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlz aW9uYWxQYWdlUHJveHk6OmNhbmNlbCk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFn ZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFs UGFnZVByb3h5Ojpsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24pOgorICAgICAgICAo V2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6Z29Ub0JhY2tGb3J3YXJkSXRlbSk6CisgICAg ICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOgor ICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25h bExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5Ojpk aWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6 UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKToKKyAgICAgICAgKFdlYktp dDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVTeW5jTWVzc2FnZSk6CisgICAgICAg ICogVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5Lmg6IEFkZGVkLgorICAgICAgICAoV2Vi S2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6cGFnZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zp c2lvbmFsUGFnZVByb3h5OjptYWluRnJhbWUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpQcm92 aXNpb25hbFBhZ2VQcm94eTo6cHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFs UGFnZVByb3h5Ojpwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IGNvbnN0KToKKyAgICAgICAg KFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6Om5hdmlnYXRpb25JRCBjb25zdCk6CisgICAg ICAgIEFkZCBuZXcgUHJvdmlzaW9uYWxQYWdlUHJveHkgY2xhc3MgdG8gd3JhcCB0aGUgcHJvdmlz aW9uYWwgbG9hZCBpbiB0aGUgbmV3IHByb2Nlc3MKKyAgICAgICAgYWZ0ZXIgYSBzd2FwLiBUaGUg cHJvdmlzaW9uYWwgcGFnZSBpcyBvd25lZCBieSB0aGUgV2ViUGFnZVByb3h5IGFuZCB3ZSBvbmx5 IGNvbW1pdAorICAgICAgICB0aGUgcHJvdmlzaW9uYWwgcGFnZSB3aGVuIHRoZSBsb2FkIGlzIGNv bW1pdHRlZC4gVW50aWwgdGhlbiwgdGhlIFdlYlBhZ2VQcm94eSBrZWVwcworICAgICAgICB1c2lu ZyB0aGUgb2xkIHByb2Nlc3MgYW5kIGRpc3BsYXlpbmcgdGhlIGN1cnJlbnQgY29udGVudC4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6On5TdXNwZW5kZWRQYWdlUHJveHkpOgorICAgICAgICAo V2ViS2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6OnVuc3VzcGVuZCk6CisgICAgICAgIChXZWJLaXQ6 OlN1c3BlbmRlZFBhZ2VQcm94eTo6ZGlkUHJvY2Vzc1JlcXVlc3RUb1N1c3BlbmQpOgorICAgICAg ICBVbnJlZ2lzdGVyIHRoZSBTdXNwZW5kZWRQYWdlUHJveHkgYXMgYW4gSVBDIG1lc3NhZ2UgcmVj ZWl2ZXIgYSBsaXR0bGUgYml0IGVhcmxpZXIKKyAgICAgICAgd2hlbiB3ZSdyZSBnb2luZyB0byB1 bnN1c3BlbmQgaXQuIFRoaXMgYXZvaWRzIGNvbmZsaWN0aW5nIHdpdGggdGhlIFByb3Zpc2lvbmFs UGFnZVByb3h5CisgICAgICAgIHdoaWNoIHRyaWVzIHRvIHJlZ2lzdGVyIGl0c2VsZiBhcyBhbiBJ UEMgbWVzc2FnZSByZWNlaXZlciBmb3IgdGhlIHNhbWUgcGFnZUlEIHdoZW4KKyAgICAgICAgYSBw cm9jZXNzLXN3YXAgb2NjdXJzIGFuZCB3ZSdyZSBzd2l0Y2hpbmcgdG8gYSBzdXNwZW5kZWQgcGFn ZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViRnJhbWVQcm94eTo6aXNNYWluRnJhbWUgY29uc3QpOgorICAgICAgICBXZWJGcmFt ZVByb3h5Ojppc01haW5GcmFtZSgpIHJlbGllcyBvbiBjaGVja2luZyB0aGF0IHRoZSBmcmFtZSBp cyB0aGUgV2ViUGFnZVByb3h5J3MgbV9tYWluRnJhbWUuCisgICAgICAgIE5vdyB0aGF0IHRoZSBX ZWJQYWdlUHJveHkgY2FuIGhhdmUgYSBQcm92aXNpb25hbFBhZ2VQcm94eSwgYWxzbyBjaGVjayBp ZiBpdCBpcyB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkncworICAgICAgICBtX21haW5GcmFtZSB0 byBtYWludGFpbiBwcmV2aW91cyBiZWhhdmlvci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnN3YXBUb1dlYlBy b2Nlc3MpOgorICAgICAgICBzd2FwVG9XZWJQcm9jZXNzKCkgbm8gbG9uZ2VyIHRha2VzIGNhcmUg b2YgdW5zdXNwZW5kaW5nIHRoZSBTdXNwZW5kZWRQYWdlIGJlY2F1c2Ugd2Ugbm93IGNhbGwgc3dh cFRvV2ViUHJvY2VzcygpCisgICAgICAgIGxhdGVyLCB3aGVuIGEgbG9hZCBpcyBhY3R1YWxseSBj b21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHBhZ2UgLyBwcm9jZXNzLiBzd2FwVG9XZWJQcm9j ZXNzKCkgbm93IGFsc28gbmVlZHMKKyAgICAgICAgdG8gaW5pdGlhbGl6ZSBzb21lIGRhdGEgbWVt YmVycyBzdWNoIGFzIHRoZSBkcmF3aW5nIGFyZWEgYW5kIHRoZSBtYWluIGZyYW1lIGFzIGl0IGlz IHRyYW5zZmVycmluZyB0aGVtIG92ZXIgZnJvbQorICAgICAgICB0aGUgUHJvdmlzaW9uYWxQYWdl UHJveHkgd2hpY2ggc3RhcnRlZCB0aGUgcHJvdmlzaW9uYWwgbG9hZC4KKworICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2Vzcyk6CisgICAgICAg IFdlIG5vIGxvbmdlciBuZWVkIElzU3dhcEZyb21TdXNwZW5kZWQgcGFyYW1ldGVyIGFzIHRoaXMg aXMgY2FsbGVkIGxhdGVyIG5vdywgYWZ0ZXIgYSBsb2FkIGhhcyBhY3R1YWxseSBiZWVuCisgICAg ICAgIGNvbW1pdHRlZCBpbiB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vzcy4KKworICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKToKKyAgICAgICAgLSBXZSBubyBs b25nZXIgbmVlZCBJc1N3YXBGcm9tU3VzcGVuZGVkIHBhcmFtZXRlciBhcyB0aGlzIGlzIGNhbGxl ZCBsYXRlciBub3csIGFmdGVyIGEgbG9hZCBoYXMgYWN0dWFsbHkgYmVlbgorICAgICAgICAgIGNv bW1pdHRlZCBpbiB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vzcy4KKyAgICAgICAgLSBGYWN0b3Igc29t ZSBjb2RlIG91dCB0byBXZWJQYWdlUHJveHk6OnNldERyYXdpbmdBcmVhKCkgc28gdGhhdCBpdCBj YW4gYmUgc2hhcmVkIHdpdGggc3dhcFRvV2ViUHJvY2VzcygpLgorCisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbik6CisgICAgICAgIE9ubHkg Y2FsbCBzZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCgpIGluIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRp b24oKSBvbmx5IGlmIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCBpcyBub3QKKyAgICAgICAg WWVzLiBUaGlzIGF2b2lkcyBoaXR0aW5nIHNvbWUgYXNzZXJ0aW9ucyBhcyB0aGlzIHdhcyBhbHJl YWR5IGNhbGxlZCBkdXJpbmcgdGhlIGZpcnN0IEFQSSBjYWxsIGlmIG5lZWRlZC4KKworICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9u KToKKyAgICAgICAgSW4gY2FzZSBvZiBwcm9jZXNzIHN3YXAsIHRlbGwgdGhlIHByZXZpb3VzIHBy b2Nlc3MgdG8gaWdub3JlIHRoZSBsb2FkIGluc3RlYWQgb2Ygc3VzcGVuZGluZyBpdCByaWdodCBh d2F5LgorICAgICAgICBTdXNwZW5zaW9uIG5vdyBoYXBwZW5zIGxhdGVyLCBvbmx5IGlmIHdlIGVu ZCB1cCBjb21taXR0aW5nIHRoZSBwcm92aXNpb25hbCBsb2FkIGluIHRoZSBuZXcgcHJvY2Vzcy4K KyAgICAgICAgQWxzbyBkaXNjYXJkIHRoZSBTdXNwZW5kZWRQYWdlIGlmIGl0IGZhaWxlZCB0byBz dXNwZW5kICh3ZSBvbmx5IHJldXNlIGl0cyBwcm9jZXNzIGluIHRoaXMgY2FzZSkuIFRoaXMgdXNl ZAorICAgICAgICB0byBoYXBwZW4gYSBiaXQgbGF0ZXIgYnV0IGl0IGlzIGNsZWFyZXIgaWYgd2Ug ZG8gdGhpcyBhcyBlYXJseSBhcyBwb3NzaWJsZSBJIHRoaW5rLgorCisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKToKKyAgICAgICAgV2hlbiB0aGUg bG9hZCBpcyBjb21taXR0ZWQgaW4gdGhlIG5ldyBwcm9jZXNzLCB3ZSBjYWxsIFdlYlBhZ2VQcm94 eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKCkuIEl0IHRha2VzIGNhcmUgb2Y6CisgICAgICAgIC0g QWN0dWFsbHkgc3dhcHBpbmcgdGhlIFdlYlBhZ2VQcm94eSB0byB0aGUgbmV3IHByb2Nlc3MgYnkg Y2FsbGluZyBwcm9jZXNzRGlkVGVybWluYXRlKCkgLyBzd2FwVG9XZWJQcm9jZXNzKCkuCisgICAg ICAgIC0gU3VzcGVuZGluZyB0aGUgY3VycmVudCBwYWdlLgorICAgICAgICAtIExldHRpbmcgdGhl IGNsaWVudCBrbm93IHRoZSBsb2FkIGlzIGNvbWl0dGVkCisgICAgICAgIC0gRGVzdHJveSB0aGUg UHJvdmlzaW9uYWxQYWdlUHJveHkuCisgICAgICAgIFRoaXMgd29yayB1c2VkIHRvIGhhcHBlbiBl YXJsaWVyIGluIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcygpLgorCisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKToKKyAg ICAgICAgTW92ZWQgc29tZSBvZiB0aGUgbG9naWMgdG8gY29tbWl0UHJvdmlzaW9uYWxQYWdlKCku IFdlIG5vdyBtZXJlbHkgc3RhcnQgdGhlIGxvYWQgaW4gYSBuZXcgUHJvdmlzaW9uYWxQYWdlUHJv eHksCisgICAgICAgIHdpdGhvdXQgYWN0dWFsbHkgaGF2aW5nIHRoZSBXZWJQYWdlUHJveHkgc3dp dGNoIHRvIHRoZSBuZXcgcHJvY2VzcyB5ZXQuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OmRpZENyZWF0ZVdpbmRvdyk6CisgICAgICAgIERyb3Agc29tZSBjb2RlIHRoYXQgaXMgbm8gbG9u Z2VyIG5lZWRlZCwgbm93IHRoYXQgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IHRha2VzIGNhcmUg b2YgdGhpcy4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZERlc3Ryb3lOYXZp Z2F0aW9uKToKKyAgICAgICAgT24gcHJvY2Vzcy1zd2FwLCB3aGVuIHRlbGxpbmcgdGhlIHByZXZp b3VzIHByb2Nlc3MgdG8gaWdub3JlIHRoZSBsb2FkIGFuZCBzdGFydGluZyB0aGUgbmV3IGxvYWQg aW4gYSBuZXcKKyAgICAgICAgUHJvdmlzaW9uYWxQYWdlUHJveHksIHRoZSBwcmV2aW91cyBXZWJQ YWdlIGF0dGVtcHRzIHRvIGRlc3Ryb3kgdGhlIG5hdmlnYXRpb24uIEluIHRoaXMgY2FzZSwgd2Ug aWdub3JlCisgICAgICAgIHRoZSBjYWxsIHNpbmNlIHRoZSBuYXZpZ2F0aW9uIGlzIG1lcmVseSB0 YWtlbiBvdmVyIGJ5IHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eS4KKworICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAg ICBNb3ZlZCBzb21lIFBTT04gbG9naWMgdG8gdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGluc3Rl YWQuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxM b2FkRm9yRnJhbWUpOgorICAgICAgICBXaGVuIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFt ZSgpIGlzIGNhbGxlZCBmb3IgYSBQcm92aXNpb25hbFBhZ2VQcm94eSwgZGVzdHJveSBpdC4KKwor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb25Bc3luYyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5 Rm9yUmVzcG9uc2UpOgorICAgICAgICBDYXB0dXJlIHRoZSBwcm9jZXNzIGluIHRoZSBsYW1iZGEs IHRvIG1ha2Ugc3VyZSB3ZSBzZW5kIHRoZSBwb2xpY3kgZGVjaXNpb24gdG8gdGhlIHNhbWUgcHJv Y2VzcyB0aGF0CisgICAgICAgIGFza2VkIGZvciBpdCwgc28gYXMgdG8gbm90IGdldCBjb25mdXNl ZCBieSBwcm9jZXNzIHN3YXBzLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVz ZXRTdGF0ZSk6CisgICAgICAgIERyb3Agc29tZSBjb2RlIHRoYXQgaXMgbm8gbG9uZ2VyIG5lZWRl ZC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycyk6 CisgICAgICAgIE1vdmUgdGhlIGhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyBmbGFnIGluaXRp YWxpemF0aW9uIGZyb20gdGhlIGNhbGwgc2l0ZSB0byBoZXJlIG5vdyB0aGF0IHdlIGhhdmUKKyAg ICAgICAgbW9yZSB0aGFuIG9uZSBjYWxsIHNpdGUuIFRoaXMgd2FzIGp1c3Qgc29tZSBiYWQgZmFj dG9yaW5nLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVy cmlkZTo6UGFnZVByb2Nlc3NPdmVycmlkZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6flBhZ2VQcm9jZXNzT3ZlcnJpZGUpOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 Ojp0ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2Vzcyk6CisgICAgICAgIEFkZCB1dGlsaXR5IGNsYXNz IHRvIHRlbXBvcmFyaWx5IG92ZXJyaWRlIHRoZSBXZWJQYWdlUHJveHkncyBtX3Byb2Nlc3Mgd2l0 aCB0aGUgcHJvdmlzaW9uYWwgb25lIHdoZW4KKyAgICAgICAgdGhlIFByb3Zpc2lvbmFsUGFnZVBy b3h5IGludGVyYWN0cyB3aXRoIHRoZSBXZWJQYWdlUHJveHkuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5 OjpoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ cm9jZXNzUHJveHk6OnVwZGF0ZUJhY2tGb3J3YXJkSXRlbSk6CisgICAgICAgIEJlZm9yZSB1cGRh dGluZyBhIEJhY2tGb3J3YXJkTGlzdEl0ZW0sIHdlIG5vcm1hbGx5IG1ha2Ugc3VyZSB0aGUgcHJv Y2VzcyBoYXMgYSBXZWJQYWdlUHJveHkgd2l0aCB0aGUKKyAgICAgICAgaXRlbSdzIHBhZ2VJRC4g V2UgaGF2ZSB0byB0d2VhayB0aGUgbG9naWMgYmVjYXVzZSB0aGVyZSBtYXkgbm93IGJlIG5vIFdl YlBhZ2VQcm94eSB3aXRoIHRoaXMgcGFnZUlECisgICAgICAgIGFzc29jaWF0ZWQgd2l0aCB0aGlz IHByb2Nlc3MgeWV0LCBiZWNhdXNlIGl0IGlzIHN0aWxsIGEgUHJvdmlzaW9uYWxQYWdlUHJveHku CisKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpjYW5UZXJtaW5hdGVDaGlsZFBy b2Nlc3MpOgorICAgICAgICBEbyBub3QgdGVybWluYXRlIHRoZSBXZWJQcm9jZXNzIGlmIHRoZXJl IGFyZSBQcm92aXNpb25hbFBhZ2VQcm94eSBvYmplY3RzIHVzaW5nIGl0LgorCisgICAgICAgICog VUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNz UHJveHk6OmFkZFByb3Zpc2lvbmFsUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzc1Byb3h5OjpyZW1vdmVQcm92aXNpb25hbFBhZ2VQcm94eSk6CisKKyAgICAgICAgKiBXZWJL aXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKworICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9XZWJGcmFtZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OnRvUG9saWN5QWN0aW9uKToKKyAg ICAgICAgKFdlYktpdDo6V2ViRnJhbWU6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbik6CisgICAg ICAgIFN0b3AgZGVhbGluZyB3aXRoIFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZCBhcyBpdCBubyBs b25nZXIgZXhpc3RzLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpyZWluaXRpYWxpemVXZWJQYWdlKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKToKKworICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRJc1N1c3BlbmRlZCk6CisgICAgICAgIFN1c3BlbmQgdGhl IFBhZ2Ugd2hlbiBzZXRJc1N1c3BlbmRlZCh0cnVlKSBpcyBjYWxsZWQsIG5vdyB0aGF0IHRoZXJl IGlzIG5vIGxvbmdlciBhIFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZC4KKyAgICAgICAgc2V0SXNT dXNwZW5kZWQodHJ1ZSkgSVBDIGlzIHNlbnQgd2hlbiB3ZSBhY3R1YWxseSBjb21taXQgdGhlIHBy b3Zpc2lvbmFsIHBhZ2UuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tOgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVB bmltYXRpb25EcmF3aW5nQXJlYTo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEpOgorCiAy MDE5LTAxLTE0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgU3BsaXQgaGVhZGVyVmFsdWVGb3JWYXJ5IGludG8gc3BlY2lhbGl6ZWQgZnVuY3Rp b25zIGZvciBOZXR3b3JrUHJvY2VzcyBhbmQgV2ViUHJvY2Vzcy9XZWJLaXRMZWdhY3kKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDRjMjZhNjk4MWI0NjRkYTU5MTZmMDVl YjczNTk2NjkxNTdlZTlmZmUuLmViZjk1MGJhNmMyZWQ5MWY2MjMyYmQyYjVlZmI5Zjc5NTU3YWI1 OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMjAzMiwxMSArMjAz MiwxMSBAQCB2b2lkIEZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQoKQogCiAgICAg ICAgIE9wdGlvbmFsPEhhc0luc2VjdXJlQ29udGVudD4gaGFzSW5zZWN1cmVDb250ZW50ID0gY2Fj aGVkUGFnZS0+Y2FjaGVkTWFpbkZyYW1lKCktPmhhc0luc2VjdXJlQ29udGVudCgpOwogCisgICAg ICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOworCiAgICAgICAg IC8vIEZJWE1FOiBUaGlzIEFQSSBzaG91bGQgYmUgdHVybmVkIGFyb3VuZCBzbyB0aGF0IHdlIGdy b3VuZCBDYWNoZWRQYWdlIGludG8gdGhlIFBhZ2UuCiAgICAgICAgIGNhY2hlZFBhZ2UtPnJlc3Rv cmUoKm1fZnJhbWUucGFnZSgpKTsKIAotICAgICAgICBkaXNwYXRjaERpZENvbW1pdExvYWQoaGFz SW5zZWN1cmVDb250ZW50KTsKLQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgICAgIG1f ZnJhbWUucGFnZSgpLT5jaHJvbWUoKS5zZXREaXNwYXRjaFZpZXdwb3J0RGF0YURpZENoYW5nZVN1 cHByZXNzZWQoZmFsc2UpOwogICAgICAgICBtX2ZyYW1lLnBhZ2UoKS0+Y2hyb21lKCkuZGlzcGF0 Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UobV9mcmFtZS5wYWdlKCktPnZpZXdwb3J0QXJn dW1lbnRzKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzLmNwcAppbmRleCBjYTJkZjQwZWUxZGQyY2EzNmYzYTQ4YTA0NzU3Zjk3YmRiYjYz NjQ3Li42ZDA3YzAzYWQ4YzkyN2U1NDUzYzVmZGE5NTk2NzA5YTc3MjYxZTJiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcApAQCAt NzMsNyArNzMsNyBAQCB2b2lkIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZShJUEM6 OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2Rlci5lbmNvZGVFbnVtKGxheWVySG9z dGluZ01vZGUpOwogICAgIGVuY29kZXIgPDwgbWltZVR5cGVzV2l0aEN1c3RvbUNvbnRlbnRQcm92 aWRlcnM7CiAgICAgZW5jb2RlciA8PCBjb250cm9sbGVkQnlBdXRvbWF0aW9uOwotICAgIGVuY29k ZXIgPDwgaXNTd2FwRnJvbVN1c3BlbmRlZDsKKyAgICBlbmNvZGVyIDw8IGlzUHJvY2Vzc1N3YXA7 CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgZW5jb2RlciA8PCBjb2xvclNwYWNlOwpAQCAtMjI3 LDcgKzIyNyw3IEBAIE9wdGlvbmFsPFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM+IFdlYlBhZ2VD cmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkRlY29kCiAgICAgICAgIHJldHVybiBXVEY6 Om51bGxvcHQ7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmNvbnRyb2xsZWRC eUF1dG9tYXRpb24pKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotICAgIGlmICghZGVj b2Rlci5kZWNvZGUocGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKSkKKyAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkpCiAgICAgICAgIHJldHVybiBX VEY6Om51bGxvcHQ7CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmggYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgKaW5kZXggYWU0MzI1Y2JkNWYxZTU2NzYx NjU4NmY1ZTlmYTczZWU1YjM1YjkzNy4uYjM4MmNlZWRkNDQ5YThkOWEwZjg2OTQ3MzVmMjZjMDU5 NWRkZWNkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBh cmFtZXRlcnMuaApAQCAtMTI5LDcgKzEyOSw3IEBAIHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJh bWV0ZXJzIHsKICAgICBWZWN0b3I8U3RyaW5nPiBtaW1lVHlwZXNXaXRoQ3VzdG9tQ29udGVudFBy b3ZpZGVyczsKIAogICAgIGJvb2wgY29udHJvbGxlZEJ5QXV0b21hdGlvbjsKLSAgICBib29sIGlz U3dhcEZyb21TdXNwZW5kZWQgeyBmYWxzZSB9OworICAgIGJvb2wgaXNQcm9jZXNzU3dhcCB7IGZh bHNlIH07CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgQ29sb3JTcGFjZURhdGEgY29sb3JTcGFj ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oIGIv U291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKaW5kZXggMTQyYTUxOGRmMDk3 ZTVlZjJmYTE4MDQ4NGUwOWQwMzMzYzEwNWI4MS4uMzk3MTc5NWM0NmE1MWIzODgxOGM1NWI3NmQ2 NTNhMzRiNTI4OWU5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5 QWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKQEAg LTI5LDExICsyOSwxMSBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorLy8gRklYTUU6IFJlbW92 ZSB0aGlzIHR5cGUgYW5kIHVzZSBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gaW5zdGVhZC4KIGVudW0g Y2xhc3MgV2ViUG9saWN5QWN0aW9uIDogdWludDhfdCB7CiAgICAgVXNlLAogICAgIERvd25sb2Fk LAotICAgIElnbm9yZSwKLSAgICBTdXNwZW5kCisgICAgSWdub3JlCiB9OwogCiB9CkBAIC00NSw4 ICs0NSw3IEBAIHRlbXBsYXRlPD4gc3RydWN0IEVudW1UcmFpdHM8V2ViS2l0OjpXZWJQb2xpY3lB Y3Rpb24+IHsKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb24sCiAgICAgICAgIFdlYktp dDo6V2ViUG9saWN5QWN0aW9uOjpVc2UsCiAgICAgICAgIFdlYktpdDo6V2ViUG9saWN5QWN0aW9u OjpEb3dubG9hZCwKLSAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246Oklnbm9yZSwKLSAg ICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQKKyAgICAgICAgV2ViS2l0OjpX ZWJQb2xpY3lBY3Rpb246Oklnbm9yZQogICAgID47CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1NvdXJjZXMudHh0IGIvU291cmNlL1dlYktpdC9Tb3VyY2VzLnR4dAppbmRleCBhMGI2 ZjcyODQ2MDQxYzI2M2E1NDc2NzEwZWFjOTg3ZmVkMWQxNjA0Li44YWVjYjg2NDcyNTAyZDAyN2Ez NGFmMzcxOWRkODI4YjAwN2RiMTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMu dHh0CisrKyBiL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQKQEAgLTIzMCw2ICsyMzAsNyBAQCBV SVByb2Nlc3MvSW5zcGVjdG9yVGFyZ2V0UHJveHkuY3BwCiBVSVByb2Nlc3MvUGFnZUxvYWRTdGF0 ZS5jcHAKIFVJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcAogVUlQcm9jZXNzL1Byb2Nlc3NU aHJvdHRsZXIuY3BwCitVSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCiBVSVByb2Nl c3MvUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkuY3BwCiBVSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NU aW1lci5jcHAKIFVJUHJvY2Vzcy9TZXJ2aWNlV29ya2VyUHJvY2Vzc1Byb3h5LmNwcApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMDc0Y2Rk ZmQyNzg0ZTg2OTEyOGQwMjBiZWQ1OTIxM2ExY2JkZGU2OC4uNGRmYWQ2NGUwMTU0MzU5MjgwZTYx NjhiMWYxZWQ1ZWJlNmQ3ZDliYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJWaWV3Lm1tCkBAIC00NCw2ICs0NCw3IEBACiAjaW1wb3J0ICJOYXZpZ2F0aW9u U3RhdGUuaCIKICNpbXBvcnQgIk9iakNPYmplY3RHcmFwaC5oIgogI2ltcG9ydCAiUGFnZUNsaWVu dC5oIgorI2ltcG9ydCAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbXBvcnQgIlJlbW90ZUxh eWVyVHJlZVNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YS5oIgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJU cmVlVHJhbnNhY3Rpb24uaCIKICNpbXBvcnQgIlJlbW90ZU9iamVjdFJlZ2lzdHJ5LmgiCkBAIC00 NzAwLDYgKzQ3MDEsMTEgQEAgLSAodm9pZClfa2lsbFdlYkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRT dGF0ZQogewogICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nlc3NQcm94eT4gcHJvdGVjdGVkUHJvY2Vz c1Byb3h5KF9wYWdlLT5wcm9jZXNzKCkpOwogICAgIHByb3RlY3RlZFByb2Nlc3NQcm94eS0+cmVx dWVzdFRlcm1pbmF0aW9uKFdlYktpdDo6UHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpSZXF1ZXN0 ZWRCeUNsaWVudCk7CisKKyAgICBpZiAoYXV0byogcHJvdmlzaW9uYWxQYWdlUHJveHkgPSBfcGFn ZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKSkgeworICAgICAgICBSZWY8V2ViS2l0OjpXZWJQcm9j ZXNzUHJveHk+IHByb3RlY3RlZFByb2Nlc3NQcm94eShwcm92aXNpb25hbFBhZ2VQcm94eS0+cHJv Y2VzcygpKTsKKyAgICAgICAgcHJvdGVjdGVkUHJvY2Vzc1Byb3h5LT5yZXF1ZXN0VGVybWluYXRp b24oV2ViS2l0OjpQcm9jZXNzVGVybWluYXRpb25SZWFzb246OlJlcXVlc3RlZEJ5Q2xpZW50KTsK KyAgICB9CiB9CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xp ZW50LmgKaW5kZXggMTQ5NzE0YWIxZDIyNjVhNjgzNGQ1N2VmNDdiMTE2ZWE0ZTI5ZTM1MS4uODJj NzczMjJmMmRmODdlM2FlZDVlMDA0YzYxYjJmNzkzOTUwZTM4OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1BhZ2VDbGllbnQuaApAQCAtNDgsNiArNDgsNyBAQAogCiBPQkpDX0NMQVNTIENBTGF5ZXI7 CiBPQkpDX0NMQVNTIE5TRmlsZVdyYXBwZXI7CitPQkpDX0NMQVNTIE5TTWVudTsKIE9CSkNfQ0xB U1MgTlNTZXQ7CiBPQkpDX0NMQVNTIFdLRHJhd2luZ1ZpZXc7CiBPQkpDX0NMQVNTIF9XS1JlbW90 ZU9iamVjdFJlZ2lzdHJ5OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJv dmlzaW9uYWxQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9u YWxQYWdlUHJveHkuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjE2NGUwOTZhOTg5ODVjMGYyODM0MGMxYTk4MDQ0 NWYzZTJkYmY0OWMKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Q cm92aXNpb25hbFBhZ2VQcm94eS5jcHAKQEAgLTAsMCArMSwzMTQgQEAKKy8qCisgKiBDb3B5cmln aHQgKEMpIDIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZv bGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9m IHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4K KyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUg YWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFu ZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoK KyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRS SUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJ RVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFO VElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICog UFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJ VFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJ TkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFH RVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VC U1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7 IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkg VEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFC SUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFS SVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisj aW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKKwor I2luY2x1ZGUgIkFQSU5hdmlnYXRpb24uaCIKKyNpbmNsdWRlICJEcmF3aW5nQXJlYVByb3h5Lmgi CisjaW5jbHVkZSAiTG9nZ2luZy5oIgorI2luY2x1ZGUgIlBhZ2VDbGllbnQuaCIKKyNpbmNsdWRl ICJXZWJCYWNrRm9yd2FyZExpc3QuaCIKKyNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3RJdGVt LmgiCisjaW5jbHVkZSAiV2ViRXJyb3JzLmgiCisjaW5jbHVkZSAiV2ViTmF2aWdhdGlvblN0YXRl LmgiCisjaW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2VzLmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5 LmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5TWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQcm9j ZXNzTWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNzUHJveHkuaCIKKyNpbmNsdWRlIDxX ZWJDb3JlL1Nob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZC5oPgorCituYW1lc3BhY2UgV2ViS2l0 IHsKKworI2RlZmluZSBSRUxFQVNFX0xPR19JRl9BTExPV0VEKGNoYW5uZWwsIGZtdCwgLi4uKSBS RUxFQVNFX0xPR19JRihtX3BhZ2UuaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCksIGNoYW5uZWws ICIlcCAtIFByb3Zpc2lvbmFsUGFnZVByb3h5OjoiIGZtdCwgdGhpcywgIyNfX1ZBX0FSR1NfXykK KyNkZWZpbmUgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChjaGFubmVsLCBmbXQsIC4uLikg UkVMRUFTRV9MT0dfRVJST1JfSUYobV9wYWdlLmlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpLCBj aGFubmVsLCAiJXAgLSBQcm92aXNpb25hbFBhZ2VQcm94eTo6IiBmbXQsIHRoaXMsICMjX19WQV9B UkdTX18pCisKK1Byb3Zpc2lvbmFsUGFnZVByb3h5OjpQcm92aXNpb25hbFBhZ2VQcm94eShXZWJQ YWdlUHJveHkmIHBhZ2UsIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2Vzcywgc3RkOjp1bmlx dWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4gc3VzcGVuZGVkUGFnZSwgdWludDY0X3QgbmF2aWdh dGlvbklELCBib29sIGlzU2VydmVyUmVkaXJlY3QsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdCYgcmVxdWVzdCwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJl cXVlc3RlZEJ5Q2xpZW50KQorICAgIDogbV9wYWdlKHBhZ2UpCisgICAgLCBtX3Byb2Nlc3MoV1RG TW92ZShwcm9jZXNzKSkKKyAgICAsIG1fbmF2aWdhdGlvbklEKG5hdmlnYXRpb25JRCkKKyAgICAs IG1faXNTZXJ2ZXJSZWRpcmVjdChpc1NlcnZlclJlZGlyZWN0KQorICAgICwgbV9yZXF1ZXN0KHJl cXVlc3QpCisgICAgLCBtX3Byb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQocHJvY2Vzc1N3YXBS ZXF1ZXN0ZWRCeUNsaWVudCkKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgICwgbV9zdXNw ZW5zaW9uVG9rZW4obV9wcm9jZXNzLT50aHJvdHRsZXIoKS5mb3JlZ3JvdW5kQWN0aXZpdHlUb2tl bigpKQorI2VuZGlmCit7CisgICAgbV9wcm9jZXNzLT5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCks ICp0aGlzKTsKKyAgICBtX3Byb2Nlc3MtPmFkZFByb3Zpc2lvbmFsUGFnZVByb3h5KCp0aGlzKTsK KworICAgIC8vIElmIHdlIGFyZSByZWF0dGFjaGluZyB0byBhIFN1c3BlbmRlZFBhZ2UsIHRoZW4g dGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UgYWxyZWFkeSBleGlzdHMgYW5kCisgICAgLy8gV2ViUGFn ZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUoKSB3aWxsIG5vdCBiZSBjYWxsZWQgdG8gaW5pdGlh bGl6ZSBtX21haW5GcmFtZS4gSW4gc3VjaAorICAgIC8vIGNhc2UsIHdlIG5lZWQgdG8gaW5pdGlh bGl6ZSBtX21haW5GcmFtZSB0byByZWZsZWN0IHRoZSBmYWN0IHRoZSB0aGUgV2ViUHJvY2Vzcycg V2ViUGFnZQorICAgIC8vIGFscmVhZHkgZXhpc3RzIGFuZCBhbHJlYWR5IGhhcyBhIG1haW4gZnJh bWUuCisgICAgaWYgKHN1c3BlbmRlZFBhZ2UpIHsKKyAgICAgICAgQVNTRVJUKCZzdXNwZW5kZWRQ YWdlLT5wcm9jZXNzKCkgPT0gbV9wcm9jZXNzLnB0cigpKTsKKyAgICAgICAgc3VzcGVuZGVkUGFn ZS0+dW5zdXNwZW5kKCk7CisgICAgICAgIG1fbWFpbkZyYW1lID0gV2ViRnJhbWVQcm94eTo6Y3Jl YXRlKG1fcGFnZSwgc3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSk7CisgICAgICAgIG1fcHJv Y2Vzcy0+ZnJhbWVDcmVhdGVkKHN1c3BlbmRlZFBhZ2UtPm1haW5GcmFtZUlEKCksICptX21haW5G cmFtZSk7CisgICAgfQorCisgICAgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsKK30KKworUHJvdmlzaW9u YWxQYWdlUHJveHk6On5Qcm92aXNpb25hbFBhZ2VQcm94eSgpCit7CisgICAgbV9wcm9jZXNzLT5y ZW1vdmVQcm92aXNpb25hbFBhZ2VQcm94eSgqdGhpcyk7CisKKyAgICBpZiAobV93YXNDb21taXR0 ZWQpCisgICAgICAgIHJldHVybjsKKworICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2Vp dmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdl LnBhZ2VJRCgpKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNsb3Nl KCksIG1fcGFnZS5wYWdlSUQoKSk7CisKKyAgICBpZiAobV9kcmF3aW5nQXJlYSkgeworICAgICAg ICBhdXRvIHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVBy b2Nlc3MobV9wcm9jZXNzKTsKKyAgICAgICAgbV9kcmF3aW5nQXJlYSA9IG51bGxwdHI7CisgICAg fQorCisgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtwcm9jZXNzID0gbV9wcm9jZXNzLmNv cHlSZWYoKV0geworICAgICAgICBwcm9jZXNzLT5tYXliZVNodXREb3duKCk7CisgICAgfSk7Cit9 CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OnByb2Nlc3NEaWRUZXJtaW5hdGUoKQorewor ICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAicHJvY2Vz c0RpZFRlcm1pbmF0ZTogcGFnZUlEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCkpOworICAg IG1fcGFnZS5wcm92aXNpb25hbFByb2Nlc3NEaWRUZXJtaW5hdGUoKTsKK30KKworc3RkOjp1bmlx dWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IFByb3Zpc2lvbmFsUGFnZVByb3h5Ojp0YWtlRHJhd2lu Z0FyZWEoKQoreworICAgIHJldHVybiBXVEZNb3ZlKG1fZHJhd2luZ0FyZWEpOworfQorCit2b2lk IFByb3Zpc2lvbmFsUGFnZVByb3h5OjpjYW5jZWwoKQoreworICAgIC8vIElmIHRoZSBwcm92aXNp b25hbCBsb2FkIHN0YXJ0ZWQsIHRoZW4gaW5kaWNhdGUgdGhhdCBpdCBmYWlsZWQgZHVlIHRvIGNh bmNlbGxhdGlvbiBieSBjYWxsaW5nIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSgpLgor ICAgIGlmIChtX3Byb3Zpc2lvbmFsTG9hZFVSTC5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsK KworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiY2FuY2VsOiBT aW11bGF0aW5nIGEgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lIGZvciBwYWdlSUQgPSAl IiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKKyAg ICBhdXRvIGVycm9yID0gV2ViS2l0OjpjYW5jZWxsZWRFcnJvcihtX3JlcXVlc3QpOworICAgIGVy cm9yLnNldFR5cGUoV2ViQ29yZTo6UmVzb3VyY2VFcnJvcjo6VHlwZTo6Q2FuY2VsbGF0aW9uKTsK KyAgICBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUobV9tYWluRnJhbWUtPmZyYW1lSUQo KSwgeyB9LCBtX25hdmlnYXRpb25JRCwgbV9wcm92aXNpb25hbExvYWRVUkwsIGVycm9yLCBVc2Vy RGF0YSB7IH0pOyAvLyBXaWxsIGRlbGV0ZSB8dGhpc3wuCit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQ YWdlUHJveHk6OnByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmcoKQoreworICAgIFJFTEVBU0VfTE9H X0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAicHJvY2Vzc0RpZEZpbmlzaExhdW5jaGluZzog cGFnZUlEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCkpOworICAgIGZpbmlzaEluaXRpYWxp emluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2goKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBh Z2VQcm94eTo6ZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCgpCit7 CisgICAgQVNTRVJUKG1fcHJvY2Vzcy0+c3RhdGUoKSA9PSBXZWJQcm9jZXNzUHJveHk6OlN0YXRl OjpSdW5uaW5nKTsKKworICAgIC8vIEZJWE1FOiBUaGUgV2ViUGFnZVByb3h5IGRlbGF5cyBhZGRp bmcgdGhlIHZpc2l0ZWQgbGluayBzdG9yZSB1bnRpbCBhZnRlciB0aGUgcHJvY2VzcyBoYXMgbGF1 bmNoZWQKKyAgICAvLyBzbyB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkgZG9lcyB0aGUgc2FtZS4g SG93ZXZlciwgZG8gd2UgcmVhbGx5IG5lZWQgdG8/CisgICAgbV9wcm9jZXNzLT5hZGRWaXNpdGVk TGlua1N0b3JlKG1fcGFnZS52aXNpdGVkTGlua1N0b3JlKCkpOworfQorCit2b2lkIFByb3Zpc2lv bmFsUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSgpCit7CisgICAgYXV0byBwYWdlUHJvY2Vz c092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7 CisgICAgbV9kcmF3aW5nQXJlYSA9IG1fcGFnZS5wYWdlQ2xpZW50KCkuY3JlYXRlRHJhd2luZ0Fy ZWFQcm94eSgpOworCisgICAgYXV0byBwYXJhbWV0ZXJzID0gbV9wYWdlLmNyZWF0aW9uUGFyYW1l dGVycygpOworICAgIHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCA9IHRydWU7CisgICAgbV9wcm9j ZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpDcmVhdGVXZWJQYWdlKG1fcGFnZS5wYWdl SUQoKSwgcGFyYW1ldGVycyksIDApOworCisgICAgaWYgKG1fcHJvY2Vzcy0+c3RhdGUoKSA9PSBX ZWJQcm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKQorICAgICAgICBmaW5pc2hJbml0aWFsaXpp bmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNoKCk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdl UHJveHk6OmxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9u LCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUs IGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpPYmpl Y3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xp Y2llcykKK3sKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImxv YWREYXRhV2l0aE5hdmlnYXRpb246IHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wYWdlLnBhZ2VJRCgp KTsKKworICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92 ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgIG1fcGFnZS5sb2FkRGF0YVdpdGhOYXZpZ2F0 aW9uKG5hdmlnYXRpb24sIGRhdGEsIE1JTUVUeXBlLCBlbmNvZGluZywgYmFzZVVSTCwgdXNlckRh dGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdl YnNpdGVQb2xpY2llcykpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2FkUmVx dWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgV2ViQ29yZTo6 UmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJM c1BvbGljeSBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRh dGEsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQorewor ICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAibG9hZFJlcXVlc3RX aXRoTmF2aWdhdGlvbjogcGFnZUlEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCkpOworCisg ICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQ cm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgbV9wYWdlLmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24o bmF2aWdhdGlvbiwgV1RGTW92ZShyZXF1ZXN0KSwgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGlj eSwgdXNlckRhdGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBX VEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5 Ojpnb1RvQmFja0ZvcndhcmRJdGVtKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgV2ViQmFj a0ZvcndhcmRMaXN0SXRlbSYgaXRlbSwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3 ZWJzaXRlUG9saWNpZXMpCit7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dh cHBpbmcsICJnb1RvQmFja0ZvcndhcmRJdGVtOiBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5w YWdlSUQoKSk7CisKKyAgICBhdXRvIGl0ZW1TdGF0ZXMgPSBtX3BhZ2UuYmFja0ZvcndhcmRMaXN0 KCkuZmlsdGVyZWRJdGVtU3RhdGVzKFt0aGlzLCB0YXJnZXRJdGVtID0gJml0ZW1dKGF1dG8mIGl0 ZW0pIHsKKyAgICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBpdGVtLnN1c3BlbmRlZFBhZ2UoKSkgewor ICAgICAgICAgICAgaWYgKCZwYWdlLT5wcm9jZXNzKCkgPT0gbV9wcm9jZXNzLnB0cigpKQorICAg ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gJml0 ZW0gIT0gdGFyZ2V0SXRlbTsKKyAgICB9KTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6 OldlYlBhZ2U6OlVwZGF0ZUJhY2tGb3J3YXJkTGlzdEZvclJlYXR0YWNoKFdURk1vdmUoaXRlbVN0 YXRlcykpLCBtX3BhZ2UucGFnZUlEKCkpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBp dGVtLml0ZW1JRCgpLCAqbmF2aWdhdGlvbi5iYWNrRm9yd2FyZEZyYW1lTG9hZFR5cGUoKSwgV2Vi Q29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBv bGljaWVzKSksIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVz c1RpbWVyKCkuc3RhcnQoKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3Jl YXRlTWFpbkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCit7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxM T1dFRChQcm9jZXNzU3dhcHBpbmcsICJkaWRDcmVhdGVNYWluRnJhbWU6IHBhZ2VJRCA9ICUiIFBS SXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQpOwor ICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOworCisgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVBy b3h5OjpjcmVhdGUobV9wYWdlLCBmcmFtZUlEKTsKKworICAgIC8vIEFkZCB0aGUgZnJhbWUgdG8g dGhlIHByb2Nlc3Mgd2lkZSBtYXAuCisgICAgbV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoZnJhbWVJ RCwgKm1fbWFpbkZyYW1lKTsKKworICAgIC8vIFRoaXMgbmF2aWdhdGlvbiB3YXMgZGVzdHJveWVk IHNvIG5vIG5lZWQgdG8gbm90aWZ5IG9mIHJlZGlyZWN0LgorICAgIGlmICghbV9wYWdlLm5hdmln YXRpb25TdGF0ZSgpLmhhc05hdmlnYXRpb24obV9uYXZpZ2F0aW9uSUQpKQorICAgICAgICByZXR1 cm47CisKKyAgICAvLyBSZXN0b3JlIHRoZSBtYWluIGZyYW1lJ3MgY29tbWl0dGVkIFVSTCBhcyBz b21lIGNsaWVudHMgbWF5IHJlbHkgb24gaXQgdW50aWwgdGhlIG5leHQgbG9hZCBpcyBjb21taXR0 ZWQuCisgICAgaWYgKGF1dG8qIG1haW5GcmFtZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAg ICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkuc2V0VVJMKG1haW5GcmFtZS0+ZnJhbWVM b2FkU3RhdGUoKS51cmwoKSk7CisKKyAgICAvLyBOb3JtYWxseSwgbm90aWZpY2F0aW9uIG9mIGEg c2VydmVyIHJlZGlyZWN0IGNvbWVzIGZyb20gdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KKyAgICAv LyBJZiB3ZSBhcmUgcHJvY2VzcyBzd2FwcGluZyBpbiByZXNwb25zZSB0byBhIHNlcnZlciByZWRp cmVjdCB0aGVuIHRoYXQgbm90aWZpY2F0aW9uIHdpbGwgbm90IGNvbWUgZnJvbSB0aGUgbmV3IFdl YkNvbnRlbnQgcHJvY2Vzcy4KKyAgICAvLyBJbiB0aGlzIGNhc2Ugd2UgaGF2ZSB0aGUgVUlQcm9j ZXNzIHN5bnRoZXNpemUgdGhlIHJlZGlyZWN0IG5vdGlmaWNhdGlvbiBhdCB0aGUgYXBwcm9wcmlh dGUgdGltZS4KKyAgICBpZiAobV9pc1NlcnZlclJlZGlyZWN0KSB7CisgICAgICAgIG1fbWFpbkZy YW1lLT5mcmFtZUxvYWRTdGF0ZSgpLmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKG1fcmVxdWVzdC51 cmwoKSk7CisKKyAgICAgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBv cmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgICAgIG1fcGFnZS5kaWRSZWNl aXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZShtX21haW5GcmFtZS0+ ZnJhbWVJRCgpLCBtX25hdmlnYXRpb25JRCwgV1RGTW92ZShtX3JlcXVlc3QpLCB7IH0pOworICAg IH0KK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExv YWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYm IHVybCwgVVJMJiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sK KyAgICAvLyBJZiB0aGUgcHJldmlvdXMgcHJvdmlzaW9uYWwgbG9hZCB1c2VkIHRoZSBzYW1lIHBy b2Nlc3MsIHdlIG1heSByZWNlaXZlIElQQyBmb3IgdGhpcyBwcmV2aW91cyBwcm92aXNpb25hbCdz IG1haW4gZnJhbWUgdGhhdCB3ZSBuZWVkIHRvIGlnbm9yZS4KKyAgICBpZiAoIW1fbWFpbkZyYW1l IHx8IG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkgIT0gZnJhbWVJRCkKKyAgICAgICAgcmV0dXJuOwor CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJkaWRTdGFydFBy b3Zpc2lvbmFsTG9hZEZvckZyYW1lOiBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUi IFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSwgZnJh bWVJRCwgbmF2aWdhdGlvbklEKTsKKyAgICBBU1NFUlQobV9wcm92aXNpb25hbExvYWRVUkwuaXNO dWxsKCkpOworICAgIG1fcHJvdmlzaW9uYWxMb2FkVVJMID0gdXJsOworCisgICAgLy8gTWVyZWx5 IGZvbGxvd2luZyBhIHNlcnZlciBzaWRlIHJlZGlyZWN0IHNvIHRoZXJlIGlzIG5vIG5lZWQgdG8g c2VuZCBhIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkIGFnYWluLgorICAgIGlmIChtX2lzU2VydmVy UmVkaXJlY3QpCisgICAgICAgIHJldHVybjsKKworICAgIC8vIENsaWVudHMgZXhwZWN0IHRoZSBQ YWdlJ3MgbWFpbiBmcmFtZSdzIGV4cGVjdGVkVVJMIHRvIGJlIHRoZSBwcm92aXNpb25hbCBvbmUg d2hlbiBhIHByb3Zpc2lvbmFsIGxvYWQgaXMgc3RhcnRlZC4KKyAgICBpZiAoYXV0byogcGFnZU1h aW5GcmFtZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAgICAgcGFnZU1haW5GcmFtZS0+ZGlk U3RhcnRQcm92aXNpb25hbExvYWQodXJsKTsKKworICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlk ZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgIG1f cGFnZS5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKGZyYW1lSUQsIG5hdmlnYXRpb25J RCwgV1RGTW92ZSh1cmwpLCBXVEZNb3ZlKHVucmVhY2hhYmxlVVJMKSwgdXNlckRhdGEpOworfQor Cit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJh bWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBm cmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYg cHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImIGVycm9yLCBjb25z dCBVc2VyRGF0YSYgdXNlckRhdGEpCit7CisgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0g bV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisKKyAgICBSRUxF QVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZEZhaWxQcm92aXNp b25hbExvYWRGb3JGcmFtZTogcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1 NjQgIiwgbmF2aWdhdGlvbklEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQs IG5hdmlnYXRpb25JRCk7CisgICAgbV9wcm92aXNpb25hbExvYWRVUkwgPSB7IH07CisKKyAgICAv LyBNYWtlIHN1cmUgdGhlIFBhZ2UncyBtYWluIGZyYW1lJ3MgZXhwZWN0ZWRVUkwgZ2V0cyBjbGVh cmVkIHNpbmNlIHdlIHVwZGF0ZWQgaXQgaW4gZGlkU3RhcnRQcm92aXNpb25hbExvYWQuCisgICAg aWYgKGF1dG8qIHBhZ2VNYWluRnJhbWUgPSBtX3BhZ2UubWFpbkZyYW1lKCkpCisgICAgICAgIHBh Z2VNYWluRnJhbWUtPmRpZEZhaWxQcm92aXNpb25hbExvYWQoKTsKKworICAgIG1fcGFnZS5kaWRG YWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoZnJhbWVJRCwgZnJhbWVTZWN1cml0eU9yaWdpbiwg bmF2aWdhdGlvbklELCBwcm92aXNpb25hbFVSTCwgZXJyb3IsIHVzZXJEYXRhKTsgLy8gV2lsbCBk ZWxldGUgfHRoaXN8LgorfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDb21taXRM b2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25z dCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1 aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mIGNl cnRpZmljYXRlSW5mbywgYm9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJD b3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3Qg VXNlckRhdGEmIHVzZXJEYXRhKQoreworICAgIC8vIElmIHRoZSBwcmV2aW91cyBwcm92aXNpb25h bCBsb2FkIHVzZWQgdGhlIHNhbWUgcHJvY2Vzcywgd2UgbWF5IHJlY2VpdmUgSVBDIGZvciB0aGlz IHByZXZpb3VzIHByb3Zpc2lvbmFsJ3MgbWFpbiBmcmFtZSB0aGF0IHdlIG5lZWQgdG8gaWdub3Jl LgorICAgIGlmICghbV9tYWluRnJhbWUgfHwgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSAhPSBmcmFt ZUlEKQorICAgICAgICByZXR1cm47CisKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nl c3NTd2FwcGluZywgImRpZENvbW1pdExvYWRGb3JGcmFtZTogcGFnZUlEID0gJSIgUFJJdTY0ICIs IGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEID0gJSIgUFJJdTY0LCBtX3BhZ2Uu cGFnZUlEKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCk7CisgICAgbV9wcm92aXNpb25hbExvYWRV UkwgPSB7IH07CisgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOwor CisgICAgbV93YXNDb21taXR0ZWQgPSB0cnVlOworICAgIG1fcGFnZS5jb21taXRQcm92aXNpb25h bFBhZ2UoZnJhbWVJRCwgbmF2aWdhdGlvbklELCBtaW1lVHlwZSwgZnJhbWVIYXNDdXN0b21Db250 ZW50UHJvdmlkZXIsIGZyYW1lTG9hZFR5cGUsIGNlcnRpZmljYXRlSW5mbywgY29udGFpbnNQbHVn aW5Eb2N1bWVudCwgZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCB1c2VyRGF0YSk7IC8vIFdpbGwg ZGVsZXRlIHx0aGlzfC4KK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkUmVjZWl2 ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBJUEM6OkRlY29kZXImIGRlY29k ZXIpCit7CisgICAgQVNTRVJUKGRlY29kZXIubWVzc2FnZVJlY2VpdmVyTmFtZSgpID09IE1lc3Nh Z2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSk7CisKKyAgICBpZiAoZGVj b2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFN0YXJ0UHJv Z3Jlc3M6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6RGlkQ2hhbmdlUHJvZ3Jlc3M6Om5hbWUoKQorICAgICAgICB8fCBk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6QmFja0Zvcndh cmRBZGRJdGVtOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OkxvZ0RpYWdub3N0aWNNZXNzYWdlOjpuYW1lKCkKKyAgICAg ICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Okxv Z0RpYWdub3N0aWNNZXNzYWdlV2l0aEVuaGFuY2VkUHJpdmFjeTo6bmFtZSgpCisgICAgICAgIHx8 IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTZXROZXR3 b3JrUmVxdWVzdHNJblByb2dyZXNzOjpuYW1lKCkKKyNpZiBQTEFURk9STShDT0NPQSkKKyAgICAg ICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlJl Z2lzdGVyV2ViUHJvY2Vzc0FjY2Vzc2liaWxpdHlUb2tlbjo6bmFtZSgpCisjZW5kaWYKKyAgICAg ICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYzo6bmFtZSgpCisgICAgICAgIHx8IGRl Y29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTdGFydFVSTFNj aGVtZVRhc2s6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVz c2FnZXM6OldlYlBhZ2VQcm94eTo6RGVjaWRlUG9saWN5Rm9yUmVzcG9uc2U6Om5hbWUoKQorICAg ICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6 RGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0OjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNz YWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENoYW5nZVByb3Zpc2lvbmFs VVJMRm9yRnJhbWU6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0g TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGE6Om5h bWUoKSkKKyAgICB7CisgICAgICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50 ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgICAgICBtX3BhZ2UuZGlk UmVjZWl2ZU1lc3NhZ2UoY29ubmVjdGlvbiwgZGVjb2Rlcik7CisgICAgICAgIHJldHVybjsKKyAg ICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OkRpZENyZWF0ZU1haW5GcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxl TWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDcmVhdGVNYWluRnJhbWU+KGRlY29k ZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKTsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0g TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTo6 bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lPihkZWNvZGVyLCB0aGlzLCAmUHJv dmlzaW9uYWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOworICAg ICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBN ZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6Om5h bWUoKSkgeworICAgICAgICBJUEM6OmhhbmRsZU1lc3NhZ2U8TWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6RGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lPihkZWNvZGVyLCB0aGlzLCAmUHJvdmlz aW9uYWxQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSk7CisgICAgICAg IHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3Nh Z2VzOjpXZWJQYWdlUHJveHk6OkRpZENvbW1pdExvYWRGb3JGcmFtZTo6bmFtZSgpKSB7CisgICAg ICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDb21taXRM b2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ29t bWl0TG9hZEZvckZyYW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIExPRyhQcm9j ZXNzU3dhcHBpbmcsICJVbmhhbmRsZWQgbWVzc2FnZSAlczo6JXMgZnJvbSBwcm92aXNpb25hbCBw cm9jZXNzIiwgZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkudG9TdHJpbmcoKS5kYXRhKCks IGRlY29kZXIubWVzc2FnZU5hbWUoKS50b1N0cmluZygpLmRhdGEoKSk7Cit9CisKK3ZvaWQgUHJv dmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVTeW5jTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24m IGNvbm5lY3Rpb24sIElQQzo6RGVjb2RlciYgZGVjb2Rlciwgc3RkOjp1bmlxdWVfcHRyPElQQzo6 RW5jb2Rlcj4mIGVuY29kZXIpCit7CisgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9w YWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgbV9wYWdlLmRp ZFJlY2VpdmVTeW5jTWVzc2FnZShjb25uZWN0aW9uLCBkZWNvZGVyLCBlbmNvZGVyKTsKK30KKwor fSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlz aW9uYWxQYWdlUHJveHkuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44YTBmNzFkZjhjYjRjNzYyNDI1MWU0MWRjOTNh Y2UxODM2NDkxYzNlCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv UHJvdmlzaW9uYWxQYWdlUHJveHkuaApAQCAtMCwwICsxLDk1IEBACisvKgorICogQ29weXJpZ2h0 IChDKSAyMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3Ry aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv dXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBz b3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisg KiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFi b3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQv b3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisg KiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklC VVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVT LCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJ RVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBV UlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRT IENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5D SURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VT IChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNU SVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBP UiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRI RU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklM SVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI3By YWdtYSBvbmNlCisKKyNpbmNsdWRlICJNZXNzYWdlUmVjZWl2ZXIuaCIKKyNpbmNsdWRlIDx3dGYv V2Vha1B0ci5oPgorCituYW1lc3BhY2UgV2ViQ29yZSB7CitjbGFzcyBSZXNvdXJjZVJlcXVlc3Q7 Cit9CisKK25hbWVzcGFjZSBXZWJLaXQgeworCitjbGFzcyBEcmF3aW5nQXJlYVByb3h5OworY2xh c3MgU3VzcGVuZGVkUGFnZVByb3h5OworY2xhc3MgV2ViRnJhbWVQcm94eTsKK2NsYXNzIFdlYlBh Z2VQcm94eTsKK2NsYXNzIFdlYlByb2Nlc3NQcm94eTsKKworY2xhc3MgUHJvdmlzaW9uYWxQYWdl UHJveHkgOiBwdWJsaWMgSVBDOjpNZXNzYWdlUmVjZWl2ZXIsIHB1YmxpYyBDYW5NYWtlV2Vha1B0 cjxQcm92aXNpb25hbFBhZ2VQcm94eT4geworICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwor cHVibGljOgorICAgIFByb3Zpc2lvbmFsUGFnZVByb3h5KFdlYlBhZ2VQcm94eSYsIFJlZjxXZWJQ cm9jZXNzUHJveHk+JiYsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+LCB1aW50 NjRfdCBuYXZpZ2F0aW9uSUQsIGJvb2wgaXNTZXJ2ZXJSZWRpcmVjdCwgY29uc3QgV2ViQ29yZTo6 UmVzb3VyY2VSZXF1ZXN0JiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCk7CisgICAgflBy b3Zpc2lvbmFsUGFnZVByb3h5KCk7CisKKyAgICBXZWJQYWdlUHJveHkmIHBhZ2UoKSB7IHJldHVy biBtX3BhZ2U7IH0KKyAgICBXZWJGcmFtZVByb3h5KiBtYWluRnJhbWUoKSBjb25zdCB7IHJldHVy biBtX21haW5GcmFtZS5nZXQoKTsgfQorICAgIFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcygpIHsg cmV0dXJuIG1fcHJvY2Vzcy5nZXQoKTsgfQorICAgIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGll bnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fcHJvY2Vz c1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDsgfQorICAgIHVpbnQ2NF90IG5hdmlnYXRpb25JRCgpIGNv bnN0IHsgcmV0dXJuIG1fbmF2aWdhdGlvbklEOyB9CisKKyAgICBEcmF3aW5nQXJlYVByb3h5KiBk cmF3aW5nQXJlYSgpIGNvbnN0IHsgcmV0dXJuIG1fZHJhd2luZ0FyZWEuZ2V0KCk7IH0KKyAgICBz dGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gdGFrZURyYXdpbmdBcmVhKCk7CisKKyAg ICB2b2lkIGxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgY29uc3QgSVBD OjpEYXRhUmVmZXJlbmNlJiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBl bmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIE9w dGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOworICAgIHZvaWQg bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QmJiwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgQVBJ OjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RG OjpudWxsb3B0KTsKKyAgICB2b2lkIGdvVG9CYWNrRm9yd2FyZEl0ZW0oQVBJOjpOYXZpZ2F0aW9u JiwgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+ JiYpOworICAgIHZvaWQgY2FuY2VsKCk7CisKKyAgICB2b2lkIHByb2Nlc3NEaWRGaW5pc2hMYXVu Y2hpbmcoKTsKKyAgICB2b2lkIHByb2Nlc3NEaWRUZXJtaW5hdGUoKTsKKworcHJpdmF0ZToKKyAg ICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgorICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBD OjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgZmluYWw7CisgICAgdm9pZCBkaWRSZWNlaXZl U3luY01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJiwgc3RkOjp1bmlxdWVf cHRyPElQQzo6RW5jb2Rlcj4mKSBmaW5hbDsKKworICAgIHZvaWQgZGlkQ3JlYXRlTWFpbkZyYW1l KHVpbnQ2NF90IGZyYW1lSUQpOworICAgIHZvaWQgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JG cmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmLCBVUkwm JiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2b2lkIGRpZENvbW1pdExv YWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0 IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVp bnQzMl90IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYsIGJv b2wgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVD b250ZW50PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIGNvbnN0IFVzZXJEYXRhJik7CisgICAg dm9pZCBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29u c3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50 NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdl YkNvcmU6OlJlc291cmNlRXJyb3ImLCBjb25zdCBVc2VyRGF0YSYpOworCisgICAgdm9pZCBpbml0 aWFsaXplV2ViUGFnZSgpOworICAgIHZvaWQgZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVy UHJvY2Vzc0xhdW5jaCgpOworCisgICAgV2ViUGFnZVByb3h5JiBtX3BhZ2U7CisgICAgUmVmPFdl YlByb2Nlc3NQcm94eT4gbV9wcm9jZXNzOworICAgIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJl YVByb3h5PiBtX2RyYXdpbmdBcmVhOworICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5PiBtX21haW5G cmFtZTsKKyAgICB1aW50NjRfdCBtX25hdmlnYXRpb25JRDsKKyAgICBib29sIG1faXNTZXJ2ZXJS ZWRpcmVjdDsKKyAgICBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QgbV9yZXF1ZXN0OworICAgIFBy b2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgbV9wcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50 OworICAgIGJvb2wgbV93YXNDb21taXR0ZWQgeyBmYWxzZSB9OworICAgIFVSTCBtX3Byb3Zpc2lv bmFsTG9hZFVSTDsKKworI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgUHJvY2Vzc1Rocm90 dGxlcjo6QmFja2dyb3VuZEFjdGl2aXR5VG9rZW4gbV9zdXNwZW5zaW9uVG9rZW47CisjZW5kaWYK K307CisKK30gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAKaW5kZXggZjE5OGE4MTUzM2Y3NmIyZThlMmJmNzFkNGEz YjlkMjc0MGM5NTA3OC4uZmY3NmQ5ZjdmOTdhYzZmYTRmYmIzMDJmNjQ2NjYxZDE2NzhhZTI1NyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwCkBA IC0xMDAsNyArMTAwLDkgQEAgU3VzcGVuZGVkUGFnZVByb3h5Ojp+U3VzcGVuZGVkUGFnZVByb3h5 KCkKICAgICAvLyBJZiB0aGUgc3VzcGVuZGVkIHBhZ2Ugd2FzIG5vdCBjb25zdW1lZCBiZWZvcmUg Z2V0dGluZyBkZXN0cm95ZWQsIHRoZW4gY2xvc2UgdGhlIGNvcnJlc3BvbmRpbmcgcGFnZQogICAg IC8vIG9uIHRoZSBXZWJQcm9jZXNzIHNpZGUuCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlOjpDbG9zZSgpLCBtX3BhZ2UucGFnZUlEKCkpOwotICAgIG1fcHJvY2Vzcy0+cmVt b3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZl ck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKworICAgIGlmIChtX3N1c3BlbnNpb25TdGF0ZSA9 PSBTdXNwZW5zaW9uU3RhdGU6OlN1c3BlbmRpbmcpCisgICAgICAgIG1fcHJvY2Vzcy0+cmVtb3Zl TWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5h bWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKIAogICAgIC8vIFdlIGNhbGwgbWF5YmVTaHV0RG93bigp IGFzeW5jaHJvbm91c2x5IHNpbmNlIHRoZSBTdXNwZW5kZWRQYWdlIGlzIGN1cnJlbnRseSBiZWlu ZyByZW1vdmVkIGZyb20gdGhlIFdlYlByb2Nlc3NQb29sCiAgICAgLy8gYW5kIHdlIHdhbnQgdG8g YXZvaWQgcmUtZW50ZXJpbmcgV2ViUHJvY2Vzc1Bvb2wgbWV0aG9kcy4KQEAgLTEzNCw3ICsxMzYs NiBAQCB2b2lkIFN1c3BlbmRlZFBhZ2VQcm94eTo6dW5zdXNwZW5kKCkKICAgICBBU1NFUlQobV9z dXNwZW5zaW9uU3RhdGUgPT0gU3VzcGVuc2lvblN0YXRlOjpTdXNwZW5kZWQpOwogCiAgICAgbV9z dXNwZW5zaW9uU3RhdGUgPSBTdXNwZW5zaW9uU3RhdGU6OlJlc3VtZWQ7Ci0gICAgbV9wcm9jZXNz LT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJl Y2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOwogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNz YWdlczo6V2ViUGFnZTo6U2V0SXNTdXNwZW5kZWQoZmFsc2UpLCBtX3BhZ2UucGFnZUlEKCkpOwog fQogCkBAIC0xNTEsNiArMTUyLDggQEAgdm9pZCBTdXNwZW5kZWRQYWdlUHJveHk6OmRpZFByb2Nl c3NSZXF1ZXN0VG9TdXNwZW5kKFN1c3BlbnNpb25TdGF0ZSBuZXdTdXNwZW5zaW8KICAgICBtX3N1 c3BlbnNpb25Ub2tlbiA9IG51bGxwdHI7CiAjZW5kaWYKIAorICAgIG1fcHJvY2Vzcy0+cmVtb3Zl TWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5h bWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKwogICAgIGlmIChtX3JlYWR5VG9VbnN1c3BlbmRIYW5k bGVyKQogICAgICAgICBtX3JlYWR5VG9VbnN1c3BlbmRIYW5kbGVyKHRoaXMpOwogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcAppbmRleCBjNzdhMjZiNzQyN2MzMWM4 MjhlMmVhYTIyMWY4MDcwYjc3YWRkMjYyLi41M2M3MTk2YzJhYTBhMzNkMjIwNzU4MTkwY2Q0YmQ5 NWE1Y2QwMjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVBy b3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcApA QCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUgIldlYkZyYW1lUHJveHkuaCIKIAogI2luY2x1ZGUg IkFQSU5hdmlnYXRpb24uaCIKKyNpbmNsdWRlICJQcm92aXNpb25hbFBhZ2VQcm94eS5oIgogI2lu Y2x1ZGUgIldlYkNlcnRpZmljYXRlSW5mby5oIgogI2luY2x1ZGUgIldlYkZyYW1lUG9saWN5TGlz dGVuZXJQcm94eS5oIgogI2luY2x1ZGUgIldlYlBhZ2VNZXNzYWdlcy5oIgpAQCAtNzQsNyArNzUs NyBAQCBib29sIFdlYkZyYW1lUHJveHk6OmlzTWFpbkZyYW1lKCkgY29uc3QKICAgICBpZiAoIW1f cGFnZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgcmV0dXJuIHRoaXMgPT0gbV9wYWdl LT5tYWluRnJhbWUoKTsKKyAgICByZXR1cm4gdGhpcyA9PSBtX3BhZ2UtPm1haW5GcmFtZSgpIHx8 IChtX3BhZ2UtPnByb3Zpc2lvbmFsUGFnZVByb3h5KCkgJiYgdGhpcyA9PSBtX3BhZ2UtPnByb3Zp c2lvbmFsUGFnZVByb3h5KCktPm1haW5GcmFtZSgpKTsKIH0KIAogdm9pZCBXZWJGcmFtZVByb3h5 Ojpsb2FkVVJMKGNvbnN0IFVSTCYgdXJsKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAKaW5kZXggYzhhYjcwMzMzYjQwMzlhODc3OWM0Y2EzZjMxZTE5MDc1NjNhMzM2OS4u MjY3ZTVjZDNmY2QwMjhiNGUyZjkyY2Q4YjkwMGExNzk3ZTVlMDdmZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC03Nyw2ICs3Nyw3IEBACiAjaW5jbHVkZSAi UGx1Z2luSW5mb3JtYXRpb24uaCIKICNpbmNsdWRlICJQbHVnaW5Qcm9jZXNzTWFuYWdlci5oIgog I2luY2x1ZGUgIlByaW50SW5mby5oIgorI2luY2x1ZGUgIlByb3Zpc2lvbmFsUGFnZVByb3h5Lmgi CiAjaW5jbHVkZSAiU2FmZUJyb3dzaW5nV2FybmluZy5oIgogI2luY2x1ZGUgIlNoYXJlU2hlZXRD YWxsYmFja0lELmgiCiAjaW5jbHVkZSAiU2hhcmVkQnVmZmVyRGF0YVJlZmVyZW5jZS5oIgpAQCAt NTQ1LDYgKzU0NiwxMyBAQCBQQUw6OlNlc3Npb25JRCBXZWJQYWdlUHJveHk6OnNlc3Npb25JRCgp IGNvbnN0CiAgICAgcmV0dXJuIG1fd2Vic2l0ZURhdGFTdG9yZS0+c2Vzc2lvbklEKCk7CiB9CiAK K0RyYXdpbmdBcmVhUHJveHkqIFdlYlBhZ2VQcm94eTo6ZHJhd2luZ0FyZWEoKSBjb25zdAorewor ICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZSAmJiBtX3Byb2Nlc3MucHRyKCkgPT0gJm1fcHJvdmlz aW9uYWxQYWdlLT5wcm9jZXNzKCkgJiYgbV9wcm92aXNpb25hbFBhZ2UtPmRyYXdpbmdBcmVhKCkp CisgICAgICAgIHJldHVybiBtX3Byb3Zpc2lvbmFsUGFnZS0+ZHJhd2luZ0FyZWEoKTsKKyAgICBy ZXR1cm4gbV9kcmF3aW5nQXJlYS5nZXQoKTsKK30KKwogdm9pZCBXZWJQYWdlUHJveHk6OmNoYW5n ZVdlYnNpdGVEYXRhU3RvcmUoV2Vic2l0ZURhdGFTdG9yZSYgd2Vic2l0ZURhdGFTdG9yZSkKIHsK ICAgICBtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkucGFnZUVuZFVzaW5nV2Vic2l0ZURhdGFTdG9y ZSgqdGhpcyk7CkBAIC03NjgsMzggKzc3NiwyNiBAQCBib29sIFdlYlBhZ2VQcm94eTo6c3VzcGVu ZEN1cnJlbnRQYWdlSWZQb3NzaWJsZShBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIE9wdAog ICAgIHJldHVybiB0cnVlOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6c3dhcFRvV2ViUHJvY2Vz cyhSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5k ZWRQYWdlUHJveHk+JiYgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLCBJc1N3YXBGcm9tU3VzcGVu ZGVkIGlzU3dhcEZyb21TdXNwZW5kZWQpCit2b2lkIFdlYlBhZ2VQcm94eTo6c3dhcFRvV2ViUHJv Y2VzcyhSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIHN0ZDo6dW5pcXVlX3B0cjxEcmF3 aW5nQXJlYVByb3h5PiYmIGRyYXdpbmdBcmVhLCBSZWZQdHI8V2ViRnJhbWVQcm94eT4mJiBtYWlu RnJhbWUpCiB7CiAgICAgQVNTRVJUKCFtX2lzQ2xvc2VkKTsKICAgICBSRUxFQVNFX0xPR19JRl9B TExPV0VEKExvYWRpbmcsICJzd2FwVG9XZWJQcm9jZXNzOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0g JSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKIAog ICAgIG1fcHJvY2VzcyA9IFdURk1vdmUocHJvY2Vzcyk7CisgICAgQVNTRVJUKCFtX2RyYXdpbmdB cmVhKTsKKyAgICBzZXREcmF3aW5nQXJlYShXVEZNb3ZlKGRyYXdpbmdBcmVhKSk7CisgICAgQVNT RVJUKCFtX21haW5GcmFtZSk7CisgICAgbV9tYWluRnJhbWUgPSBXVEZNb3ZlKG1haW5GcmFtZSk7 CiAgICAgbV9pc1ZhbGlkID0gdHJ1ZTsKIAotICAgIC8vIElmIHdlIGFyZSByZWF0dGFjaGluZyB0 byBhIFN1c3BlbmRlZFBhZ2UsIHRoZW4gdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UgYWxyZWFkeSBl eGlzdHMgYW5kCi0gICAgLy8gV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUoKSB3aWxs IG5vdCBiZSBjYWxsZWQgdG8gaW5pdGlhbGl6ZSBtX21haW5GcmFtZS4gSW4gc3VjaAotICAgIC8v IGNhc2UsIHdlIG5lZWQgdG8gaW5pdGlhbGl6ZSBtX21haW5GcmFtZSB0byByZWZsZWN0IHRoZSBm YWN0IHRoZSB0aGUgV2ViUHJvY2VzcycgV2ViUGFnZQotICAgIC8vIGFscmVhZHkgZXhpc3RzIGFu ZCBhbHJlYWR5IGhhcyBhIG1haW4gZnJhbWUuCi0gICAgaWYgKGRlc3RpbmF0aW9uU3VzcGVuZGVk UGFnZSkgewotICAgICAgICBpZiAoIWRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZS0+ZmFpbGVkVG9T dXNwZW5kKCkpIHsKLSAgICAgICAgICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOwotICAgICAgICAg ICAgQVNTRVJUKCZkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nl c3MucHRyKCkpOwotICAgICAgICAgICAgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT51bnN1c3Bl bmQoKTsKLSAgICAgICAgICAgIG1fbWFpbkZyYW1lID0gV2ViRnJhbWVQcm94eTo6Y3JlYXRlKCp0 aGlzLCBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPm1haW5GcmFtZUlEKCkpOwotICAgICAgICAg ICAgbV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5tYWlu RnJhbWVJRCgpLCAqbV9tYWluRnJhbWUpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAg Ly8gV2UgZmFpbGVkIHRvIHN1c3BlbmQgdGhlIHBhZ2Ugc28gZGVzdHJveSBpdCBub3cgYW5kIG1l cmVseSByZXVzZSBpdHMgV2ViQ29udGVudCBwcm9jZXNzLgotICAgICAgICAgICAgZGVzdGluYXRp b25TdXNwZW5kZWRQYWdlID0gbnVsbHB0cjsKLSAgICAgICAgfQotICAgIH0KLQogICAgIG1fcHJv Y2Vzcy0+YWRkRXhpc3RpbmdXZWJQYWdlKCp0aGlzLCBtX3BhZ2VJRCwgV2ViUHJvY2Vzc1Byb3h5 OjpCZWdpbnNVc2luZ0RhdGFTdG9yZTo6Tm8pOwogICAgIG1fcHJvY2Vzcy0+YWRkTWVzc2FnZVJl Y2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9w YWdlSUQsICp0aGlzKTsKIAotICAgIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2Vzcyhpc1N3YXBG cm9tU3VzcGVuZGVkKTsKKyAgICAvLyBObyBuZWVkIHRvIGluaXRpYWxpemUgdGhlIFdlYlBhZ2Ug c2luY2UgaXQgd2FzIGNyZWF0ZWQgd2hlbiB3ZSBjcmVhdGVkIHRoZSBQcm92aXNpb25hbFBhZ2VQ cm94eS4KKyAgICBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoU2hvdWxkSW5pdGlhbGl6ZVdl YlBhZ2U6Ok5vKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2Vi UHJvY2VzcyhJc1N3YXBGcm9tU3VzcGVuZGVkIGlzU3dhcEZyb21TdXNwZW5kZWQpCit2b2lkIFdl YlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKFNob3VsZEluaXRpYWxpemVX ZWJQYWdlIHNob3VsZEluaXRpYWxpemVQYWdlKQogewogICAgIEFTU0VSVChtX3Byb2Nlc3MtPnN0 YXRlKCkgIT0gQ2hpbGRQcm9jZXNzUHJveHk6OlN0YXRlOjpUZXJtaW5hdGVkKTsKIApAQCAtODM1 LDcgKzgzMSw4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nl c3MoSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzCiAgICAgbV9lZGl0YWJsZUltYWdl Q29udHJvbGxlciA9IHN0ZDo6bWFrZV91bmlxdWU8RWRpdGFibGVJbWFnZUNvbnRyb2xsZXI+KCp0 aGlzKTsKICNlbmRpZgogCi0gICAgaW5pdGlhbGl6ZVdlYlBhZ2UoaXNTd2FwRnJvbVN1c3BlbmRl ZCk7CisgICAgaWYgKHNob3VsZEluaXRpYWxpemVQYWdlID09IFNob3VsZEluaXRpYWxpemVXZWJQ YWdlOjpZZXMpCisgICAgICAgIGluaXRpYWxpemVXZWJQYWdlKCk7CiAKICAgICBtX2luc3BlY3Rv ci0+dXBkYXRlRm9yTmV3UGFnZVByb2Nlc3ModGhpcyk7CiAKQEAgLTkwMCwxMiArODk3LDExIEBA IFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nl c3NXaXRoSXRlbShXZWJCYWNrRm9yd2FyCiAgICAgcmV0dXJuIFdURk1vdmUobmF2aWdhdGlvbik7 CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZShJc1N3YXBGcm9tU3Vz cGVuZGVkIGlzU3dhcEZyb21TdXNwZW5kZWQpCit2b2lkIFdlYlBhZ2VQcm94eTo6c2V0RHJhd2lu Z0FyZWEoc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+JiYgZHJhd2luZ0FyZWEpCiB7 Ci0gICAgQVNTRVJUKGlzVmFsaWQoKSk7Ci0KLSAgICBtX2RyYXdpbmdBcmVhID0gcGFnZUNsaWVu dCgpLmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKLSAgICBBU1NFUlQobV9kcmF3aW5nQXJlYSk7 CisgICAgbV9kcmF3aW5nQXJlYSA9IFdURk1vdmUoZHJhd2luZ0FyZWEpOworICAgIGlmICghbV9k cmF3aW5nQXJlYSkKKyAgICAgICAgcmV0dXJuOwogCiAjaWYgRU5BQkxFKEFTWU5DX1NDUk9MTElO RykgJiYgUExBVEZPUk0oQ09DT0EpCiAgICAgaWYgKG1fZHJhd2luZ0FyZWEtPnR5cGUoKSA9PSBE cmF3aW5nQXJlYVR5cGVSZW1vdGVMYXllclRyZWUpIHsKQEAgLTkxNiwxNSArOTEyLDE2IEBAIHZv aWQgV2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZShJc1N3YXBGcm9tU3VzcGVuZGVkIGlz U3dhcEZyb21TdXNwZW5kZWQpCiAjZW5kaWYKICAgICB9CiAjZW5kaWYKK30KIAotICAgIGF1dG8g cGFyYW1ldGVycyA9IGNyZWF0aW9uUGFyYW1ldGVycygpOwotICAgIHBhcmFtZXRlcnMuaXNTd2Fw RnJvbVN1c3BlbmRlZCA9IGlzU3dhcEZyb21TdXNwZW5kZWQgPT0gSXNTd2FwRnJvbVN1c3BlbmRl ZDo6WWVzOwordm9pZCBXZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKCkKK3sKKyAgICBB U1NFUlQoaXNWYWxpZCgpKTsKIAotI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikKLSAgICBwYXJh bWV0ZXJzLmhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyA9IHByb2Nlc3MoKS5wcm9jZXNzUG9v bCgpLm1heUhhdmVSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMobV93ZWJzaXRlRGF0YVN0b3JlKTsK LSNlbmRpZgorICAgIHNldERyYXdpbmdBcmVhKHBhZ2VDbGllbnQoKS5jcmVhdGVEcmF3aW5nQXJl YVByb3h5KCkpOworICAgIEFTU0VSVChtX2RyYXdpbmdBcmVhKTsKIAotICAgIHByb2Nlc3MoKS5z ZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpDcmVhdGVXZWJQYWdlKG1fcGFnZUlELCBwYXJhbWV0 ZXJzKSwgMCk7CisgICAgcHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OkNyZWF0 ZVdlYlBhZ2UobV9wYWdlSUQsIGNyZWF0aW9uUGFyYW1ldGVycygpKSwgMCk7CiAKICAgICBtX25l ZWRzVG9GaW5pc2hJbml0aWFsaXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNoID0gdHJ1ZTsK ICAgICBmaW5pc2hJbml0aWFsaXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNoKCk7CkBAIC0x MDc2LDcgKzEwNzMsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3RXaXRoTmF2aWdh dGlvbihBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIFJlc291cgogICAgIGF1dG8gdHJhbnNh Y3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKIAogICAgIGF1dG8gdXJsID0g cmVxdWVzdC51cmwoKTsKLSAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0UGVuZGluZ0FQSVJlcXVlc3RV UkwodHJhbnNhY3Rpb24sIHVybCk7CisgICAgaWYgKHNob3VsZFRyZWF0QXNDb250aW51aW5nTG9h ZCAhPSBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcykKKyAgICAgICAgbV9wYWdlTG9h ZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCB1cmwpOwogCiAgICAg aWYgKCFpc1ZhbGlkKCkpCiAgICAgICAgIHJlYXR0YWNoVG9XZWJQcm9jZXNzKCk7CkBAIC0xMjk0 LDYgKzEyOTIsMTAgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnN0b3BMb2FkaW5nKCkKICAgICB9CiAK ICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlN0b3BMb2FkaW5nKCksIG1f cGFnZUlEKTsKKyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UpIHsKKyAgICAgICAgbV9wcm92aXNp b25hbFBhZ2UtPmNhbmNlbCgpOworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7 CisgICAgfQogICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7CiB9 CiAKQEAgLTI2OTgsNyArMjcwMCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZE5hdmln YXRpb25Qb2xpY3lEZWNpc2lvbihXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uCiAgICAgICAg IH0KIAogICAgICAgICBpZiAocHJvY2Vzc0Zvck5hdmlnYXRpb24ucHRyKCkgIT0gJnByb2Nlc3Mo KSkgewotICAgICAgICAgICAgcG9saWN5QWN0aW9uID0gaXNQYWdlT3BlbmVkQnlET01TaG93aW5n SW5pdGlhbEVtcHR5RG9jdW1lbnQoKSA/IFdlYlBvbGljeUFjdGlvbjo6SWdub3JlIDogV2ViUG9s aWN5QWN0aW9uOjpTdXNwZW5kOworICAgICAgICAgICAgcG9saWN5QWN0aW9uID0gV2ViUG9saWN5 QWN0aW9uOjpJZ25vcmU7CiAgICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nl c3NTd2FwcGluZywgImRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24sIHN3YXBwaW5nIHBy b2Nlc3MgJWkgd2l0aCBwcm9jZXNzICVpIGZvciBuYXZpZ2F0aW9uLCByZWFzb246ICV7cHVibGlj fXMiLCBwcm9jZXNzSWRlbnRpZmllcigpLCBwcm9jZXNzRm9yTmF2aWdhdGlvbi0+cHJvY2Vzc0lk ZW50aWZpZXIoKSwgcmVhc29uLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICAgICAgTE9HKFByb2Nl c3NTd2FwcGluZywgIihQcm9jZXNzU3dhcHBpbmcpIFN3aXRjaGluZyBmcm9tIHByb2Nlc3MgJWkg dG8gbmV3IHByb2Nlc3MgKCVpKSBmb3IgbmF2aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMnIiwgcHJv Y2Vzc0lkZW50aWZpZXIoKSwgcHJvY2Vzc0Zvck5hdmlnYXRpb24tPnByb2Nlc3NJZGVudGlmaWVy KCksIG5hdmlnYXRpb24tPm5hdmlnYXRpb25JRCgpLCBuYXZpZ2F0aW9uLT5sb2dnaW5nU3RyaW5n KCkpOwogICAgICAgICB9IGVsc2UKQEAgLTI3MDcsOCArMjcwOSwxNCBAQCB2b2lkIFdlYlBhZ2VQ cm94eTo6cmVjZWl2ZWROYXZpZ2F0aW9uUG9saWN5RGVjaXNpb24oV2ViUG9saWN5QWN0aW9uIHBv bGljeUFjdGlvbgogICAgICAgICBib29sIHNob3VsZFByb2Nlc3NTd2FwID0gcHJvY2Vzc0Zvck5h dmlnYXRpb24ucHRyKCkgIT0gJnByb2Nlc3MoKTsKICAgICAgICAgcmVjZWl2ZWRQb2xpY3lEZWNp c2lvbihwb2xpY3lBY3Rpb24sIG5hdmlnYXRpb24ucHRyKCksIHNob3VsZFByb2Nlc3NTd2FwID8g V1RGOjpudWxsb3B0IDogV1RGTW92ZShkYXRhKSwgV1RGTW92ZShzZW5kZXIpKTsKIAotICAgICAg ICBpZiAoc2hvdWxkUHJvY2Vzc1N3YXApCi0gICAgICAgICAgICBjb250aW51ZU5hdmlnYXRpb25J bk5ld1Byb2Nlc3MobmF2aWdhdGlvbiwgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlID8gcHJvY2Vz cygpLnByb2Nlc3NQb29sKCkudGFrZVN1c3BlbmRlZFBhZ2UoKmRlc3RpbmF0aW9uU3VzcGVuZGVk UGFnZSkgOiBudWxscHRyLCBXVEZNb3ZlKHByb2Nlc3NGb3JOYXZpZ2F0aW9uKSwgcHJvY2Vzc1N3 YXBSZXF1ZXN0ZWRCeUNsaWVudCwgV1RGTW92ZShkYXRhKSk7CisgICAgICAgIGlmICghc2hvdWxk UHJvY2Vzc1N3YXApCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgYXV0byBzdXNwZW5k ZWRQYWdlID0gZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlID8gcHJvY2VzcygpLnByb2Nlc3NQb29s KCkudGFrZVN1c3BlbmRlZFBhZ2UoKmRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSkgOiBudWxscHRy OworICAgICAgICBpZiAoc3VzcGVuZGVkUGFnZSAmJiBzdXNwZW5kZWRQYWdlLT5mYWlsZWRUb1N1 c3BlbmQoKSkKKyAgICAgICAgICAgIHN1c3BlbmRlZFBhZ2UgPSBudWxscHRyOworCisgICAgICAg IGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhuYXZpZ2F0aW9uLCBXVEZNb3ZlKHN1c3Bl bmRlZFBhZ2UpLCBXVEZNb3ZlKHByb2Nlc3NGb3JOYXZpZ2F0aW9uKSwgcHJvY2Vzc1N3YXBSZXF1 ZXN0ZWRCeUNsaWVudCwgV1RGTW92ZShkYXRhKSk7CiAgICAgfSk7CiB9CiAKQEAgLTI3NDQsMjQg KzI3NTIsNDUgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVkUG9saWN5RGVjaXNpb24oV2Vi UG9saWN5QWN0aW9uIGFjdGlvbiwgQVBJOjpOYXZpZ2F0aW8KICAgICBzZW5kZXItPnNlbmQoYWN0 aW9uLCBuYXZpZ2F0aW9uID8gbmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCkgOiAwLCBkb3dubG9h ZElELCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6 Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlv biwgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiBzdXNwZW5kZWRQYWdlUHJv eHksIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzcywgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRC eUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBPcHRpb25hbDxXZWJzaXRlUG9s aWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3ZvaWQgV2ViUGFnZVByb3h5Ojpjb21taXRQ cm92aXNpb25hbFBhZ2UodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBj b25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVy LCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8m IGNlcnRpZmljYXRlSW5mbywgYm9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxX ZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29u c3QgVXNlckRhdGEmIHVzZXJEYXRhKQogewotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9h ZGluZywgImNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2Vzczogd2ViUElEID0gJWksIHBhZ2VJ RCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCk7 Ci0gICAgTE9HKExvYWRpbmcsICJDb250aW51aW5nIG5hdmlnYXRpb24gJSIgUFJJdTY0ICIgJyVz JyBpbiBhIG5ldyB3ZWIgcHJvY2VzcyIsIG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIG5hdmln YXRpb24ubG9nZ2luZ1N0cmluZygpKTsKKyAgICBBU1NFUlQobV9wcm92aXNpb25hbFBhZ2UpOwor ICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImNvbW1pdFByb3Zpc2lvbmFsUGFn ZTogcHJldmlvdXNQSUQgPSAlaSwgbmV3UElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9w cm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2Vzcygp LnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKIAotICAgIFJlZjxXZWJQcm9jZXNzUHJv eHk+IHByZXZpb3VzUHJvY2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCk7CiAgICAgT3B0aW9uYWw8 dWludDY0X3Q+IG1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MgPSBtX21haW5GcmFtZSA/IG1h a2VPcHRpb25hbChtX21haW5GcmFtZS0+ZnJhbWVJRCgpKSA6IFdURjo6bnVsbG9wdDsKLSAgICBh dXRvIG1haW5GcmFtZVVSTCA9IG1fbWFpbkZyYW1lID8gbV9tYWluRnJhbWUtPnVybCgpIDogVVJM KCk7CiAKLSAgICBBU1NFUlQobV9wcm9jZXNzLnB0cigpICE9IHByb2Nlc3MucHRyKCkpOworICAg IEFTU0VSVChtX3Byb2Nlc3MucHRyKCkgIT0gJm1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCkp OwogCiAgICAgcHJvY2Vzc0RpZFRlcm1pbmF0ZShQcm9jZXNzVGVybWluYXRpb25SZWFzb246Ok5h dmlnYXRpb25Td2FwKTsKIAogICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlSUQpOwot ICAgIGJvb2wgZGlkU3VzcGVuZFByZXZpb3VzUGFnZSA9IHN1c3BlbmRDdXJyZW50UGFnZUlmUG9z c2libGUobmF2aWdhdGlvbiwgbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcywgcHJvY2Vzc1N3 YXBSZXF1ZXN0ZWRCeUNsaWVudCk7CisgICAgYXV0byogbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25T dGF0ZSgpLm5hdmlnYXRpb24obV9wcm92aXNpb25hbFBhZ2UtPm5hdmlnYXRpb25JRCgpKTsKKyAg ICBib29sIGRpZFN1c3BlbmRQcmV2aW91c1BhZ2UgPSBuYXZpZ2F0aW9uID8gc3VzcGVuZEN1cnJl bnRQYWdlSWZQb3NzaWJsZSgqbmF2aWdhdGlvbiwgbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2Vz cywgbV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQoKSkgOiBm YWxzZTsKICAgICBtX3Byb2Nlc3MtPnJlbW92ZVdlYlBhZ2UoKnRoaXMsIG1fcGFnZUlELCBXZWJQ cm9jZXNzUHJveHk6OkVuZHNVc2luZ0RhdGFTdG9yZTo6Tm8pOwogCi0gICAgc3dhcFRvV2ViUHJv Y2VzcyhXVEZNb3ZlKHByb2Nlc3MpLCBXVEZNb3ZlKHN1c3BlbmRlZFBhZ2VQcm94eSksIGRpZFN1 c3BlbmRQcmV2aW91c1BhZ2UgPyBJc1N3YXBGcm9tU3VzcGVuZGVkOjpZZXMgOiBJc1N3YXBGcm9t U3VzcGVuZGVkOjpObyk7CisgICAgLy8gVGhlcmUgaXMgbm8gd2F5IHdlJ2xsIGJlIGFibGUgdG8g cmV0dXJuIHRvIHRoZSBwYWdlIGluIHRoZSBwcmV2aW91cyBwYWdlIHNvIGNsb3NlIGl0LgorICAg IGlmICghZGlkU3VzcGVuZFByZXZpb3VzUGFnZSkKKyAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1l c3NhZ2VzOjpXZWJQYWdlOjpDbG9zZSgpLCBwYWdlSUQoKSk7CisKKyAgICBzd2FwVG9XZWJQcm9j ZXNzKG1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCksIG1fcHJvdmlzaW9uYWxQYWdlLT50YWtl RHJhd2luZ0FyZWEoKSwgbV9wcm92aXNpb25hbFBhZ2UtPm1haW5GcmFtZSgpKTsKKworICAgIGRp ZENvbW1pdExvYWRGb3JGcmFtZShmcmFtZUlELCBuYXZpZ2F0aW9uSUQsIG1pbWVUeXBlLCBmcmFt ZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgZnJhbWVMb2FkVHlwZSwgY2VydGlmaWNhdGVJbmZv LCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIHVzZXJE YXRhKTsKKworICAgIG1fcHJvdmlzaW9uYWxQYWdlID0gbnVsbHB0cjsKK30KKwordm9pZCBXZWJQ YWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhBUEk6Ok5hdmlnYXRpb24m IG5hdmlnYXRpb24sIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYgc3VzcGVu ZGVkUGFnZVByb3h5LCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIG5ld1Byb2Nlc3MsIFByb2Nlc3NT d2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgT3B0aW9u YWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit7CisgICAgUkVMRUFT RV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiY29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNz OiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVu dGlmaWVyKCksIG1fcGFnZUlEKTsKKyAgICBMT0coTG9hZGluZywgIkNvbnRpbnVpbmcgbmF2aWdh dGlvbiAlIiBQUkl1NjQgIiAnJXMnIGluIGEgbmV3IHdlYiBwcm9jZXNzIiwgbmF2aWdhdGlvbi5u YXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi5sb2dnaW5nU3RyaW5nKCkpOworCisgICAgaWYgKG1f cHJvdmlzaW9uYWxQYWdlKSB7CisgICAgICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdh dGlvbklEKCkgIT0gbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSkKKyAgICAgICAgICAgIG1fcHJv dmlzaW9uYWxQYWdlLT5jYW5jZWwoKTsKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBudWxs cHRyOworICAgIH0KKworICAgIG1fcHJvdmlzaW9uYWxQYWdlID0gc3RkOjptYWtlX3VuaXF1ZTxQ cm92aXNpb25hbFBhZ2VQcm94eT4oKnRoaXMsIG5ld1Byb2Nlc3MuY29weVJlZigpLCBXVEZNb3Zl KHN1c3BlbmRlZFBhZ2VQcm94eSksIG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIG5hdmlnYXRp b24uY3VycmVudFJlcXVlc3RJc1JlZGlyZWN0KCksIG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3Qo KSwgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCk7CiAKICAgICBpZiAoYXV0byogaXRlbSA9 IG5hdmlnYXRpb24udGFyZ2V0SXRlbSgpKSB7CiAgICAgICAgIExPRyhMb2FkaW5nLCAiV2ViUGFn ZVByb3h5ICVwIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyB0byBiYWNrIGl0ZW0gVVJM ICVzIiwgdGhpcywgaXRlbS0+dXJsKCkudXRmOCgpLmRhdGEoKSk7CkBAIC0yNzY5LDY3ICsyNzk4 LDIyIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3Mo QVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBzCiAgICAgICAgIGF1dG8gdHJhbnNhY3Rpb24g PSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKICAgICAgICAgbV9wYWdlTG9hZFN0YXRl LnNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCBpdGVtLT51cmwoKSk7CiAKLSAg ICAgICAgYXV0byBpdGVtU3RhdGVzID0gbV9iYWNrRm9yd2FyZExpc3QtPmZpbHRlcmVkSXRlbVN0 YXRlcyhbdGhpcywgdGFyZ2V0SXRlbSA9IGl0ZW1dKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mIGl0 ZW0pIHsKLSAgICAgICAgICAgIGlmIChhdXRvKiBwYWdlID0gaXRlbS5zdXNwZW5kZWRQYWdlKCkp IHsKLSAgICAgICAgICAgICAgICBpZiAoJnBhZ2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRy KCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIHJldHVybiAmaXRlbSAhPSB0YXJnZXRJdGVtOwotICAgICAgICB9KTsKLSAgICAg ICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpVcGRhdGVCYWNrRm9yd2FyZExp c3RGb3JSZWF0dGFjaChXVEZNb3ZlKGl0ZW1TdGF0ZXMpKSwgbV9wYWdlSUQpOwotICAgICAgICBt X3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0obmF2 aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgaXRlbS0+aXRlbUlEKCksICpuYXZpZ2F0aW9uLmJhY2tG b3J3YXJkRnJhbWVMb2FkVHlwZSgpLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6Olllcywg V1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKSwgbV9wYWdlSUQpOwotICAgICAgICBtX3Byb2Nlc3Mt PnJlc3BvbnNpdmVuZXNzVGltZXIoKS5zdGFydCgpOwotCisgICAgICAgIG1fcHJvdmlzaW9uYWxQ YWdlLT5nb1RvQmFja0ZvcndhcmRJdGVtKG5hdmlnYXRpb24sICppdGVtLCBXVEZNb3ZlKHdlYnNp dGVQb2xpY2llcykpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgaWYgKG1fYmFja0Zv cndhcmRMaXN0LT5jdXJyZW50SXRlbSgpICYmIChuYXZpZ2F0aW9uLmxvY2tCYWNrRm9yd2FyZExp c3QoKSA9PSBMb2NrQmFja0ZvcndhcmRMaXN0OjpZZXMgfHwgbmF2aWdhdGlvbi5sb2NrSGlzdG9y eSgpID09IExvY2tIaXN0b3J5OjpZZXMpKSB7CiAgICAgICAgIC8vIElmIFdlYkNvcmUgaXMgc3Vw cG9zZWQgdG8gbG9jayB0aGUgaGlzdG9yeSBmb3IgdGhpcyBsb2FkLCB0aGVuIHRoZSBuZXcgcHJv Y2VzcyBuZWVkcyB0byBrbm93IGFib3V0IHRoZSBjdXJyZW50IGhpc3RvcnkgaXRlbSBzbyBpdCBj YW4gdXBkYXRlCiAgICAgICAgIC8vIGl0IGluc3RlYWQgb2YgY3JlYXRpbmcgYSBuZXcgb25lLgot ICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldEN1cnJlbnRIaXN0 b3J5SXRlbUZvclJlYXR0YWNoKG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50SXRlbSgpLT5pdGVt U3RhdGUoKSksIG1fcGFnZUlEKTsKKyAgICAgICAgbmV3UHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6U2V0Q3VycmVudEhpc3RvcnlJdGVtRm9yUmVhdHRhY2gobV9iYWNrRm9yd2FyZExp c3QtPmN1cnJlbnRJdGVtKCktPml0ZW1TdGF0ZSgpKSwgbV9wYWdlSUQpOwogICAgIH0KIAogICAg IC8vIEZJWE1FOiBXb3JrIG91dCB0aW1pbmcgb2YgcmVzcG9uZGluZyB3aXRoIHRoZSBsYXN0IHBv bGljeSBkZWxlZ2F0ZSwgZXRjCiAgICAgQVNTRVJUKCFuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0 KCkuaXNFbXB0eSgpKTsKICAgICBpZiAoYXV0byYgc3Vic3RpdHV0ZURhdGEgPSBuYXZpZ2F0aW9u LnN1YnN0aXR1dGVEYXRhKCkpCi0gICAgICAgIGxvYWREYXRhV2l0aE5hdmlnYXRpb24obmF2aWdh dGlvbiwgeyBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5kYXRhKCksIHN1YnN0aXR1dGVEYXRhLT5j b250ZW50LnNpemUoKSB9LCBzdWJzdGl0dXRlRGF0YS0+TUlNRVR5cGUsIHN1YnN0aXR1dGVEYXRh LT5lbmNvZGluZywgc3Vic3RpdHV0ZURhdGEtPmJhc2VVUkwsIHN1YnN0aXR1dGVEYXRhLT51c2Vy RGF0YS5nZXQoKSwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vi c2l0ZVBvbGljaWVzKSk7CisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5sb2FkRGF0YVdpdGhO YXZpZ2F0aW9uKG5hdmlnYXRpb24sIHsgc3Vic3RpdHV0ZURhdGEtPmNvbnRlbnQuZGF0YSgpLCBz dWJzdGl0dXRlRGF0YS0+Y29udGVudC5zaXplKCkgfSwgc3Vic3RpdHV0ZURhdGEtPk1JTUVUeXBl LCBzdWJzdGl0dXRlRGF0YS0+ZW5jb2RpbmcsIHN1YnN0aXR1dGVEYXRhLT5iYXNlVVJMLCBzdWJz dGl0dXRlRGF0YS0+dXNlckRhdGEuZ2V0KCksIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiAg ICAgZWxzZQotICAgICAgICBsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIFJl c291cmNlUmVxdWVzdCB7IG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKSB9LCBXZWJDb3JlOjpT aG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGRBbGxvd0V4dGVybmFsU2NoZW1lcywg bnVsbHB0ciwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0 ZVBvbGljaWVzKSk7Ci0KLSAgICBBU1NFUlQoIW1fbWFpbkZyYW1lKTsKLSAgICBtX21haW5GcmFt ZUNyZWF0aW9uSGFuZGxlciA9IFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKSwg bmF2aWdhdGlvbklEID0gbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgcmVxdWVzdCA9ICBuYXZp Z2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCksIG1haW5GcmFtZVVSTCwgaXNTZXJ2ZXJSZWRpcmVjdCA9 IG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3RJc1JlZGlyZWN0KCldKCkgbXV0YWJsZSB7Ci0gICAg ICAgIGlmICghd2Vha1RoaXMpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgQVNTRVJU KG1fbWFpbkZyYW1lKTsKLSAgICAgICAgLy8gVGhpcyBuYXZpZ2F0aW9uIHdhcyBkZXN0cm95ZWQg c28gbm8gbmVlZCB0byBub3RpZnkgb2YgcmVkaXJlY3QuCi0gICAgICAgIGlmICghbmF2aWdhdGlv blN0YXRlKCkubmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpKQotICAgICAgICAgICAgcmV0dXJuOwot Ci0gICAgICAgIC8vIFJlc3RvcmUgdGhlIG1haW4gZnJhbWUncyBjb21taXR0ZWQgVVJMIGFzIHNv bWUgY2xpZW50cyBtYXkgcmVseSBvbiBpdCB1bnRpbCB0aGUgbmV4dCBsb2FkIGlzIGNvbW1pdHRl ZC4KLSAgICAgICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkuc2V0VVJMKG1haW5GcmFt ZVVSTCk7Ci0KLSAgICAgICAgLy8gTm9ybWFsbHksIG5vdGlmaWNhdGlvbiBvZiBhIHNlcnZlciBy ZWRpcmVjdCBjb21lcyBmcm9tIHRoZSBXZWJDb250ZW50IHByb2Nlc3MuCi0gICAgICAgIC8vIElm IHdlIGFyZSBwcm9jZXNzIHN3YXBwaW5nIGluIHJlc3BvbnNlIHRvIGEgc2VydmVyIHJlZGlyZWN0 IHRoZW4gdGhhdCBub3RpZmljYXRpb24gd2lsbCBub3QgY29tZSBmcm9tIHRoZSBuZXcgV2ViQ29u dGVudCBwcm9jZXNzLgotICAgICAgICAvLyBJbiB0aGlzIGNhc2Ugd2UgaGF2ZSB0aGUgVUlQcm9j ZXNzIHN5bnRoZXNpemUgdGhlIHJlZGlyZWN0IG5vdGlmaWNhdGlvbiBhdCB0aGUgYXBwcm9wcmlh dGUgdGltZS4KLSAgICAgICAgaWYgKGlzU2VydmVyUmVkaXJlY3QpIHsKLSAgICAgICAgICAgIG1f bWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKHJlcXVl c3QudXJsKCkpOwotICAgICAgICAgICAgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlz aW9uYWxMb2FkRm9yRnJhbWUobV9tYWluRnJhbWUtPmZyYW1lSUQoKSwgbmF2aWdhdGlvbklELCBX VEZNb3ZlKHJlcXVlc3QpLCB7IH0pOwotICAgICAgICB9Ci0gICAgfTsKLQotICAgIGlmICghbV9w cm9jZXNzLT5wcm9jZXNzUG9vbCgpLmNvbmZpZ3VyYXRpb24oKS5wcm9jZXNzU3dhcHNPbldpbmRv d09wZW5XaXRoT3BlbmVyKCkgfHwgIWlzUGFnZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0 eURvY3VtZW50KCkgfHwgIW1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MpIHsKLSAgICAgICAg Ly8gVGhlcmUgaXMgbm8gd2F5IHdlJ2xsIGJlIGFibGUgdG8gcmV0dXJuIHRvIHRoZSBwYWdlIGlu IHRoZSBwcmV2aW91cyBwYWdlIHNvIGNsb3NlIGl0LgotICAgICAgICBpZiAoIWRpZFN1c3BlbmRQ cmV2aW91c1BhZ2UpCi0gICAgICAgICAgICBwcmV2aW91c1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6 OldlYlBhZ2U6OkNsb3NlKCksIG1fcGFnZUlEKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQot ICAgIG1fbWFpbkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyID0gW3RoaXMsIHByZXZpb3VzUHJv Y2VzcyA9IFdURk1vdmUocHJldmlvdXNQcm9jZXNzKSwgbWFpbkZyYW1lSURJblByZXZpb3VzUHJv Y2VzcyA9ICptYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzXShjb25zdCBHbG9iYWxXaW5kb3dJ ZGVudGlmaWVyJiB3aW5kb3dJZGVudGlmaWVyKSB7Ci0gICAgICAgIEFTU0VSVChtX21haW5GcmFt ZSk7Ci0gICAgICAgIEdsb2JhbEZyYW1lSWRlbnRpZmllciBuYXZpZ2F0ZWRGcmFtZUlkZW50aWZp ZXJJbk5ld1Byb2Nlc3MgeyBwYWdlSUQoKSwgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSB9OwotICAg ICAgICBwcmV2aW91c1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkZyYW1lQmVjYW1l UmVtb3RlKG1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MsIG5hdmlnYXRlZEZyYW1lSWRlbnRp ZmllckluTmV3UHJvY2Vzcywgd2luZG93SWRlbnRpZmllciksIHBhZ2VJRCgpKTsKLSAgICB9Owor ICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZS0+bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihuYXZp Z2F0aW9uLCBSZXNvdXJjZVJlcXVlc3QgeyBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCkgfSwg V2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkQWxsb3dFeHRlcm5h bFNjaGVtZXMsIG51bGxwdHIsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiB9CiAKIGJvb2wg V2ViUGFnZVByb3h5Ojppc1BhZ2VPcGVuZWRCeURPTVNob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVu dCgpIGNvbnN0CkBAIC0zNjk0LDExICszNjc4LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZENy ZWF0ZU1haW5GcmFtZSh1aW50NjRfdCBmcmFtZUlEKQogCiAgICAgLy8gQWRkIHRoZSBmcmFtZSB0 byB0aGUgcHJvY2VzcyB3aWRlIG1hcC4KICAgICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChmcmFt ZUlELCAqbV9tYWluRnJhbWUpOwotCi0gICAgaWYgKG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVy KSB7Ci0gICAgICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyKCk7Ci0gICAgICAgIG1fbWFp bkZyYW1lQ3JlYXRpb25IYW5kbGVyID0gbnVsbHB0cjsKLSAgICB9CiB9CiAKIHZvaWQgV2ViUGFn ZVByb3h5OjpkaWRDcmVhdGVTdWJmcmFtZSh1aW50NjRfdCBmcmFtZUlEKQpAQCAtMzcyMywxMCAr MzcwMiw2IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVTdWJmcmFtZSh1aW50NjRfdCBm cmFtZUlEKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlV2luZG93KHVpbnQ2NF90IGZy YW1lSUQsIEdsb2JhbFdpbmRvd0lkZW50aWZpZXImJiB3aW5kb3dJZGVudGlmaWVyKQogewotICAg IGlmIChtX21haW5GcmFtZSAmJiBtX21haW5GcmFtZS0+ZnJhbWVJRCgpID09IGZyYW1lSUQpIHsK LSAgICAgICAgaWYgKGF1dG8gbWFpbkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyID0gV1RGTW92 ZShtX21haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlcikpCi0gICAgICAgICAgICBtYWluRnJh bWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIod2luZG93SWRlbnRpZmllcik7Ci0gICAgfQogfQogCiBk b3VibGUgV2ViUGFnZVByb3h5Ojplc3RpbWF0ZWRQcm9ncmVzcygpIGNvbnN0CkBAIC0zNzc5LDYg KzM3NTQsMTAgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZERlc3Ryb3lOYXZpZ2F0aW9uKHVpbnQ2 NF90IG5hdmlnYXRpb25JRCkKIHsKICAgICBQYWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3Rvcihw YWdlQ2xpZW50KCkpOwogCisgICAgLy8gT24gcHJvY2Vzcy1zd2FwLCB0aGUgcHJldmlvdXMgcHJv Y2VzcyB0cmllcyB0byBkZXN0cm95IHRoZSBuYXZpZ2F0aW9uIGJ1dCB0aGUgcHJvdmlzaW9uYWwg cHJvY2VzcyBpcyBhY3R1YWxseSB0YWtpbmcgb3ZlciB0aGUgbmF2aWdhdGlvbi4KKyAgICBpZiAo bV9wcm92aXNpb25hbFBhZ2UgJiYgbV9wcm92aXNpb25hbFBhZ2UtPm5hdmlnYXRpb25JRCgpID09 IG5hdmlnYXRpb25JRCkKKyAgICAgICAgcmV0dXJuOworCiAgICAgLy8gRklYTUU6IE1lc3NhZ2Ug Y2hlY2sgdGhlIG5hdmlnYXRpb25JRC4KICAgICBtX25hdmlnYXRpb25TdGF0ZS0+ZGlkRGVzdHJv eU5hdmlnYXRpb24obmF2aWdhdGlvbklEKTsKIH0KQEAgLTM3OTYsMTQgKzM3NzUsNiBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBm cmFtZUlELCB1aW50NjRfdCBuYQogICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSAmJiBuYXZp Z2F0aW9uSUQpCiAgICAgICAgIG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uU3RhdGUoKS5uYXZpZ2F0 aW9uKG5hdmlnYXRpb25JRCk7CiAKLSAgICAvLyBJZiB0aGlzIHNlZW1pbmdseSBuZXcgbG9hZCBp cyBhY3R1YWxseSBjb250aW51aW5nIGEgc2VydmVyIHJlZGlyZWN0IGZvciBhIHByZXZpb3VzIG5h dmlnYXRpb24gaW4gYSBuZXcgcHJvY2VzcywKLSAgICAvLyB0aGVuIHdlIGlnbm9yZSB0aGlzIG5v dGlmaWNhdGlvbi4KLSAgICBpZiAobmF2aWdhdGlvbiAmJiBuYXZpZ2F0aW9uLT5jdXJyZW50UmVx dWVzdElzUmVkaXJlY3QoKSkgewotICAgICAgICBhdXRvIG5hdmlnYXRpb25Qcm9jZXNzSWRlbnRp ZmllciA9IG5hdmlnYXRpb24tPmN1cnJlbnRSZXF1ZXN0UHJvY2Vzc0lkZW50aWZpZXIoKTsKLSAg ICAgICAgaWYgKG5hdmlnYXRpb25Qcm9jZXNzSWRlbnRpZmllciAmJiAqbmF2aWdhdGlvblByb2Nl c3NJZGVudGlmaWVyICE9IG1fcHJvY2Vzcy0+Y29yZVByb2Nlc3NJZGVudGlmaWVyKCkpCi0gICAg ICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgTE9HKExvYWRpbmcsICJXZWJQYWdlUHJveHkg JSIgUFJJdTY0ICIgaW4gcHJvY2VzcyBwaWQgJWkgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JG cmFtZSB0byBmcmFtZUlEICUiIFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgJSIgUFJJdTY0ICIsIHVy bCAlcyIsIG1fcGFnZUlELCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIGZyYW1lSUQs IG5hdmlnYXRpb25JRCwgdXJsLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgIFJFTEVBU0Vf TE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6 IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCwg bV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCwgZnJhbWVJRCk7CiAKQEAg LTM5MTEsNiArMzg4MiwxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFs TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaQogCiAgICAgUGFnZUNs aWVudFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAorICAgIGlmIChtX3Byb3Zp c2lvbmFsUGFnZSAmJiBtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkgPT0gbmF2aWdh dGlvbklEICYmICZtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2VzcygpICE9IG1fcHJvY2Vzcy5wdHIo KSkgeworICAgICAgICAvLyBUaGUgbG9hZCBkaWQgbm90IGZhaWwsIGl0IG1lcmVseSBoYXBwZW5p bmcgaW4gYSBuZXcgcHJvdmlzaW9uYWwgcHJvY2Vzcy4KKyAgICAgICAgcmV0dXJuOworICAgIH0K KwogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlE KTsKICAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKIApAQCAtMzk0OSw2ICszOTI1LDEwIEBAIHZv aWQgV2ViUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3Qg ZnJhbWVJRCwgY29uc3QgU2VjdXJpCiAgICAgfQogCiAgICAgbV9mYWlsaW5nUHJvdmlzaW9uYWxM b2FkVVJMID0geyB9OworCisgICAgLy8gSWYgdGhlIHByb3Zpc2lvbmFsIHBhZ2UncyBsb2FkIGZh aWxzIHRoZW4gd2UgZGVzdHJveSB0aGUgcHJvdmlzaW9uYWwgcGFnZS4KKyAgICBpZiAobV9wcm92 aXNpb25hbFBhZ2UgJiYgbV9wcm92aXNpb25hbFBhZ2UtPm1haW5GcmFtZSgpID09IGZyYW1lKQor ICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7CiB9CiAKIHZvaWQgV2ViUGFnZVBy b3h5OjpjbGVhckxvYWREZXBlbmRlbnRDYWxsYmFja3MoKQpAQCAtNDM0MCw4ICs0MzIwLDggQEAg dm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYyh1 aW50NjRfdCBmcmFtZUlELCBXZWJDb3IKICAgICBhdXRvKiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2Vi RnJhbWUoZnJhbWVJRCk7CiAgICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CiAKLSAgICBkZWNpZGVQ b2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKCpmcmFtZSwgV1RGTW92ZShmcmFtZVNlY3VyaXR5T3Jp Z2luKSwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb25EYXRhKSwgV1RGTW92 ZShmcmFtZUluZm9EYXRhKSwgb3JpZ2luYXRpbmdQYWdlSUQsIG9yaWdpbmFsUmVxdWVzdCwgV1RG TW92ZShyZXF1ZXN0KSwgV1RGTW92ZShyZXF1ZXN0Qm9keSksIFdURk1vdmUocmVkaXJlY3RSZXNw b25zZSksIHVzZXJEYXRhLCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90 ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySURdIChhdXRvLi4u IGFyZ3MpIHsKLSAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRS ZWNlaXZlUG9saWN5RGVjaXNpb24oZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJncy4uLiksIG1fcGFn ZUlEKTsKKyAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKCpmcmFtZSwgV1RGTW92 ZShmcmFtZVNlY3VyaXR5T3JpZ2luKSwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKG5hdmlnYXRpb25B Y3Rpb25EYXRhKSwgV1RGTW92ZShmcmFtZUluZm9EYXRhKSwgb3JpZ2luYXRpbmdQYWdlSUQsIG9y aWdpbmFsUmVxdWVzdCwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShyZXF1ZXN0Qm9keSksIFdU Rk1vdmUocmVkaXJlY3RSZXNwb25zZSksIHVzZXJEYXRhLCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6 Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxp c3RlbmVySUQsIHByb2Nlc3MgPSBtX3Byb2Nlc3MuY29weVJlZigpXSAoYXV0by4uLiBhcmdzKSB7 CisgICAgICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xp Y3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQpOwogICAg IH0pKTsKIH0KIApAQCAtNDU3NSwxMiArNDU1NSwxMiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVj aWRlUG9saWN5Rm9yUmVzcG9uc2UodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2VjdXJpdHlPcmln aQogICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHJlc3BvbnNlLnVybCgpKTsKIAogICAgIFJlZlB0cjxB UEk6Ok5hdmlnYXRpb24+IG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uSUQgPyBtX25hdmlnYXRpb25T dGF0ZS0+bmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpIDogbnVsbHB0cjsKLSAgICBhdXRvIGxpc3Rl bmVyID0gbWFrZVJlZihmcmFtZS0+c2V0VXBQb2xpY3lMaXN0ZW5lclByb3h5KFt0aGlzLCBwcm90 ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIG5hdmlnYXRp b24gPSBXVEZNb3ZlKG5hdmlnYXRpb24pXSAoV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbiwg QVBJOjpXZWJzaXRlUG9saWNpZXMqLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFJlZlB0cjxTYWZlQnJvd3NpbmdXYXJuaW5nPiYmIHNh ZmVCcm93c2luZ1dhcm5pbmcpIG11dGFibGUgeworICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtlUmVm KGZyYW1lLT5zZXRVcFBvbGljeUxpc3RlbmVyUHJveHkoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBt YWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRCwgbmF2aWdhdGlvbiA9IFdURk1vdmUo bmF2aWdhdGlvbiksIHByb2Nlc3MgPSBtX3Byb2Nlc3MuY29weVJlZigpXSAoV2ViUG9saWN5QWN0 aW9uIHBvbGljeUFjdGlvbiwgQVBJOjpXZWJzaXRlUG9saWNpZXMqLCBQcm9jZXNzU3dhcFJlcXVl c3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFJlZlB0cjxTYWZlQnJv d3NpbmdXYXJuaW5nPiYmIHNhZmVCcm93c2luZ1dhcm5pbmcpIG11dGFibGUgewogICAgICAgICAv LyBGSVhNRTogQXNzZXJ0IHRoZSBBUEk6OldlYnNpdGVQb2xpY2llcyogaXMgbnVsbHB0ciBoZXJl IG9uY2UgY2xpZW50cyBvZiBXS0ZyYW1lUG9saWN5TGlzdGVuZXJVc2VXaXRoUG9saWNpZXMgZ28g YXdheS4KICAgICAgICAgUkVMRUFTRV9BU1NFUlQocHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVu dCA9PSBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50OjpObyk7CiAgICAgICAgIEFTU0VSVF9V TlVTRUQoc2FmZUJyb3dzaW5nV2FybmluZywgIXNhZmVCcm93c2luZ1dhcm5pbmcpOwotICAgICAg ICByZWNlaXZlZFBvbGljeURlY2lzaW9uKHBvbGljeUFjdGlvbiwgbmF2aWdhdGlvbi5nZXQoKSwg V1RGOjpudWxsb3B0LCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0 ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRF0gKGF1 dG8uLi4gYXJncykgewotICAgICAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQ YWdlOjpEaWRSZWNlaXZlUG9saWN5RGVjaXNpb24oZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJncy4u LiksIG1fcGFnZUlEKTsKKyAgICAgICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rp b24sIG5hdmlnYXRpb24uZ2V0KCksIFdURjo6bnVsbG9wdCwgUG9saWN5RGVjaXNpb25TZW5kZXI6 OmNyZWF0ZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGZy YW1lSUQsIGxpc3RlbmVySUQsIHByb2Nlc3MgPSBXVEZNb3ZlKHByb2Nlc3MpXSAoYXV0by4uLiBh cmdzKSB7CisgICAgICAgICAgICBwcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRS ZWNlaXZlUG9saWN5RGVjaXNpb24oZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJncy4uLiksIG1fcGFn ZUlEKTsKICAgICAgICAgfSkpOwogICAgIH0sIFNob3VsZEV4cGVjdFNhZmVCcm93c2luZ1Jlc3Vs dDo6Tm8pKTsKIApAQCAtNjQwMCw2ICs2MzgwLDEzIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpwcm9j ZXNzRGlkVGVybWluYXRlKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbiByZWFzb24pCiAgICAgc3Rv cEFsbFVSTFNjaGVtZVRhc2tzKCk7CiB9CiAKK3ZvaWQgV2ViUGFnZVByb3h5Ojpwcm92aXNpb25h bFByb2Nlc3NEaWRUZXJtaW5hdGUoKQoreworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFnZSk7 CisgICAgbV9wcm92aXNpb25hbFBhZ2UtPmNhbmNlbCgpOworICAgIG1fcHJvdmlzaW9uYWxQYWdl ID0gbnVsbHB0cjsKK30KKwogc3RhdGljIGJvb2wgc2hvdWxkUmVsb2FkQWZ0ZXJQcm9jZXNzVGVy bWluYXRpb24oUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uIHJlYXNvbikKIHsKICAgICBzd2l0Y2gg KHJlYXNvbikgewpAQCAtNjQ4Nyw4ICs2NDc0LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnByb2Nl c3NXaWxsQmVjb21lRm9yZWdyb3VuZCgpCiB2b2lkIFdlYlBhZ2VQcm94eTo6cmVzZXRTdGF0ZShS ZXNldFN0YXRlUmVhc29uIHJlc2V0U3RhdGVSZWFzb24pCiB7CiAgICAgbV9tYWluRnJhbWUgPSBu dWxscHRyOwotICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyID0gbnVsbHB0cjsKLSAgICBt X21haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlciA9IG51bGxwdHI7CiAKICNpZiBQTEFURk9S TShDT0NPQSkKICAgICBtX3Njcm9sbGluZ1BlcmZvcm1hbmNlRGF0YSA9IG51bGxwdHI7CkBAIC02 Nzc5LDYgKzY3NjQsMTAgQEAgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyBXZWJQYWdlUHJveHk6 OmNyZWF0aW9uUGFyYW1ldGVycygpCiAgICAgcGFyYW1ldGVycy5hcHBsaWNhdGlvbk1hbmlmZXN0 ID0gbV9jb25maWd1cmF0aW9uLT5hcHBsaWNhdGlvbk1hbmlmZXN0KCkgPyBPcHRpb25hbDxXZWJD b3JlOjpBcHBsaWNhdGlvbk1hbmlmZXN0PihtX2NvbmZpZ3VyYXRpb24tPmFwcGxpY2F0aW9uTWFu aWZlc3QoKS0+YXBwbGljYXRpb25NYW5pZmVzdCgpKSA6IFdURjo6bnVsbG9wdDsKICNlbmRpZgog CisjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQorICAgIHBhcmFtZXRlcnMuaGFzUmVnaXN0ZXJl ZFNlcnZpY2VXb3JrZXJzID0gcHJvY2VzcygpLnByb2Nlc3NQb29sKCkubWF5SGF2ZVJlZ2lzdGVy ZWRTZXJ2aWNlV29ya2VycyhtX3dlYnNpdGVEYXRhU3RvcmUpOworI2VuZGlmCisKICAgICBwYXJh bWV0ZXJzLm5lZWRzRm9udEF0dHJpYnV0ZXMgPSBtX25lZWRzRm9udEF0dHJpYnV0ZXM7CiAKICAg ICBtX3Byb2Nlc3MtPmFkZFdlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5KG1fdXNlckNvbnRl bnRDb250cm9sbGVyLCBwYXJhbWV0ZXJzKTsKQEAgLTg1NDAsNiArODUyOSwyMSBAQCB2b2lkIFdl YlBhZ2VQcm94eTo6c2ltdWxhdGVEZXZpY2VPcmllbnRhdGlvbkNoYW5nZShkb3VibGUgYWxwaGEs IGRvdWJsZSBiZXRhLCBkbwogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6 U2ltdWxhdGVEZXZpY2VPcmllbnRhdGlvbkNoYW5nZShhbHBoYSwgYmV0YSwgZ2FtbWEpLCBtX3Bh Z2VJRCk7CiB9CiAKK1dlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6UGFnZVByb2Nl c3NPdmVycmlkZShXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYlByb2Nlc3NQcm94eSYgbmV3UHJvY2Vz cykKKyAgICA6IG1fcGFnZSgmcGFnZSkKKyAgICAsIG1fcHJldmlvdXNQcm9jZXNzKHBhZ2UucHJv Y2VzcygpKQoreworICAgIHBhZ2UubV9wcm9jZXNzID0gbmV3UHJvY2VzczsKK30KKworV2ViUGFn ZVByb3h5OjpQYWdlUHJvY2Vzc092ZXJyaWRlOjpQYWdlUHJvY2Vzc092ZXJyaWRlKFBhZ2VQcm9j ZXNzT3ZlcnJpZGUmJikgPSBkZWZhdWx0OworCitXZWJQYWdlUHJveHk6OlBhZ2VQcm9jZXNzT3Zl cnJpZGU6On5QYWdlUHJvY2Vzc092ZXJyaWRlKCkKK3sKKyAgICBpZiAobV9wYWdlKQorICAgICAg ICBtX3BhZ2UtPm1fcHJvY2VzcyA9IFdURk1vdmUobV9wcmV2aW91c1Byb2Nlc3MpOworfQorCiAj aWYgRU5BQkxFKERBVEFfREVURUNUSU9OKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGV0ZWN0RGF0 YUluQWxsRnJhbWVzKFdlYkNvcmU6OkRhdGFEZXRlY3RvclR5cGVzIHR5cGVzLCBDb21wbGV0aW9u SGFuZGxlcjx2b2lkKGNvbnN0IERhdGFEZXRlY3Rpb25SZXN1bHQmKT4mJiBjb21wbGV0aW9uSGFu ZGxlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggZGU5ODY5NGFh MzdkYjNjN2YyY2UyN2NjODI5YTkyMDAyMTFkZTEwZC4uNDU4MmYwYTE3ZmUxMTc4MTY3M2JlYmVj NjVjZmQyYjBlNDVmZjgwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgK QEAgLTIyNSw2ICsyMjUsNyBAQCBjbGFzcyBOYXRpdmVXZWJLZXlib2FyZEV2ZW50OwogY2xhc3Mg TmF0aXZlV2ViTW91c2VFdmVudDsKIGNsYXNzIE5hdGl2ZVdlYldoZWVsRXZlbnQ7CiBjbGFzcyBQ YWdlQ2xpZW50OworY2xhc3MgUHJvdmlzaW9uYWxQYWdlUHJveHk7CiBjbGFzcyBSZW1vdGVMYXll clRyZWVIb3N0OwogY2xhc3MgUmVtb3RlTGF5ZXJUcmVlU2Nyb2xsaW5nUGVyZm9ybWFuY2VEYXRh OwogY2xhc3MgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb247CkBAIC0zNTYsNyArMzU3LDcgQEAg cHVibGljOgogICAgIFdlYkZyYW1lUHJveHkqIGZvY3VzZWRGcmFtZSgpIGNvbnN0IHsgcmV0dXJu IG1fZm9jdXNlZEZyYW1lLmdldCgpOyB9CiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWVTZXRMYXJn ZXN0RnJhbWUoKSBjb25zdCB7IHJldHVybiBtX2ZyYW1lU2V0TGFyZ2VzdEZyYW1lLmdldCgpOyB9 CiAKLSAgICBEcmF3aW5nQXJlYVByb3h5KiBkcmF3aW5nQXJlYSgpIGNvbnN0IHsgcmV0dXJuIG1f ZHJhd2luZ0FyZWEuZ2V0KCk7IH0KKyAgICBEcmF3aW5nQXJlYVByb3h5KiBkcmF3aW5nQXJlYSgp IGNvbnN0OwogCiAgICAgV2ViTmF2aWdhdGlvblN0YXRlJiBuYXZpZ2F0aW9uU3RhdGUoKSB7IHJl dHVybiAqbV9uYXZpZ2F0aW9uU3RhdGUuZ2V0KCk7IH0KIApAQCAtMzc5LDYgKzM4MCw3IEBAIHB1 YmxpYzoKIAogICAgIGJvb2wgYWRkc1Zpc2l0ZWRMaW5rcygpIGNvbnN0IHsgcmV0dXJuIG1fYWRk c1Zpc2l0ZWRMaW5rczsgfQogICAgIHZvaWQgc2V0QWRkc1Zpc2l0ZWRMaW5rcyhib29sIGFkZHNW aXNpdGVkTGlua3MpIHsgbV9hZGRzVmlzaXRlZExpbmtzID0gYWRkc1Zpc2l0ZWRMaW5rczsgfQor ICAgIFZpc2l0ZWRMaW5rU3RvcmUmIHZpc2l0ZWRMaW5rU3RvcmUoKSB7IHJldHVybiBtX3Zpc2l0 ZWRMaW5rU3RvcmU7IH0KIAogICAgIHZvaWQgZXhpdEZ1bGxzY3JlZW5JbW1lZGlhdGVseSgpOwog ICAgIHZvaWQgZnVsbHNjcmVlbk1heVJldHVyblRvSW5saW5lKCk7CkBAIC00NTgsOCArNDYwLDgg QEAgcHVibGljOgogICAgIEFQSTo6SWNvbkxvYWRpbmdDbGllbnQmIGljb25Mb2FkaW5nQ2xpZW50 KCkgeyByZXR1cm4gKm1faWNvbkxvYWRpbmdDbGllbnQ7IH0KICAgICB2b2lkIHNldEljb25Mb2Fk aW5nQ2xpZW50KHN0ZDo6dW5pcXVlX3B0cjxBUEk6Okljb25Mb2FkaW5nQ2xpZW50PiYmKTsKIAot ICAgIGVudW0gY2xhc3MgSXNTd2FwRnJvbVN1c3BlbmRlZCB7IE5vLCBZZXMgfTsKLSAgICB2b2lk IGluaXRpYWxpemVXZWJQYWdlKElzU3dhcEZyb21TdXNwZW5kZWQgPSBJc1N3YXBGcm9tU3VzcGVu ZGVkOjpObyk7CisgICAgdm9pZCBpbml0aWFsaXplV2ViUGFnZSgpOworICAgIHZvaWQgc2V0RHJh d2luZ0FyZWEoc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+JiYpOwogCiAgICAgV2Vh a1B0cjxTZWNLZXlQcm94eVN0b3JlPiBzZWNLZXlQcm94eVN0b3JlKGNvbnN0IFdlYkNvcmU6OkF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJik7CiAgICAgICAgIApAQCAtOTk3LDYgKzk5OSw3IEBAIHB1 YmxpYzoKICAgICB2b2lkIHByb2Nlc3NEaWRCZWNvbWVVbnJlc3BvbnNpdmUoKTsKICAgICB2b2lk IHByb2Nlc3NEaWRCZWNvbWVSZXNwb25zaXZlKCk7CiAgICAgdm9pZCBwcm9jZXNzRGlkVGVybWlu YXRlKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbik7CisgICAgdm9pZCBwcm92aXNpb25hbFByb2Nl c3NEaWRUZXJtaW5hdGUoKTsKICAgICB2b2lkIGRpc3BhdGNoUHJvY2Vzc0RpZFRlcm1pbmF0ZShQ cm9jZXNzVGVybWluYXRpb25SZWFzb24pOwogICAgIHZvaWQgd2lsbENoYW5nZVByb2Nlc3NJc1Jl c3BvbnNpdmUoKTsKICAgICB2b2lkIGRpZENoYW5nZVByb2Nlc3NJc1Jlc3BvbnNpdmUoKTsKQEAg LTEwMjUsNiArMTAyOCwxOSBAQCBwdWJsaWM6CiAgICAgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNz KCkgeyByZXR1cm4gbV9wcm9jZXNzOyB9CiAgICAgUHJvY2Vzc0lEIHByb2Nlc3NJZGVudGlmaWVy KCkgY29uc3Q7CiAKKyAgICBjbGFzcyBQYWdlUHJvY2Vzc092ZXJyaWRlIHsKKyAgICBwdWJsaWM6 CisgICAgICAgIFBhZ2VQcm9jZXNzT3ZlcnJpZGUoV2ViUGFnZVByb3h5JiwgV2ViUHJvY2Vzc1By b3h5JiBuZXdQcm9jZXNzKTsKKyAgICAgICAgUGFnZVByb2Nlc3NPdmVycmlkZShQYWdlUHJvY2Vz c092ZXJyaWRlJiYpOworICAgICAgICB+UGFnZVByb2Nlc3NPdmVycmlkZSgpOworCisgICAgcHJp dmF0ZToKKyAgICAgICAgUmVmUHRyPFdlYlBhZ2VQcm94eT4gbV9wYWdlOworICAgICAgICBSZWY8 V2ViUHJvY2Vzc1Byb3h5PiBtX3ByZXZpb3VzUHJvY2VzczsKKyAgICB9OworCisgICAgUGFnZVBy b2Nlc3NPdmVycmlkZSB0ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhXZWJQcm9jZXNzUHJveHkm IG5ld1Byb2Nlc3MpIHsgcmV0dXJuIFBhZ2VQcm9jZXNzT3ZlcnJpZGUoKnRoaXMsIG5ld1Byb2Nl c3MpOyB9CisKICAgICBXZWJQcmVmZXJlbmNlcyYgcHJlZmVyZW5jZXMoKSB7IHJldHVybiBtX3By ZWZlcmVuY2VzOyB9CiAgICAgdm9pZCBzZXRQcmVmZXJlbmNlcyhXZWJQcmVmZXJlbmNlcyYpOwog CkBAIC0xNDE1LDYgKzE0MzEsMjEgQEAgcHVibGljOgogICAgIEVkaXRhYmxlSW1hZ2VDb250cm9s bGVyJiBlZGl0YWJsZUltYWdlQ29udHJvbGxlcigpIHsgcmV0dXJuICptX2VkaXRhYmxlSW1hZ2VD b250cm9sbGVyOyB9CiAjZW5kaWYKIAorICAgIFByb3Zpc2lvbmFsUGFnZVByb3h5KiBwcm92aXNp b25hbFBhZ2VQcm94eSgpIGNvbnN0IHsgcmV0dXJuIG1fcHJvdmlzaW9uYWxQYWdlLmdldCgpOyB9 CisgICAgdm9pZCBjb21taXRQcm92aXNpb25hbFBhZ2UodWludDY0X3QgZnJhbWVJRCwgdWludDY0 X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3Vz dG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3Jl OjpDZXJ0aWZpY2F0ZUluZm8mLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFs PFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBj b25zdCBVc2VyRGF0YSYpOworCisgICAgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYsIFVSTCYm IHVucmVhY2hhYmxlVVJMLCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkRmFpbFByb3Zp c2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3Vy aXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklE LCBjb25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJMLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVy cm9yJiwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2b2lkIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVj dEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5h dmlnYXRpb25JRCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIGNvbnN0IFVzZXJEYXRhJik7 CisKKyAgICB2b2lkIGxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgY29u c3QgSVBDOjpEYXRhUmVmZXJlbmNlJiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3Ry aW5nJiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRh dGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0 ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7CisgICAgdm9pZCBsb2FkUmVxdWVzdFdp dGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYm LCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNl ckRhdGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vi c2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7CisKKyAgICAvLyBJUEM6Ok1lc3Nh Z2VSZWNlaXZlcgorICAgIC8vIEltcGxlbWVudGVkIGluIGdlbmVyYXRlZCBXZWJQYWdlUHJveHlN ZXNzYWdlUmVjZWl2ZXIuY3BwCisgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5l Y3Rpb24mLCBJUEM6OkRlY29kZXImKSBvdmVycmlkZTsKKyAgICB2b2lkIGRpZFJlY2VpdmVTeW5j TWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImLCBzdGQ6OnVuaXF1ZV9wdHI8 SVBDOjpFbmNvZGVyPiYpIG92ZXJyaWRlOworCiBwcml2YXRlOgogICAgIFdlYlBhZ2VQcm94eShQ YWdlQ2xpZW50JiwgV2ViUHJvY2Vzc1Byb3h5JiwgdWludDY0X3QgcGFnZUlELCBSZWY8QVBJOjpQ YWdlQ29uZmlndXJhdGlvbj4mJik7CiAgICAgdm9pZCBwbGF0Zm9ybUluaXRpYWxpemUoKTsKQEAg LTE0MzksMTIgKzE0NzAsNiBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBzZXRVc2VyQWdlbnQoU3Ry aW5nJiYpOwogCi0gICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKLSAgICAvLyBJbXBsZW1lbnRl ZCBpbiBnZW5lcmF0ZWQgV2ViUGFnZVByb3h5TWVzc2FnZVJlY2VpdmVyLmNwcAotICAgIHZvaWQg ZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgb3ZlcnJp ZGU7Ci0gICAgdm9pZCBkaWRSZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBD OjpEZWNvZGVyJiwgc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mKSBvdmVycmlkZTsKLQot CiAgICAgLy8gSVBDOjpNZXNzYWdlU2VuZGVyCiAgICAgYm9vbCBzZW5kTWVzc2FnZShzdGQ6OnVu aXF1ZV9wdHI8SVBDOjpFbmNvZGVyPiwgT3B0aW9uU2V0PElQQzo6U2VuZE9wdGlvbj4pIG92ZXJy aWRlOwogICAgIElQQzo6Q29ubmVjdGlvbiogbWVzc2FnZVNlbmRlckNvbm5lY3Rpb24oKSBvdmVy cmlkZTsKQEAgLTE0NjYsMTIgKzE0OTEsOSBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlkQ3JlYXRl U3ViZnJhbWUodWludDY0X3QgZnJhbWVJRCk7CiAgICAgdm9pZCBkaWRDcmVhdGVXaW5kb3codWlu dDY0X3QgZnJhbWVJRCwgV2ViQ29yZTo6R2xvYmFsV2luZG93SWRlbnRpZmllciYmKTsKIAotICAg IHZvaWQgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1 aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3Qg VXNlckRhdGEmKTsKLSAgICB2b2lkIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lv bmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwg V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIGNvbnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCB3 aWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3Qg U3RyaW5nJiB1cmwsIGRvdWJsZSBkZWxheSwgV2ViQ29yZTo6TG9ja0JhY2tGb3J3YXJkTGlzdCk7 CiAgICAgdm9pZCBkaWRDYW5jZWxDbGllbnRSZWRpcmVjdEZvckZyYW1lKHVpbnQ2NF90IGZyYW1l SUQpOwogICAgIHZvaWQgZGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZSh1aW50NjRfdCBm cmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmKTsKLSAgICB2b2lkIGRpZEZhaWxQ cm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpT ZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRp b25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3Vy Y2VFcnJvciYsIGNvbnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCBkaWRDb21taXRMb2FkRm9yRnJh bWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcm IG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBm cmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mLCBib29sIGNvbnRh aW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4g Zm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlk RmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2 aWdhdGlvbklELCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkRmluaXNoTG9hZEZvckZy YW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgVXNlckRh dGEmKTsKQEAgLTE1NzUsMTggKzE1OTcsMTYgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldENhblNo b3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50cyhib29sIGNhblNob3J0Q2lyY3VpdEhvcml6 b250YWxXaGVlbEV2ZW50cykgeyBtX2NhblNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50 cyA9IGNhblNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50czsgfQogCiAgICAgdm9pZCBy ZWF0dGFjaFRvV2ViUHJvY2VzcygpOwotICAgIHZvaWQgc3dhcFRvV2ViUHJvY2VzcyhSZWY8V2Vi UHJvY2Vzc1Byb3h5PiYmLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmLCBJ c1N3YXBGcm9tU3VzcGVuZGVkKTsKKyAgICB2b2lkIHN3YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlBy b2Nlc3NQcm94eT4mJiwgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+JiYsIFJlZlB0 cjxXZWJGcmFtZVByb3h5PiYmIG1haW5GcmFtZSk7CiAgICAgdm9pZCBkaWRGYWlsVG9TdXNwZW5k QWZ0ZXJQcm9jZXNzU3dhcCgpOwogICAgIHZvaWQgZGlkU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAo KTsKIAotICAgIHZvaWQgZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKElzU3dhcEZyb21TdXNw ZW5kZWQgPSBJc1N3YXBGcm9tU3VzcGVuZGVkOjpObyk7CisgICAgZW51bSBjbGFzcyBTaG91bGRJ bml0aWFsaXplV2ViUGFnZSB7IE5vLCBZZXMgfTsKKyAgICB2b2lkIGZpbmlzaEF0dGFjaGluZ1Rv V2ViUHJvY2VzcyhTaG91bGRJbml0aWFsaXplV2ViUGFnZSA9IFNob3VsZEluaXRpYWxpemVXZWJQ YWdlOjpZZXMpOwogCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVhdHRhY2hUb1dlYlBy b2Nlc3NGb3JSZWxvYWQoKTsKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiByZWF0dGFjaFRv V2ViUHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKTsKIAotICAgIHZvaWQg bG9hZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBjb25zdCBJUEM6OkRhdGFS ZWZlcmVuY2UmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5n LCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6 U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRh PiYmID0gV1RGOjpudWxsb3B0KTsKLSAgICB2b2lkIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24o QVBJOjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlNo b3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29y ZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNE YXRhPiYmID0gV1RGOjpudWxsb3B0KTsKLQogICAgIHZvaWQgcmVxdWVzdE5vdGlmaWNhdGlvblBl cm1pc3Npb24odWludDY0X3Qgbm90aWZpY2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3Ry aW5nKTsKICAgICB2b2lkIHNob3dOb3RpZmljYXRpb24oY29uc3QgU3RyaW5nJiB0aXRsZSwgY29u c3QgU3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcmIGljb25VUkwsIGNvbnN0IFN0cmluZyYgdGFn LCBjb25zdCBTdHJpbmcmIGxhbmcsIFdlYkNvcmU6Ok5vdGlmaWNhdGlvbkRpcmVjdGlvbiwgY29u c3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsKICAgICB2 b2lkIGNhbmNlbE5vdGlmaWNhdGlvbih1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CkBAIC0xOTUy LDggKzE5NzIsNiBAQCBwcml2YXRlOgogICAgIFJlZjxXZWJzaXRlRGF0YVN0b3JlPiBtX3dlYnNp dGVEYXRhU3RvcmU7CiAKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9tYWluRnJhbWU7Ci0g ICAgRnVuY3Rpb248dm9pZCgpPiBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlcjsKLSAgICBGdW5j dGlvbjx2b2lkKGNvbnN0IFdlYkNvcmU6Okdsb2JhbFdpbmRvd0lkZW50aWZpZXImKT4gbV9tYWlu RnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXI7CiAKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4g bV9mb2N1c2VkRnJhbWU7CiAgICAgUmVmUHRyPFdlYkZyYW1lUHJveHk+IG1fZnJhbWVTZXRMYXJn ZXN0RnJhbWU7CkBAIC0yMzI0LDYgKzIzNDIsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9uZWVk c0ZvbnRBdHRyaWJ1dGVzIHsgZmFsc2UgfTsKICAgICBib29sIG1fbWF5SGF2ZVVuaXZlcnNhbEZp bGVSZWFkU2FuZGJveEV4dGVuc2lvbiB7IGZhbHNlIH07CiAKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8 UHJvdmlzaW9uYWxQYWdlUHJveHk+IG1fcHJvdmlzaW9uYWxQYWdlOworCiAjaWYgSEFWRShQRU5D SUxLSVQpCiAgICAgc3RkOjp1bmlxdWVfcHRyPEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyPiBtX2Vk aXRhYmxlSW1hZ2VDb250cm9sbGVyOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUHJvY2Vzc1Byb3h5LmNwcAppbmRleCBkYjFmZDU4YjkzZGZmNTg2NWQxM2ZjNTQxYjZlNWQ4 NzQ2ZWI4ZTBhLi42YmU5ZGMzOTllMDE0ODhkYTY3OGZiNDU2OGVmMzZiMjFmM2M0ODc2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKQEAgLTM0LDYgKzM0 LDcgQEAKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiUGx1Z2luSW5mb1N0b3JlLmgi CiAjaW5jbHVkZSAiUGx1Z2luUHJvY2Vzc01hbmFnZXIuaCIKKyNpbmNsdWRlICJQcm92aXNpb25h bFBhZ2VQcm94eS5oIgogI2luY2x1ZGUgIlRleHRDaGVja2VyLmgiCiAjaW5jbHVkZSAiVGV4dENo ZWNrZXJTdGF0ZS5oIgogI2luY2x1ZGUgIlVJTWVzc2FnZVBvcnRDaGFubmVsUHJvdmlkZXIuaCIK QEAgLTU4NCw2ICs1ODUsMTUgQEAgYm9vbCBXZWJQcm9jZXNzUHJveHk6OmZ1bGxLZXlib2FyZEFj Y2Vzc0VuYWJsZWQoKQogfQogI2VuZGlmCiAKK2Jvb2wgV2ViUHJvY2Vzc1Byb3h5OjpoYXNQcm92 aXNpb25hbFBhZ2VXaXRoSUQodWludDY0X3QgcGFnZUlEKSBjb25zdAoreworICAgIGZvciAoYXV0 byogcHJvdmlzaW9uYWxQYWdlIDogbV9wcm92aXNpb25hbFBhZ2VzKSB7CisgICAgICAgIGlmIChw cm92aXNpb25hbFBhZ2UtPnBhZ2UoKS5wYWdlSUQoKSA9PSBwYWdlSUQpCisgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorCiB2b2lkIFdlYlByb2Nl c3NQcm94eTo6dXBkYXRlQmFja0ZvcndhcmRJdGVtKGNvbnN0IEJhY2tGb3J3YXJkTGlzdEl0ZW1T dGF0ZSYgaXRlbVN0YXRlKQogewogICAgIGlmIChhdXRvKiBpdGVtID0gV2ViQmFja0ZvcndhcmRM aXN0SXRlbTo6aXRlbUZvcklEKGl0ZW1TdGF0ZS5pZGVudGlmaWVyKSkgewpAQCAtNTkxLDcgKzYw MSw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojp1cGRhdGVCYWNrRm9yd2FyZEl0ZW0oY29uc3Qg QmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlJiBpdGVtCiAgICAgICAgIC8vIHRoZSBiYWNrL2Zvcndh cmQgaXRlbXMgcGFnZS4KICAgICAgICAgLy8gZS5nLiBUaGUgb2xkIHdlYiBwcm9jZXNzIGlzIG5h dmlnYXRpbmcgdG8gYWJvdXQ6YmxhbmsgZm9yIHN1c3BlbnNpb24uCiAgICAgICAgIC8vIFdlIGln bm9yZSB0aGVzZSB1cGRhdGVzLgotICAgICAgICBpZiAobV9wYWdlTWFwLmNvbnRhaW5zKGl0ZW0t PnBhZ2VJRCgpKSkKKyAgICAgICAgaWYgKG1fcGFnZU1hcC5jb250YWlucyhpdGVtLT5wYWdlSUQo KSkgfHwgaGFzUHJvdmlzaW9uYWxQYWdlV2l0aElEKGl0ZW0tPnBhZ2VJRCgpKSkKICAgICAgICAg ICAgIGl0ZW0tPnNldFBhZ2VTdGF0ZShpdGVtU3RhdGUucGFnZVN0YXRlKTsKICAgICB9CiB9CkBA IC02OTQsNiArNzA0LDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OnByb2Nlc3NEaWRUZXJtaW5h dGVPckZhaWxlZFRvTGF1bmNoKCkKICAgICAgICAgd2ViQ29ubmVjdGlvbi0+ZGlkQ2xvc2UoKTsK IAogICAgIGF1dG8gcGFnZXMgPSBjb3B5VG9WZWN0b3JPZjxSZWZQdHI8V2ViUGFnZVByb3h5Pj4o bV9wYWdlTWFwLnZhbHVlcygpKTsKKyAgICBhdXRvIHByb3Zpc2lvbmFsUGFnZXMgPSBXVEY6Om1h cChtX3Byb3Zpc2lvbmFsUGFnZXMsIFtdKGF1dG8qIHByb3Zpc2lvbmFsUGFnZSkgeyByZXR1cm4g bWFrZVdlYWtQdHIocHJvdmlzaW9uYWxQYWdlKTsgfSk7CiAKICAgICBzaHV0RG93bigpOwogCkBA IC03MDgsNiArNzE5LDExIEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojpwcm9jZXNzRGlkVGVybWlu YXRlT3JGYWlsZWRUb0xhdW5jaCgpCiAKICAgICBmb3IgKGF1dG8mIHBhZ2UgOiBwYWdlcykKICAg ICAgICAgcGFnZS0+cHJvY2Vzc0RpZFRlcm1pbmF0ZShQcm9jZXNzVGVybWluYXRpb25SZWFzb246 OkNyYXNoKTsKKworICAgIGZvciAoYXV0byYgcHJvdmlzaW9uYWxQYWdlIDogcHJvdmlzaW9uYWxQ YWdlcykgeworICAgICAgICBpZiAocHJvdmlzaW9uYWxQYWdlKQorICAgICAgICAgICAgcHJvdmlz aW9uYWxQYWdlLT5wcm9jZXNzRGlkVGVybWluYXRlKCk7CisgICAgfQogfQogCiB2b2lkIFdlYlBy b2Nlc3NQcm94eTo6ZGlkUmVjZWl2ZUludmFsaWRNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYgY29u bmVjdGlvbiwgSVBDOjpTdHJpbmdSZWZlcmVuY2UgbWVzc2FnZVJlY2VpdmVyTmFtZSwgSVBDOjpT dHJpbmdSZWZlcmVuY2UgbWVzc2FnZU5hbWUpCkBAIC03ODAsNiArNzk2LDEyIEBAIHZvaWQgV2Vi UHJvY2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVuY2hpbmcoUHJvY2Vzc0xhdW5jaGVyKiBsYXVuY2hl ciwgSVBDOjpDb25uZWN0CiAgICAgICAgIHBhZ2UtPnByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmco KTsKICAgICB9CiAKKyAgICBmb3IgKGF1dG8qIHByb3Zpc2lvbmFsUGFnZSA6IG1fcHJvdmlzaW9u YWxQYWdlcykgeworICAgICAgICBBU1NFUlQodGhpcyA9PSAmcHJvdmlzaW9uYWxQYWdlLT5wcm9j ZXNzKCkpOworICAgICAgICBwcm92aXNpb25hbFBhZ2UtPnByb2Nlc3NEaWRGaW5pc2hMYXVuY2hp bmcoKTsKKyAgICB9CisKKwogICAgIFJFTEVBU0VfQVNTRVJUKCFtX3dlYkNvbm5lY3Rpb24pOwog ICAgIG1fd2ViQ29ubmVjdGlvbiA9IFdlYkNvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmNyZWF0ZSh0 aGlzKTsKIApAQCAtODczLDcgKzg5NSw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjptYXliZVNo dXREb3duKCkKIAogYm9vbCBXZWJQcm9jZXNzUHJveHk6OmNhblRlcm1pbmF0ZUNoaWxkUHJvY2Vz cygpCiB7Ci0gICAgaWYgKCFtX3BhZ2VNYXAuaXNFbXB0eSgpIHx8IG1fcHJvY2Vzc1Bvb2wtPmhh c1N1c3BlbmRlZFBhZ2VGb3IoKnRoaXMpKQorICAgIGlmICghbV9wYWdlTWFwLmlzRW1wdHkoKSB8 fCBtX3Byb2Nlc3NQb29sLT5oYXNTdXNwZW5kZWRQYWdlRm9yKCp0aGlzKSB8fCAhbV9wcm92aXNp b25hbFBhZ2VzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKCFt X3Byb2Nlc3NQb29sLT5zaG91bGRUZXJtaW5hdGUodGhpcykpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQcm94eS5oCmluZGV4IDc1ZjY1YTdmN2ViMWFjYzgxOTk5MWNlNGY5ZjY5 ODZjOTViNjFmZjMuLjUwNDI2MzBkZTM3MWQ4NWE4MjgzNzQzNDhhYTk2OTE3MzljOWNkNzAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCkBAIC03MCw2ICs3MCw3 IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgTmV0d29ya1Byb2Nlc3NQcm94eTsKIGNsYXNz IE9iakNPYmplY3RHcmFwaDsKIGNsYXNzIFBhZ2VDbGllbnQ7CitjbGFzcyBQcm92aXNpb25hbFBh Z2VQcm94eTsKIGNsYXNzIFVzZXJNZWRpYUNhcHR1cmVNYW5hZ2VyUHJveHk7CiBjbGFzcyBWaXNp dGVkTGlua1N0b3JlOwogY2xhc3MgV2ViQmFja0ZvcndhcmRMaXN0SXRlbTsKQEAgLTEyNCw2ICsx MjUsOSBAQCBwdWJsaWM6CiAgICAgZW51bSBjbGFzcyBFbmRzVXNpbmdEYXRhU3RvcmUgOiBib29s IHsgTm8sIFllcyB9OwogICAgIHZvaWQgcmVtb3ZlV2ViUGFnZShXZWJQYWdlUHJveHkmLCB1aW50 NjRfdCBwYWdlSUQsIEVuZHNVc2luZ0RhdGFTdG9yZSk7CiAKKyAgICB2b2lkIGFkZFByb3Zpc2lv bmFsUGFnZVByb3h5KFByb3Zpc2lvbmFsUGFnZVByb3h5JiBwcm92aXNpb25hbFBhZ2UpIHsgQVNT RVJUKCFtX3Byb3Zpc2lvbmFsUGFnZXMuY29udGFpbnMoJnByb3Zpc2lvbmFsUGFnZSkpOyBtX3By b3Zpc2lvbmFsUGFnZXMuYWRkKCZwcm92aXNpb25hbFBhZ2UpOyB9CisgICAgdm9pZCByZW1vdmVQ cm92aXNpb25hbFBhZ2VQcm94eShQcm92aXNpb25hbFBhZ2VQcm94eSYgcHJvdmlzaW9uYWxQYWdl KSB7IEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFnZXMuY29udGFpbnMoJnByb3Zpc2lvbmFsUGFnZSkp OyBtX3Byb3Zpc2lvbmFsUGFnZXMucmVtb3ZlKCZwcm92aXNpb25hbFBhZ2UpOyB9CisKICAgICB0 eXBlbmFtZSBXZWJQYWdlUHJveHlNYXA6OlZhbHVlc0NvbnN0SXRlcmF0b3JSYW5nZSBwYWdlcygp IGNvbnN0IHsgcmV0dXJuIG1fcGFnZU1hcC52YWx1ZXMoKTsgfQogICAgIHVuc2lnbmVkIHBhZ2VD b3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZU1hcC5zaXplKCk7IH0KICAgICB1bnNpZ25lZCB2 aXNpYmxlUGFnZUNvdW50KCkgY29uc3QgeyByZXR1cm4gbV92aXNpYmxlUGFnZUNvdW50ZXIudmFs dWUoKTsgfQpAQCAtMzMwLDYgKzMzNCw4IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGxvZ0RpYWdu b3N0aWNNZXNzYWdlRm9yUmVzb3VyY2VMaW1pdFRlcm1pbmF0aW9uKGNvbnN0IFN0cmluZyYgbGlt aXRLZXkpOwogCisgICAgYm9vbCBoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQodWludDY0X3QgcGFn ZUlEKSBjb25zdDsKKwogICAgIGVudW0gY2xhc3MgSXNXZWFrIHsgTm8sIFllcyB9OwogICAgIHRl bXBsYXRlPHR5cGVuYW1lIFQ+IGNsYXNzIFdlYWtPclN0cm9uZ1B0ciB7CiAgICAgcHVibGljOgpA QCAtMzczLDYgKzM3OSw3IEBAIHByaXZhdGU6CiAKICAgICBXZWJQYWdlUHJveHlNYXAgbV9wYWdl TWFwOwogICAgIFdlYkZyYW1lUHJveHlNYXAgbV9mcmFtZU1hcDsKKyAgICBIYXNoU2V0PFByb3Zp c2lvbmFsUGFnZVByb3h5Kj4gbV9wcm92aXNpb25hbFBhZ2VzOwogICAgIFVzZXJJbml0aWF0ZWRB Y3Rpb25NYXAgbV91c2VySW5pdGlhdGVkQWN0aW9uTWFwOwogCiAgICAgSGFzaFNldDxWaXNpdGVk TGlua1N0b3JlKj4gbV92aXNpdGVkTGlua1N0b3JlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViS2l0L1dlYktp dC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IGRlZGJhZGNjZDM0ZjBhNDM0ZDZkZTE0 NTRjNDRhOTg5MjJjYTAxY2QuLmQ3ZGEyN2EwNTEyODllN2U1MWY0OGUyYzllY2E3OWZhODkxMTI0 NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oKKysrIGIvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agpAQCAtMzA3MCw2ICszMDcwLDggQEAKIAkJNDY2QkMwMzgxRkEyNjZDOTAwMkZBOUMxIC8qIFdl YlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw LmNwcDsgcGF0aCA9IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDY2QkMwMzkxRkEyNjZDOTAwMkZBOUMxIC8qIFdlYlNXQ29u dGV4dE1hbmFnZXJDb25uZWN0aW9uLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCTQ2NkJDMDNBMUZBMjY2QzkwMDJGQTlDMSAvKiBXZWJTV0NvbnRleHRNYW5hZ2VyQ29u bmVjdGlvbi5tZXNzYWdlcy5pbiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7IHBhdGggPSBXZWJTV0NvbnRleHRN YW5hZ2VyQ29ubmVjdGlvbi5tZXNzYWdlcy5pbjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK KwkJNDY4MzU2OUEyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFByb3Zpc2lvbmFsUGFnZVByb3h5Lmg7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTQ2ODM1NjlCMjFFODFDQzcwMDZFMjdBMyAvKiBQ cm92aXNpb25hbFBhZ2VQcm94eS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBh dGggPSBQcm92aXNpb25hbFBhZ2VQcm94eS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTQ2QTJCNjA2MUU1Njc1QTIwMEMzREVEQSAvKiBCYWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNp dmVuZXNzVGltZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gQmFj a2dyb3VuZFByb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJNDZBMkI2MDcxRTU2NzVBMjAwQzNERURBIC8qIEJhY2tncm91bmRQcm9jZXNz UmVzcG9uc2l2ZW5lc3NUaW1lci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBC YWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVuZXNzVGltZXIuaDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJNDZERjA2MzkxRjM5MDVFNTAwMTk4MEJCIC8qIE5ldHdvcmtDT1JTUHJlZmxp Z2h0Q2hlY2tlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBOZXR3 b3JrQ09SU1ByZWZsaWdodENoZWNrZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpA QCAtNzMxMiw2ICs3MzE0LDggQEAKIAkJCQk4NkU2N0EyMjE5MEY0MTE4MDAwMDRBQjcgLyogUHJv Y2Vzc1Rocm90dGxlci5jcHAgKi8sCiAJCQkJODZFNjdBMjExOTBGNDExODAwMDA0QUI3IC8qIFBy b2Nlc3NUaHJvdHRsZXIuaCAqLywKIAkJCQk4MzA0OEFFNTFBQ0E0NURDMDA4MkM4MzIgLyogUHJv Y2Vzc1Rocm90dGxlckNsaWVudC5oICovLAorCQkJCTQ2ODM1NjlCMjFFODFDQzcwMDZFMjdBMyAv KiBQcm92aXNpb25hbFBhZ2VQcm94eS5jcHAgKi8sCisJCQkJNDY4MzU2OUEyMUU4MUNDNzAwNkUy N0EzIC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmggKi8sCiAJCQkJQTU1QkE4MUIxQkEyNUIxRTAw N0NEMzNEIC8qIFJlbW90ZVdlYkluc3BlY3RvclByb3h5LmNwcCAqLywKIAkJCQlBNTVCQTgxOTFC QTI1QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkuaCAqLywKIAkJCQlBNTVC QTgxQTFCQTI1QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkubWVzc2FnZXMu aW4gKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJG cmFtZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAK aW5kZXggMDA3NDliNDc3YTI0Y2U4Y2NjODI1MDFkOTRlMDhiNjBlZTFhNjI2My4uZmZlZDAwYzgy MDZhOTRmMGU0ZmZjN2ZmM2E4YTlkZmY4NjEzZmFjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcApAQCAtMjYzLDggKzI2Myw2IEBAIHN0YXRpYyBX ZWJDb3JlOjpQb2xpY3lBY3Rpb24gdG9Qb2xpY3lBY3Rpb24oV2ViUG9saWN5QWN0aW9uIHBvbGlj eUFjdGlvbikKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6SWdub3JlOwog ICAgIGNhc2UgV2ViUG9saWN5QWN0aW9uOjpEb3dubG9hZDoKICAgICAgICAgcmV0dXJuIFdlYkNv cmU6OlBvbGljeUFjdGlvbjo6RG93bmxvYWQ7Ci0gICAgY2FzZSBXZWJQb2xpY3lBY3Rpb246OlN1 c3BlbmQ6Ci0gICAgICAgIGJyZWFrOwogICAgIH0KICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK ICAgICByZXR1cm4gV2ViQ29yZTo6UG9saWN5QWN0aW9uOjpJZ25vcmU7CkBAIC0yNzIsMTEgKzI3 MCw4IEBAIHN0YXRpYyBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gdG9Qb2xpY3lBY3Rpb24oV2ViUG9s aWN5QWN0aW9uIHBvbGljeUFjdGlvbikKIAogdm9pZCBXZWJGcmFtZTo6ZGlkUmVjZWl2ZVBvbGlj eURlY2lzaW9uKHVpbnQ2NF90IGxpc3RlbmVySUQsIFdlYlBvbGljeUFjdGlvbiBhY3Rpb24sIHVp bnQ2NF90IG5hdmlnYXRpb25JRCwgRG93bmxvYWRJRCBkb3dubG9hZElELCBPcHRpb25hbDxXZWJz aXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKIHsKLSAgICBpZiAoIW1fY29yZUZy YW1lIHx8ICFtX3BvbGljeUxpc3RlbmVySUQgfHwgbGlzdGVuZXJJRCAhPSBtX3BvbGljeUxpc3Rl bmVySUQgfHwgIW1fcG9saWN5RnVuY3Rpb24pIHsKLSAgICAgICAgaWYgKGFjdGlvbiA9PSBXZWJQ b2xpY3lBY3Rpb246OlN1c3BlbmQpCi0gICAgICAgICAgICBwYWdlKCktPnNlbmQoTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6RGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAoKSk7CisgICAg aWYgKCFtX2NvcmVGcmFtZSB8fCAhbV9wb2xpY3lMaXN0ZW5lcklEIHx8IGxpc3RlbmVySUQgIT0g bV9wb2xpY3lMaXN0ZW5lcklEIHx8ICFtX3BvbGljeUZ1bmN0aW9uKQogICAgICAgICByZXR1cm47 Ci0gICAgfQogCiAgICAgRnJhbWVQb2xpY3lGdW5jdGlvbiBmdW5jdGlvbiA9IFdURk1vdmUobV9w b2xpY3lGdW5jdGlvbik7CiAgICAgYm9vbCBmb3JOYXZpZ2F0aW9uQWN0aW9uID0gbV9wb2xpY3lG dW5jdGlvbkZvck5hdmlnYXRpb25BY3Rpb24gPT0gRm9yTmF2aWdhdGlvbkFjdGlvbjo6WWVzOwpA QCAtMjkyLDE2ICsyODcsNyBAQCB2b2lkIFdlYkZyYW1lOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNp b24odWludDY0X3QgbGlzdGVuZXJJRCwgV2ViUG9saWN5QWN0aW9uIGFjdAogICAgICAgICAgICAg ZG9jdW1lbnRMb2FkZXItPnNldE5hdmlnYXRpb25JRChuYXZpZ2F0aW9uSUQpOwogICAgIH0KIAot ICAgIGJvb2wgc2hvdWxkU3VzcGVuZCA9IGZhbHNlOwotICAgIGlmIChhY3Rpb24gPT0gV2ViUG9s aWN5QWN0aW9uOjpTdXNwZW5kKSB7Ci0gICAgICAgIHNob3VsZFN1c3BlbmQgPSB0cnVlOwotICAg ICAgICBhY3Rpb24gPSBXZWJQb2xpY3lBY3Rpb246Oklnbm9yZTsKLSAgICB9Ci0KICAgICBmdW5j dGlvbih0b1BvbGljeUFjdGlvbihhY3Rpb24pKTsKLQotICAgIGlmIChzaG91bGRTdXNwZW5kKQot ICAgICAgICBwYWdlKCktPnN1c3BlbmRGb3JQcm9jZXNzU3dhcCgpOwogfQogCiB2b2lkIFdlYkZy YW1lOjpzdGFydERvd25sb2FkKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVz dCwgY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWROYW1lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCA4MDNiYThiOTk1ZWQzZWM4MzFhYjQ2YjUzOTdj NzY2MmU2YTgxYzY1Li4xMGU1YTc3MjMzYzk1NzY4MTJhMzA5N2UwODNhMTVmOTAwZmRlYmUzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtNDAx LDcgKzQwMSw3IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBXZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICAsIG1fb3ZlcnJpZGVDb250ZW50U2Vj dXJpdHlQb2xpY3kgeyBwYXJhbWV0ZXJzLm92ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5IH0K ICAgICAsIG1fY3B1TGltaXQocGFyYW1ldGVycy5jcHVMaW1pdCkKICNpZiBQTEFURk9STShNQUMp Ci0gICAgLCBtX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNpdGlvbihwYXJhbWV0 ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQpCisgICAgLCBtX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVh T25QYWdlVHJhbnNpdGlvbihwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXApCiAjZW5kaWYKIHsKICAg ICBBU1NFUlQobV9wYWdlSUQpOwpAQCAtNDcxLDggKzQ3MSw4IEBAIFdlYlBhZ2U6OldlYlBhZ2Uo dWludDY0X3QgcGFnZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykK ICAgICBtX2RyYXdpbmdBcmVhLT5zZXRQYWludGluZ0VuYWJsZWQoZmFsc2UpOwogICAgIG1fZHJh d2luZ0FyZWEtPnNldFNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQocGFyYW1ldGVycy5zaG91 bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50KTsKIAotICAgIGlmIChwYXJhbWV0ZXJzLmlzU3dhcEZy b21TdXNwZW5kZWQpCi0gICAgICAgIGZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFz b246OlN3YXBGcm9tU3VzcGVuZGVkKTsKKyAgICBpZiAocGFyYW1ldGVycy5pc1Byb2Nlc3NTd2Fw KQorICAgICAgICBmcmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29uOjpQcm9jZXNz U3dhcCk7CiAKICNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKQogICAgIG1fdXNlQXN5bmNTY3Jv bGxpbmcgPSBwYXJhbWV0ZXJzLnN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNl c0tleTo6dGhyZWFkZWRTY3JvbGxpbmdFbmFibGVkS2V5KCkpOwpAQCAtNjk2LDcgKzY5Niw3IEBA IHZvaWQgV2ViUGFnZTo6cmVpbml0aWFsaXplV2ViUGFnZShXZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzJiYgcGFyYW1ldGVycykKICAgICAgICAgbV9kcmF3aW5nQXJlYS0+dXBkYXRlUHJlZmVyZW5j ZXMocGFyYW1ldGVycy5zdG9yZSk7CiAgICAgICAgIG1fZHJhd2luZ0FyZWEtPnNldFBhaW50aW5n RW5hYmxlZCh0cnVlKTsKICNpZiBQTEFURk9STShNQUMpCi0gICAgICAgIG1fc2hvdWxkQXR0YWNo RHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uID0gcGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVu ZGVkOworICAgICAgICBtX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNpdGlvbiA9 IHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcDsKICNlbmRpZgogICAgICAgICB1bmZyZWV6ZUxheWVy VHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlBhZ2VTdXNwZW5kZWQpOwogICAgIH0KQEAgLTMw NTMsMTIgKzMwNTMsNiBAQCB2b2lkIFdlYlBhZ2U6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1 aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBsaXN0ZW5lcklELCBXZQogICAgIFdlYkZyYW1lKiBm cmFtZSA9IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLndlYkZyYW1lKGZyYW1lSUQpOwogICAgIGlm ICghZnJhbWUpCiAgICAgICAgIHJldHVybjsKLSAgICBpZiAocG9saWN5QWN0aW9uID09IFdlYlBv bGljeUFjdGlvbjo6U3VzcGVuZCkgewotICAgICAgICBBU1NFUlQoZnJhbWUgPT0gbV9tYWluRnJh bWUpOwotICAgICAgICBzZXRJc1N1c3BlbmRlZCh0cnVlKTsKLQotICAgICAgICBXZWJQcm9jZXNz OjpzaW5nbGV0b24oKS5zZW5kUHJld2FybUluZm9ybWF0aW9uKG1haW5XZWJGcmFtZSgpLT51cmwo KSk7Ci0gICAgfQogICAgIGZyYW1lLT5kaWRSZWNlaXZlUG9saWN5RGVjaXNpb24obGlzdGVuZXJJ RCwgcG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uSUQsIGRvd25sb2FkSUQsIFdURk1vdmUod2Vic2l0 ZVBvbGljaWVzKSk7CiB9CiAKQEAgLTMxMDAsNyArMzA5NCw3IEBAIHZvaWQgV2ViUGFnZTo6ZGlk Q29tcGxldGVQYWdlVHJhbnNpdGlvbigpCiAKICAgICBib29sIGlzSW5pdGlhbEVtcHR5RG9jdW1l bnQgPSAhbV9tYWluRnJhbWU7CiAgICAgaWYgKCFpc0luaXRpYWxFbXB0eURvY3VtZW50KQotICAg ICAgICB1bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlN3YXBGcm9tU3Vz cGVuZGVkKTsKKyAgICAgICAgdW5mcmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29u OjpQcm9jZXNzU3dhcCk7CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgaWYgKG1fc2hvdWxkQXR0 YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uICYmICFpc0luaXRpYWxFbXB0eURvY3VtZW50 KSB7CkBAIC02MzEyLDYgKzYzMDYsMTAgQEAgdm9pZCBXZWJQYWdlOjpzZXRJc1N1c3BlbmRlZChi b29sIHN1c3BlbmRlZCkKICAgICBpZiAobV9pc1N1c3BlbmRlZCkgewogICAgICAgICAvLyBVbmZy b3plbiBvbiBkcmF3aW5nIGFyZWEgcmVzZXQuCiAgICAgICAgIGZyZWV6ZUxheWVyVHJlZShMYXll clRyZWVGcmVlemVSZWFzb246OlBhZ2VTdXNwZW5kZWQpOworCisgICAgICAgIFdlYlByb2Nlc3M6 OnNpbmdsZXRvbigpLnNlbmRQcmV3YXJtSW5mb3JtYXRpb24obWFpbldlYkZyYW1lKCktPnVybCgp KTsKKworICAgICAgICBzdXNwZW5kRm9yUHJvY2Vzc1N3YXAoKTsKICAgICB9IGVsc2UKICAgICAg ICAgbV9zaG91bGRSZXNldERyYXdpbmdBcmVhQWZ0ZXJTdXNwZW5kID0gdHJ1ZTsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA3MTVlMTI0NTIwZmYw NzZiOTYwYWVkNzBlOWI5MjA3NWE2NTUyYWVmLi5mM2I5MzRlMjdkYTlkNWVhNWExYmJmNTVmMTQ5 ZjVhODUxMjczNmU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5oCkBAIC02OTYsNyArNjk2LDcgQEAgcHVibGljOgogICAgICAgICBQcm9jZXNzU3VzcGVuZGVk ICAgICAgICA9IDEgPDwgMiwKICAgICAgICAgUGFnZVN1c3BlbmRlZCAgICAgICAgICAgPSAxIDw8 IDMsCiAgICAgICAgIFByaW50aW5nICAgICAgICAgICAgICAgID0gMSA8PCA0LAotICAgICAgICBT d2FwRnJvbVN1c3BlbmRlZCAgICAgICA9IDEgPDwgNSwKKyAgICAgICAgUHJvY2Vzc1N3YXAgICAg ICAgICAgICAgPSAxIDw8IDUsCiAgICAgfTsKICAgICB2b2lkIGZyZWV6ZUxheWVyVHJlZShMYXll clRyZWVGcmVlemVSZWFzb24pOwogICAgIHZvaWQgdW5mcmVlemVMYXllclRyZWUoTGF5ZXJUcmVl RnJlZXplUmVhc29uKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbSBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQpp bmRleCA5MWFkNzFhZGUxYjdkYjRmOWRjZTY0ZDRmMzMwNDY3YjIyYjgzM2NjLi44M2I2NTk5Mjcw YjUxYzdiYjE4ZWZlNzM3YTU5MmUwMjU3MWEyODA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0K KysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1h dGlvbkRyYXdpbmdBcmVhLm1tCkBAIC05Nyw3ICs5Nyw3IEBAIFRpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhOjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYShXZWJQYWdlJiB3ZWJQYWdl LCBjCiAgICAgdXBkYXRlTGF5ZXJIb3N0aW5nQ29udGV4dCgpOwogICAgIHNldENvbG9yU3BhY2Uo cGFyYW1ldGVycy5jb2xvclNwYWNlKTsKIAotICAgIGlmICghcGFyYW1ldGVycy5pc1N3YXBGcm9t U3VzcGVuZGVkKQorICAgIGlmICghcGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwKQogICAgICAgICBh dHRhY2goKTsKIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IDlhMjYyNDA0YmVjZGE1ZjE5OWYzMTFhY2UyMGVlMTM0MzNiMTczNTcuLjMyNDlm NDNlMzZiOGU5ZjU0OTQ3MmQ5MjA0YjJjNjgxZTJhNjllMDAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0No YW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOS0wMS0x NSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFJlZ3Jlc3Npb24o UFNPTikgVmlldyBiZWNvbWVzIGJsYW5rIGFmdGVyIGNsaWNrIGEgY3Jvc3Mtc2l0ZSBkb3dubG9h ZCBsaW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTMzNjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBBUEkgdGVzdCBjb3ZlcmFnZS4K KworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBP bk5hdmlnYXRpb24ubW06CisgICAgICAgICgtW1BTT05OYXZpZ2F0aW9uRGVsZWdhdGUgd2ViVmll dzpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2U6ZGVjaXNpb25IYW5kbGVyOl0pOgor CiAyMDE5LTAxLTE1ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAg W0xGQ10gVXNlIHRoZSBjb250YWluaW5nIGJsb2NrJ3MgcGFkZGluZyBib3ggdG8gcG9zaXRpb24g b3V0LW9mLWZsb3cgZWxlbWVudHMuCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tIGIvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQppbmRl eCBmMzVkOGJhYTM1M2YwNzAyNGZkNDBlN2Q1Mjc0NTNhNzQyMTBjM2JhLi5hNDQ1YmYxZjljYmIy ZTJjOTYyMDY2NDcyODgxYzVlZDQ5ZDFjYThlIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCisrKyBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRp b24ubW0KQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE3IEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNy0yMDE5IEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cwpAQCAtNzIsNiArNzIsNyBAQCBzdGF0aWMgYm9vbCBzZXJ2ZXJSZWRpcmVjdGVkOwogc3RhdGlj IEhhc2hTZXQ8cGlkX3Q+IHNlZW5QSURzOwogc3RhdGljIGJvb2wgd2lsbFBlcmZvcm1DbGllbnRS ZWRpcmVjdDsKIHN0YXRpYyBib29sIGRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdDsKK3N0YXRpYyBi b29sIHNob3VsZENvbnZlcnRUb0Rvd25sb2FkOwogc3RhdGljIFJldGFpblB0cjxOU1VSTD4gY2xp ZW50UmVkaXJlY3RTb3VyY2VVUkw7CiBzdGF0aWMgUmV0YWluUHRyPE5TVVJMPiBjbGllbnRSZWRp cmVjdERlc3RpbmF0aW9uVVJMOwogCkBAIC0xMjgsNiArMTI5LDExIEBAIC0gKHZvaWQpd2ViVmll dzooV0tXZWJWaWV3ICopd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOihX S05hdmlnYXRpCiAgICAgZGlkUmVwb25kVG9Qb2xpY3lEZWNpc2lvbkNhbGwgPSB0cnVlOwogfQog CistICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2 aWdhdGlvblJlc3BvbnNlOihXS05hdmlnYXRpb25SZXNwb25zZSAqKW5hdmlnYXRpb25SZXNwb25z ZSBkZWNpc2lvbkhhbmRsZXI6KHZvaWQgKF4pKFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5KSlk ZWNpc2lvbkhhbmRsZXIKK3sKKyAgICBkZWNpc2lvbkhhbmRsZXIoc2hvdWxkQ29udmVydFRvRG93 bmxvYWQgPyBfV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3lCZWNvbWVEb3dubG9hZCA6IFdLTmF2 aWdhdGlvblJlc3BvbnNlUG9saWN5QWxsb3cpOworfQorCiAtICh2b2lkKXdlYlZpZXc6KFdLV2Vi VmlldyAqKXdlYlZpZXcgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxOYXZp Z2F0aW9uOihXS05hdmlnYXRpb24gKiluYXZpZ2F0aW9uCiB7CiAgICAgc2VlblBJRHMuYWRkKFt3 ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0pOwpAQCAtMTQwNSw3ICsxNDExLDcgQEAgVEVT VChQcm9jZXNzU3dhcCwgU2VydmVyUmVkaXJlY3QpCiAKICAgICBFWFBFQ1RfRkFMU0Uoc2VydmVy UmVkaXJlY3RlZCk7CiAgICAgRVhQRUNUX0VRKDMsIG51bWJlck9mRGVjaWRlUG9saWN5Q2FsbHMp OwotICAgIEVYUEVDVF9FUSgydSwgc2VlblBJRHMuc2l6ZSgpKTsKKyAgICBFWFBFQ1RfRVEoM3Us IHNlZW5QSURzLnNpemUoKSk7CiB9CiAKIFRFU1QoUHJvY2Vzc1N3YXAsIFNlcnZlclJlZGlyZWN0 MikKQEAgLTE0NjcsNiArMTQ3MywxMDkgQEAgVEVTVChQcm9jZXNzU3dhcCwgU2VydmVyUmVkaXJl Y3QyKQogICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluMS5o dG1sIiwgW1t3ZWJWaWV3IFVSTF0gYWJzb2x1dGVTdHJpbmddKTsKIH0KIAorc3RhdGljIGNvbnN0 IGNoYXIqIGxpbmtUb1dlYktpdEJ5dGVzID0gUiJQU09OUkVTT1VSQ0UoCis8Ym9keT4KKyAgPGEg aWQ9InRlc3RMaW5rIiBocmVmPSJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIj5MaW5r PC9hPgorPC9ib2R5PgorKVBTT05SRVNPVVJDRSI7CisKK1RFU1QoUHJvY2Vzc1N3YXAsIFBvbGlj eUNhbmNlbEFmdGVyU2VydmVyUmVkaXJlY3QpCit7CisgICAgYXV0byBwcm9jZXNzUG9vbENvbmZp Z3VyYXRpb24gPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9jXSBp bml0XSk7CisgICAgcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NTd2Fwc09u TmF2aWdhdGlvbiA9IFlFUzsKKyAgICBhdXRvIHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dLUHJv Y2Vzc1Bvb2wgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25maWd1 cmF0aW9uLmdldCgpXSk7CisKKyAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHRO UyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlld0Nv bmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0KCldOworICAgIGF1dG8g aGFuZGxlciA9IGFkb3B0TlMoW1tQU09OU2NoZW1lIGFsbG9jXSBpbml0XSk7CisgICAgW2hhbmRs ZXIgYWRkTWFwcGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5o dG1sIiB0b0RhdGE6bGlua1RvV2ViS2l0Qnl0ZXNdOworICAgIFtoYW5kbGVyIGFkZFJlZGlyZWN0 RnJvbVVSTFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiIHRvVVJMU3Ry aW5nOkAicHNvbjovL3d3dy5hcHBsZS5jb20vaWdub3JlLmh0bWwiXTsKKyAgICBbd2ViVmlld0Nv bmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZvclVSTFNjaGVt ZTpAInBzb24iXTsKKworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxs b2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlv bjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIGF1dG8gbmF2aWdhdGlvbkRlbGVn YXRlID0gYWRvcHROUyhbW1BTT05OYXZpZ2F0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAg ICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6bmF2aWdhdGlvbkRlbGVnYXRlLmdldCgp XTsKKworICAgIG5hdmlnYXRpb25EZWxlZ2F0ZS0+ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFj dGlvbiA9IF4oV0tOYXZpZ2F0aW9uQWN0aW9uICphY3Rpb24sIHZvaWQgKF5kZWNpc2lvbkhhbmRs ZXIpKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSkpIHsKKyAgICAgICAgaWYgKFthY3Rpb24ucmVx dWVzdC5VUkwuYWJzb2x1dGVTdHJpbmcgaGFzU3VmZml4OkAiaWdub3JlLmh0bWwiXSkgeworICAg ICAgICAgICAgZGVjaXNpb25IYW5kbGVyKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeUNhbmNlbCk7 CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgZGVjaXNpb25IYW5kbGVy KFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeUFsbG93KTsKKyAgICB9OworCisgICAgTlNVUkxSZXF1 ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0 aFN0cmluZzpAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiXV07CisgICAgW3dlYlZp ZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4o JmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKyAgICBhdXRvIHBpZEFmdGVyRmlyc3RMb2FkID0g W3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKworICAgIEVYUEVDVF9FUSgxLCBudW1i ZXJPZkRlY2lkZVBvbGljeUNhbGxzKTsKKworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlw dDpAInRlc3RMaW5rLmNsaWNrKCkiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07CisKKyAgICBUZXN0 V2ViS2l0QVBJOjpVdGlsOjpydW4oJmZhaWxlZCk7CisgICAgZmFpbGVkID0gZmFsc2U7CisgICAg ZG9uZSA9IGZhbHNlOworCisgICAgRVhQRUNUX0VRKDMsIG51bWJlck9mRGVjaWRlUG9saWN5Q2Fs bHMpOworCisgICAgLy8gV2Ugc2hvdWxkIHN0aWxsIGJlIG9uIGdvb2dsZS5jb20uCisgICAgRVhQ RUNUX0VRKHBpZEFmdGVyRmlyc3RMb2FkLCBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJd KTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1s IiwgW1t3ZWJWaWV3IFVSTF0gYWJzb2x1dGVTdHJpbmddKTsKKworICAgIFt3ZWJWaWV3IGV2YWx1 YXRlSmF2YVNjcmlwdDpAInRlc3RMaW5rLmlubmVyVGV4dCIgY29tcGxldGlvbkhhbmRsZXI6IFsm XSAoaWQgaW5uZXJUZXh0LCBOU0Vycm9yICplcnJvcikgeworICAgICAgICBFWFBFQ1RfV0tfU1RS RVEoQCJMaW5rIiwgaW5uZXJUZXh0KTsKKyAgICAgICAgZG9uZSA9IHRydWU7CisgICAgfV07Cisg ICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7Cit9 CisKK1RFU1QoUHJvY2Vzc1N3YXAsIENyb3NzU2l0ZURvd25sb2FkKQoreworICAgIGF1dG8gcHJv Y2Vzc1Bvb2xDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW19XS1Byb2Nlc3NQb29sQ29uZmlndXJh dGlvbiBhbGxvY10gaW5pdF0pOworICAgIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKS5w cm9jZXNzU3dhcHNPbk5hdmlnYXRpb24gPSBZRVM7CisgICAgYXV0byBwcm9jZXNzUG9vbCA9IGFk b3B0TlMoW1tXS1Byb2Nlc3NQb29sIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOnByb2Nl c3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKV0pOworCisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJh dGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7Cisg ICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFByb2Nlc3NQb29sOnByb2Nlc3NQb29sLmdldCgp XTsKKyAgICBhdXRvIGhhbmRsZXIgPSBhZG9wdE5TKFtbUFNPTlNjaGVtZSBhbGxvY10gaW5pdF0p OworICAgIFtoYW5kbGVyIGFkZE1hcHBpbmdGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy5nb29n bGUuY29tL21haW4uaHRtbCIgdG9EYXRhOmxpbmtUb1dlYktpdEJ5dGVzXTsKKyAgICBbaGFuZGxl ciBhZGRNYXBwaW5nRnJvbVVSTFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0 bWwiIHRvRGF0YToiSGVsbG8iXTsKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0VVJMU2No ZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAInBzb24iXTsKKworICAgIGF1 dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNN YWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJhdGlv bi5nZXQoKV0pOworICAgIGF1dG8gbmF2aWdhdGlvbkRlbGVnYXRlID0gYWRvcHROUyhbW1BTT05O YXZpZ2F0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlldyBzZXROYXZpZ2F0 aW9uRGVsZWdhdGU6bmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpXTsKKworICAgIE5TVVJMUmVxdWVz dCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhT dHJpbmc6QCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1sIl1dOworICAgIFt3ZWJWaWV3 IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZk b25lKTsKKyAgICBkb25lID0gZmFsc2U7CisgICAgYXV0byBwaWRBZnRlckZpcnN0TG9hZCA9IFt3 ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl07CisKKyAgICBzaG91bGRDb252ZXJ0VG9Eb3du bG9hZCA9IHRydWU7CisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAidGVzdExpbmsu Y2xpY2soKSIgY29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0 aWw6OnJ1bigmZmFpbGVkKTsKKyAgICBmYWlsZWQgPSBmYWxzZTsKKyAgICBzaG91bGRDb252ZXJ0 VG9Eb3dubG9hZCA9IGZhbHNlOworCisgICAgLy8gV2Ugc2hvdWxkIHN0aWxsIGJlIG9uIGdvb2ds ZS5jb20uCisgICAgRVhQRUNUX0VRKHBpZEFmdGVyRmlyc3RMb2FkLCBbd2ViVmlldyBfd2ViUHJv Y2Vzc0lkZW50aWZpZXJdKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lmdvb2ds ZS5jb20vbWFpbi5odG1sIiwgW1t3ZWJWaWV3IFVSTF0gYWJzb2x1dGVTdHJpbmddKTsKKworICAg IFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAInRlc3RMaW5rLmlubmVyVGV4dCIgY29tcGxl dGlvbkhhbmRsZXI6IFsmXSAoaWQgaW5uZXJUZXh0LCBOU0Vycm9yICplcnJvcikgeworICAgICAg ICBFWFBFQ1RfV0tfU1RSRVEoQCJMaW5rIiwgaW5uZXJUZXh0KTsKKyAgICAgICAgZG9uZSA9IHRy dWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBk b25lID0gZmFsc2U7Cit9CisKIGVudW0gY2xhc3MgU2hvdWxkRW5hYmxlUFNPTiB7IE5vLCBZZXMg fTsKIHN0YXRpYyB2b2lkIHJ1bkNsaWVudFNpZGVSZWRpcmVjdFRlc3QoU2hvdWxkRW5hYmxlUFNP TiBzaG91bGRFbmFibGVQU09OKQogewpAQCAtMjIzMiwxMiArMjM0MSwyNyBAQCBURVNUKFByb2Nl c3NTd2FwLCBQYWdlU2hvd0hpZGUpCiAKICAgICBFWFBFQ1RfRVEoN3UsIFtyZWNlaXZlZE1lc3Nh Z2VzIGNvdW50XSk7CiAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3Jn L21haW4uaHRtbCAtIHBhZ2VzaG93IE5PVCBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdl dCgpWzBdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFp bi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7 Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0g cGFnZXNob3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOwotICAg IEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2Vo aWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10pOwotICAgIEVYUEVDVF9X S19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJz aXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEo QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwg cmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjov L3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRN ZXNzYWdlcy5nZXQoKVs2XSk7CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdIGhh c1ByZWZpeDpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiXSkgeworICAgICAgICBF WFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhp ZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7CisgICAgICAgIEVYUEVD VF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93IE5P VCBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsKKyAgICB9IGVsc2Ugewor ICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwg LSBwYWdlc2hvdyBOT1QgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7Cisg ICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwg LSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsKKyAgICB9 CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdIGhhc1ByZWZpeDpAInBzb246Ly93 d3cuYXBwbGUuY29tL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBz b246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2Vp dmVkTWVzc2FnZXMuZ2V0KClbM10pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8v d3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRN ZXNzYWdlcy5nZXQoKVs0XSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVR KEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIs IHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJw c29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNl aXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKKyAgICB9CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2Vz LmdldCgpWzVdIGhhc1ByZWZpeDpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiXSkg eworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5o dG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7Cisg ICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAt IHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAgIH0g ZWxzZSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21h aW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0p OworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5o dG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7Cisg ICAgfQogfQogCiAvLyBEaXNhYmxpbmcgdGhlIHBhZ2UgY2FjaGUgZXhwbGljaXRseSBpcyAoZm9y IHNvbWUgcmVhc29uKSBub3QgYXZhaWxhYmxlIG9uIGlPUy4KQEAgLTIzMDcsMTIgKzI0MzEsMjcg QEAgVEVTVChQcm9jZXNzU3dhcCwgTG9hZFVubG9hZCkKIAogICAgIEVYUEVDVF9FUSg3dSwgW3Jl Y2VpdmVkTWVzc2FnZXMgY291bnRdKTsKICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3 LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gbG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMF0p OwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwg LSB1bmxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKLSAgICBFWFBFQ1RfV0tfU1RS RVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBsb2FkIiwgcmVjZWl2ZWRNZXNz YWdlcy5nZXQoKVsyXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5j b20vbWFpbi5odG1sIC0gdW5sb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSk7Ci0gICAg RVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIGxvYWQi LCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29u Oi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gdW5sb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5n ZXQoKVs1XSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFp bi5odG1sIC0gbG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAgIGlmIChbcmVj ZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSBoYXNQcmVmaXg6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcv bWFpbi5odG1sIl0pIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJr aXQub3JnL21haW4uaHRtbCAtIHVubG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0pOwor ICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwg LSBsb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7CisgICAgfSBlbHNlIHsKKyAgICAg ICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gbG9h ZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEo QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gdW5sb2FkIiwgcmVjZWl2ZWRNZXNz YWdlcy5nZXQoKVsyXSk7CisgICAgfQorICAgIGlmIChbcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsz XSBoYXNQcmVmaXg6QCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwiXSkgeworICAgICAg ICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSB1bmxv YWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVR KEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIGxvYWQiLCByZWNlaXZlZE1lc3Nh Z2VzLmdldCgpWzRdKTsKKyAgICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJw c29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gbG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMu Z2V0KClbM10pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNv bS9tYWluLmh0bWwgLSB1bmxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKKyAgICB9 CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdIGhhc1ByZWZpeDpAInBzb246Ly93 d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiXSkgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJw c29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gdW5sb2FkIiwgcmVjZWl2ZWRNZXNzYWdl cy5nZXQoKVs1XSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUu Y29tL21haW4uaHRtbCAtIGxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAgICB9 IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9t YWluLmh0bWwgLSBsb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7CisgICAgICAgIEVY UEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSB1bmxvYWQi LCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAgICB9CiB9CiAKIFRFU1QoUHJvY2Vzc1N3 YXAsIFdlYkluc3BlY3RvcikKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwNGE4Njg2NmVhNjAwZDIwMTAyOTFhYmZiYjk0YjM3 MjFkNTlkYTU0Li4zNGM1Mjg2ZDMwNWEzYWZkNjg1NTI1MjA4MWUyODRjNDU3NDEwNTAzIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMDEtMTUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxl LmNvbT4KKworICAgICAgICBSZWdyZXNzaW9uKFBTT04pIFZpZXcgYmVjb21lcyBibGFuayBhZnRl ciBjbGljayBhIGNyb3NzLXNpdGUgZG93bmxvYWQgbGluaworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzMzYxCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS80NzA5OTU3Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBTa2lwIHRlc3QgdGVzdGluZyB0aGUgY3Jvc3MtcHJvY2VzcyBET01XaW5kb3cgQVBJIGFz IEkgYnJva2UgaXQgd2l0aCB0aGlzIHBhdGNoLgorICAgICAgICBUaGUgZmVhdHVyZSBpcyBmYXIg ZnJvbSByZWFkeSBhbmQgb2ZmIGJ5IGRlZmF1bHQgYW55d2F5LiBJIHdpbGwgYWRkIHN1cHBvcnQg YmFjaworICAgICAgICBpbiBhIGZvbGxvdy11cC4KKworICAgICAgICAqIHBsYXRmb3JtL3drMi9U ZXN0RXhwZWN0YXRpb25zOgorCiAyMDE5LTAxLTE1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFw cGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBdWRpdDogcHJvdmlkZSBhIHdheSB0 byBkZXRlcm1pbmUgd2hldGhlciBhIGdpdmUgbm9kZSBoYXMgZXZlbnQgbGlzdGVuZXJzCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDhlOTU5ZWRhZmZkODky N2VmOWMyYWFjMzE2ZTllMzEwMGNkMTQwY2IuLjlkOTBiZThiNDhlNTdjOTYwYmNkYTY4NmNlMjQ0 MGQ3MTM4YmIwZjYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhw ZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25z CkBAIC03MzMsOCArNzMzLDggQEAgaHR0cC90ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL3Jl bW92ZS1ibG9ja2luZy1pbi1yZWRpcmVjdC5odG1sIFsgU2tpcCBdCiBodHRwL3Rlc3RzL3Jlc291 cmNlTG9hZFN0YXRpc3RpY3Mvbm9uLXByZXZhbGVudC1yZXNvdXJjZXMtY2FuLWFjY2Vzcy1jb29r aWVzLWluLWEtdGhpcmQtcGFydHktY29udGV4dC5odG1sIFsgU2tpcCBdCiBodHRwL3Rlc3RzL3Jl c291cmNlTG9hZFN0YXRpc3RpY3MvY2FwLWNhY2hlLW1heC1hZ2UtZm9yLXByZXZhbGVudC1yZXNv dXJjZS5odG1sIFsgU2tpcCBdCiAKLSMgUHJvY2VzcyBzd2FwcGluZyBpcyBvbmx5IGltcGxlbWVu dGVkIG9uIFdlYktpdDIuCi1odHRwL3Rlc3RzL25hdmlnYXRpb24vcHJvY2Vzcy1zd2FwLXdpbmRv dy1vcGVuLmh0bWwgWyBQYXNzIF0KKyMgVGhpcyBmZWF0dXJlIGlzIGN1cnJlbnRseSBkaXNhYmxl ZCBieSBkZWZhdWx0IGFuZCB1bmZpbmlzaGVkIDxyZGFyOi8vcHJvYmxlbS8zODkyNTA3Nz4uCito dHRwL3Rlc3RzL25hdmlnYXRpb24vcHJvY2Vzcy1zd2FwLXdpbmRvdy1vcGVuLmh0bWwgWyBTa2lw IF0KIAogIyBDcm9zcy1PcmlnaW4tUmVzb3VyY2UtUG9saWN5IHJlc3BvbnNlIGhlYWRlciBpcyBv bmx5IGltcGxlbWVudGVkIGluIFdlYktpdDIuCiBodHRwL3dwdC9jcm9zcy1vcmlnaW4tcmVzb3Vy Y2UtcG9saWN5LyBbIFBhc3MgXQo= 359176 2019-01-15 10:24:23 -0800 2019-01-15 22:00:15 -0800 Patch bug-193361-20190115102422.patch text/plain 106772 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5OTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQzNGM2ZGZkZDNhNWQ5 YmMxZjQ2MjZkNTVmOWY0OTg3MWNhNDA1Yi4uN2E1MmYxYzk1ZmE3OTI3YjA0NDA3NjVhMzRmMDFm YjgzMGQ5NjI3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAxLTE1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBW aWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg R2VvZmYgR2FyZW4uCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAgICAg IFdoZW4gcmVzdG9yaW5nIGZyb20gUGFnZUNhY2hlLCBtYWtlIHN1cmUgd2Ugbm90aWZ5IHRoZSBj bGllbnQgdGhhdCB0aGUgbG9hZCB3YXMgY29tbWl0dGVkCisgICAgICAgICpiZWZvcmUqIHdlIHRl bGwgaXQgdGhhdCB0aGUgbmF2aWdhdGlvbiBpcyBjb21wbGV0ZS4gVGhpcyB3b3VsZCBjb25mdXNl IHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eQorICAgICAgICBsb2dpYyBpbiB0aGUgVUlQcm9jZXNz LgorCiAyMDE5LTAxLTE1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBBdWRpdDogcHJvdmlkZSBhIHdheSB0byBkZXRlcm1pbmUgd2hl dGhlciBhIGdpdmUgbm9kZSBoYXMgZXZlbnQgbGlzdGVuZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIxNTgwZmMw NThiNTM3ZWQxYWRlNWY3NTJlMzE3NjZmY2UzYmQ0MDEuLmM5YjMxZjlhMGVhZjA4MzZiMDVkY2U5 YzA0ZWRmY2I0OGE3MjM5ZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAwIEBACisyMDE5LTAxLTE1 ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQ U09OKSBWaWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2Fk IGxpbmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 MzM2MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgR2VvZmYgR2FyZW4uCisKKyAgICAgICAgVGhlIGlzc3VlIHRyYWNrZWQgYnkgcmRhcjov L3Byb2JsZW0vNDcwOTk1NzMgaXMgdGhhdCBhIHByb3Zpc2lvbmFsIGxvYWQgbWF5IGdldAorICAg ICAgICBjYW5jZWxlZCAob3IgY29udmVydGVkIGludG8gYSBkb3dubG9hZCkgKmFmdGVyKiB3ZSd2 ZSBkZWNpZGVkIHRvIHByb2Nlc3Mtc3dhcC4KKyAgICAgICAgSW4gc3VjaCBjYXNlcywgdGhlIHZp ZXcgc2hvdWxkIGtlZXAgZGlzcGxheWluZyB0aGUgY3VycmVudCBzaXRlIGFuZCBpdCBzaG91bGQK KyAgICAgICAgc3RpbGwgYmUgaW50ZXJhY3RpdmUuIEhvd2V2ZXIsIHdpdGggdGhlIHByZXZpb3Vz IFBTT04gbW9kZWwsIHRoZSB2aWV3IChwYWdlUHJveHkpCisgICAgICAgIHdvdWxkIGhhdmUgYWxy ZWFkeSBzd2FwcGVkIHRvIHRoZSBuZXcgcHJvY2VzcyBhbmQgd291bGQgZW5kIHVwIGRpc3BsYXlp bmcgdGhlCisgICAgICAgIGluaXRpYWxseSBlbXB0eSBkb2N1bWVudC4KKworICAgICAgICBUbyBh ZGRyZXNzIHRoZSBpc3N1ZSwgdGhpcyBwYXRjaCBpbnRyb2R1Y2VzIHRoZSBjb25jZXB0IG9mIGEg cHJvdmlzaW9uYWwgbG9hZAorICAgICAgICBpbiB0aGUgVUlQcm9jZXNzLCBoYW5kbGVkIGJ5IGEg UHJvdmlzaW9uYWxQYWdlUHJveHkgd2hpY2ggaGFzIGl0cyBvd24gcHJpdmlzaW9uYWwKKyAgICAg ICAgcHJvY2Vzcy4gVGhlIFdlYlBhZ2VQcm94eSBvd25zIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94 eSBidXQgd2UgZG8gbm90IGNvbW1pdCB0aGUKKyAgICAgICAgcHJvdmlzaW9uYWwgcGFnZSB1bnRp bCBhZnRlciB0aGUgbG9hZCB3YXMgY29tbWl0dGVkIGluIHRoZSBuZXcgcHJvY2Vzcy4gVGhpcyBt ZWFucworICAgICAgICB0aGF0IHRoZSB2aWV3IC8gV2ViUGFnZVByb3h5IGtlZXBzIHVzaW5nIHRo ZSBvbGQgcHJvY2VzcyBhbmQgZGlzcGxheXMgdGhlIGN1cnJlbnQKKyAgICAgICAgY29udGVudCB1 bnRpbCBhIGxvYWQgaGFzIGNvbW1pdHRlZCBpbiB0aGUgcHJvdmlzaW9uYWwgcGFnZS4gSWYgbm8g bG9hZCBjb21taXRzCisgICAgICAgIGluIHRoZSBwcm92aXNpb25hbCBwcm9jZXNzIChlLmcuIGJl Y2F1c2UgdGhlIGxvYWQgaXMgY2FuY2VsbGVkIG9yIGNvbnZlcnRlZCBpbnRvCisgICAgICAgIGEg ZG93bmxvYWQpLCB0aGVuIHdlIG1lcmVseSBkZXN0cm95IHRoZSBQcm92aXNpb25hbFBhZ2VQcm94 eSBhbmQgdGVybWluYXRlIGl0cworICAgICAgICBwcm9jZXNzLCB3aXRob3V0IGltcGFjdGluZyB0 aGUgV2ViUGFnZVByb3h5LgorCisgICAgICAgICogU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpl bmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz OjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmg6 CisgICAgICAgIFJlbmFtZSBpc1N3YXBGcm9tU3VzcGVuZGVkIHRvIGlzUHJvY2Vzc1N3YXAgZm9y IGNsYXJpdHkgYXMgd2UgYWx3YXlzIHdhbnQgdG8KKyAgICAgICAgZGVsYXkgYXR0YWNoaW5nIHRo ZSBkcmF3aW5nIGFyZWEgaW4gY2FzZSBvZiBhIHByb2Nlc3Mtc3dhcCwgbm8gbWF0dGVyIHdoYXQK KyAgICAgICAgbm93IHRoYXQgdGhlIHByZXZpb3VzIHByb2Nlc3MgaXMga2VwdCBhbGl2ZSB1bnRp bCB0aGUgcHJvdmlzaW9uYWwgbG9hZCBpcworICAgICAgICBjb21taXR0ZWQgaW4gdGhlIG5ldyBw cm9jZXNzLgorCisgICAgICAgICogU2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oOgorICAgICAgICBE cm9wIFN1c3BlbmQgcG9saWN5IGFjdGlvbi4gQXQgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFj dGlvbiB0aW1lLCBpbiBjYXNlIG9mCisgICAgICAgIHByb2Nlc3Mtc3dhcCwgd2Ugbm93IHRlbGwg dGhlIHByZXZpb3VzIHByb2Nlc3MgdG8gc2ltcGx5IGlnbm9yZSB0aGUgbG9hZCwgd2hpbGUKKyAg ICAgICAgd2UgY3JlYXRlIGEgUHJvdmlzaW9uYWxQYWdlUHJveHkgdG8gZG8gdGhlIG5ldyBsb2Fk IGluIGEgbmV3IHByb2Nlc3MuCisgICAgICAgIFN1c3BlbnNpb24gb2YgdGhlIHByZXZpb3VzIHBh Z2UgaW4gdGhlIG9sZCBwcm9jZXNzLCBoYXBwZW5zIGxhdGVyLCB3aGVuIGEgbG9hZAorICAgICAg ICBpcyBhY3R1YWxseSBjb21taXR0ZWQgaW4gdGhlIG5ldyBwcm9jZXNzLgorCisgICAgICAgICog U291cmNlcy50eHQ6CisgICAgICAgIEFkZCBuZXcgUHJvdmlzaW9uYWxQYWdlUHJveHkgZmlsZS4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAo LVtXS1dlYlZpZXcgX2tpbGxXZWJDb250ZW50UHJvY2Vzc0FuZFJlc2V0U3RhdGVdKToKKyAgICAg ICAgV2hlbiBjYWxsaW5nIF9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0YXRlIG9uIGEg V0tXZWJWaWV3LCBraWxsIGJvdGggdGhlIGN1cnJlbnQKKyAgICAgICAgcHJvY2VzcyBhbmQgdGhl IHByb3Zpc2lvbmFsIG9uZSwgdG8gbWFpbnRhaW4gcHJldmlvdXMgYmVoYXZpb3IgaW4gb3VyIEFQ SSB0ZXN0cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlQ2xpZW50Lmg6CisgICAgICAgIFRp bnkgYnVpbGQgZml4LgorCisgICAgICAgICogVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5 LmNwcDogQWRkZWQuCisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpQcm92 aXNpb25hbFBhZ2VQcm94eSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5 Ojp+UHJvdmlzaW9uYWxQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBh Z2VQcm94eTo6dGFrZURyYXdpbmdBcmVhKToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQ YWdlUHJveHk6OmNhbmNlbCk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5 Ojppbml0aWFsaXplV2ViUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVBy b3h5Ojpsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlzaW9u YWxQYWdlUHJveHk6OmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24pOgorICAgICAgICAoV2ViS2l0 OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6Z29Ub0JhY2tGb3J3YXJkSXRlbSk6CisgICAgICAgIChX ZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOgorICAgICAg ICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRG b3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRGYWls UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBh Z2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlz aW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVTeW5jTWVzc2FnZSk6CisgICAgICAgICogVUlQ cm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5Lmg6IEFkZGVkLgorICAgICAgICAoV2ViS2l0OjpQ cm92aXNpb25hbFBhZ2VQcm94eTo6cGFnZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFs UGFnZVByb3h5OjptYWluRnJhbWUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25h bFBhZ2VQcm94eTo6cHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVBy b3h5Ojpwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IGNvbnN0KToKKyAgICAgICAgKFdlYktp dDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6Om5hdmlnYXRpb25JRCBjb25zdCk6CisgICAgICAgIEFk ZCBuZXcgUHJvdmlzaW9uYWxQYWdlUHJveHkgY2xhc3MgdG8gd3JhcCB0aGUgcHJvdmlzaW9uYWwg bG9hZCBpbiB0aGUgbmV3IHByb2Nlc3MKKyAgICAgICAgYWZ0ZXIgYSBzd2FwLiBUaGUgcHJvdmlz aW9uYWwgcGFnZSBpcyBvd25lZCBieSB0aGUgV2ViUGFnZVByb3h5IGFuZCB3ZSBvbmx5IGNvbW1p dAorICAgICAgICB0aGUgcHJvdmlzaW9uYWwgcGFnZSB3aGVuIHRoZSBsb2FkIGlzIGNvbW1pdHRl ZC4gVW50aWwgdGhlbiwgdGhlIFdlYlBhZ2VQcm94eSBrZWVwcworICAgICAgICB1c2luZyB0aGUg b2xkIHByb2Nlc3MgYW5kIGRpc3BsYXlpbmcgdGhlIGN1cnJlbnQgY29udGVudC4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpT dXNwZW5kZWRQYWdlUHJveHk6On5TdXNwZW5kZWRQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0 OjpTdXNwZW5kZWRQYWdlUHJveHk6OnVuc3VzcGVuZCk6CisgICAgICAgIChXZWJLaXQ6OlN1c3Bl bmRlZFBhZ2VQcm94eTo6ZGlkUHJvY2Vzc1JlcXVlc3RUb1N1c3BlbmQpOgorICAgICAgICBVbnJl Z2lzdGVyIHRoZSBTdXNwZW5kZWRQYWdlUHJveHkgYXMgYW4gSVBDIG1lc3NhZ2UgcmVjZWl2ZXIg YSBsaXR0bGUgYml0IGVhcmxpZXIKKyAgICAgICAgd2hlbiB3ZSdyZSBnb2luZyB0byB1bnN1c3Bl bmQgaXQuIFRoaXMgYXZvaWRzIGNvbmZsaWN0aW5nIHdpdGggdGhlIFByb3Zpc2lvbmFsUGFnZVBy b3h5CisgICAgICAgIHdoaWNoIHRyaWVzIHRvIHJlZ2lzdGVyIGl0c2VsZiBhcyBhbiBJUEMgbWVz c2FnZSByZWNlaXZlciBmb3IgdGhlIHNhbWUgcGFnZUlEIHdoZW4KKyAgICAgICAgYSBwcm9jZXNz LXN3YXAgb2NjdXJzIGFuZCB3ZSdyZSBzd2l0Y2hpbmcgdG8gYSBzdXNwZW5kZWQgcGFnZS4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViRnJhbWVQcm94eTo6aXNNYWluRnJhbWUgY29uc3QpOgorICAgICAgICBXZWJGcmFtZVByb3h5 Ojppc01haW5GcmFtZSgpIHJlbGllcyBvbiBjaGVja2luZyB0aGF0IHRoZSBmcmFtZSBpcyB0aGUg V2ViUGFnZVByb3h5J3MgbV9tYWluRnJhbWUuCisgICAgICAgIE5vdyB0aGF0IHRoZSBXZWJQYWdl UHJveHkgY2FuIGhhdmUgYSBQcm92aXNpb25hbFBhZ2VQcm94eSwgYWxzbyBjaGVjayBpZiBpdCBp cyB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkncworICAgICAgICBtX21haW5GcmFtZSB0byBtYWlu dGFpbiBwcmV2aW91cyBiZWhhdmlvci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnN3YXBUb1dlYlByb2Nlc3Mp OgorICAgICAgICBzd2FwVG9XZWJQcm9jZXNzKCkgbm8gbG9uZ2VyIHRha2VzIGNhcmUgb2YgdW5z dXNwZW5kaW5nIHRoZSBTdXNwZW5kZWRQYWdlIGJlY2F1c2Ugd2Ugbm93IGNhbGwgc3dhcFRvV2Vi UHJvY2VzcygpCisgICAgICAgIGxhdGVyLCB3aGVuIGEgbG9hZCBpcyBhY3R1YWxseSBjb21taXR0 ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHBhZ2UgLyBwcm9jZXNzLiBzd2FwVG9XZWJQcm9jZXNzKCkg bm93IGFsc28gbmVlZHMKKyAgICAgICAgdG8gaW5pdGlhbGl6ZSBzb21lIGRhdGEgbWVtYmVycyBz dWNoIGFzIHRoZSBkcmF3aW5nIGFyZWEgYW5kIHRoZSBtYWluIGZyYW1lIGFzIGl0IGlzIHRyYW5z ZmVycmluZyB0aGVtIG92ZXIgZnJvbQorICAgICAgICB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkg d2hpY2ggc3RhcnRlZCB0aGUgcHJvdmlzaW9uYWwgbG9hZC4KKworICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2Vzcyk6CisgICAgICAgIFdlIG5v IGxvbmdlciBuZWVkIElzU3dhcEZyb21TdXNwZW5kZWQgcGFyYW1ldGVyIGFzIHRoaXMgaXMgY2Fs bGVkIGxhdGVyIG5vdywgYWZ0ZXIgYSBsb2FkIGhhcyBhY3R1YWxseSBiZWVuCisgICAgICAgIGNv bW1pdHRlZCBpbiB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vzcy4KKworICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKToKKyAgICAgICAgLSBXZSBubyBsb25nZXIg bmVlZCBJc1N3YXBGcm9tU3VzcGVuZGVkIHBhcmFtZXRlciBhcyB0aGlzIGlzIGNhbGxlZCBsYXRl ciBub3csIGFmdGVyIGEgbG9hZCBoYXMgYWN0dWFsbHkgYmVlbgorICAgICAgICAgIGNvbW1pdHRl ZCBpbiB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vzcy4KKyAgICAgICAgLSBGYWN0b3Igc29tZSBjb2Rl IG91dCB0byBXZWJQYWdlUHJveHk6OnNldERyYXdpbmdBcmVhKCkgc28gdGhhdCBpdCBjYW4gYmUg c2hhcmVkIHdpdGggc3dhcFRvV2ViUHJvY2VzcygpLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbik6CisgICAgICAgIE9ubHkgY2FsbCBz ZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCgpIGluIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oKSBv bmx5IGlmIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCBpcyBub3QKKyAgICAgICAgWWVzLiBU aGlzIGF2b2lkcyBoaXR0aW5nIHNvbWUgYXNzZXJ0aW9ucyBhcyB0aGlzIHdhcyBhbHJlYWR5IGNh bGxlZCBkdXJpbmcgdGhlIGZpcnN0IEFQSSBjYWxsIGlmIG5lZWRlZC4KKworICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uKToKKyAg ICAgICAgSW4gY2FzZSBvZiBwcm9jZXNzIHN3YXAsIHRlbGwgdGhlIHByZXZpb3VzIHByb2Nlc3Mg dG8gaWdub3JlIHRoZSBsb2FkIGluc3RlYWQgb2Ygc3VzcGVuZGluZyBpdCByaWdodCBhd2F5Lgor ICAgICAgICBTdXNwZW5zaW9uIG5vdyBoYXBwZW5zIGxhdGVyLCBvbmx5IGlmIHdlIGVuZCB1cCBj b21taXR0aW5nIHRoZSBwcm92aXNpb25hbCBsb2FkIGluIHRoZSBuZXcgcHJvY2Vzcy4KKyAgICAg ICAgQWxzbyBkaXNjYXJkIHRoZSBTdXNwZW5kZWRQYWdlIGlmIGl0IGZhaWxlZCB0byBzdXNwZW5k ICh3ZSBvbmx5IHJldXNlIGl0cyBwcm9jZXNzIGluIHRoaXMgY2FzZSkuIFRoaXMgdXNlZAorICAg ICAgICB0byBoYXBwZW4gYSBiaXQgbGF0ZXIgYnV0IGl0IGlzIGNsZWFyZXIgaWYgd2UgZG8gdGhp cyBhcyBlYXJseSBhcyBwb3NzaWJsZSBJIHRoaW5rLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKToKKyAgICAgICAgV2hlbiB0aGUgbG9hZCBp cyBjb21taXR0ZWQgaW4gdGhlIG5ldyBwcm9jZXNzLCB3ZSBjYWxsIFdlYlBhZ2VQcm94eTo6Y29t bWl0UHJvdmlzaW9uYWxQYWdlKCkuIEl0IHRha2VzIGNhcmUgb2Y6CisgICAgICAgIC0gQWN0dWFs bHkgc3dhcHBpbmcgdGhlIFdlYlBhZ2VQcm94eSB0byB0aGUgbmV3IHByb2Nlc3MgYnkgY2FsbGlu ZyBwcm9jZXNzRGlkVGVybWluYXRlKCkgLyBzd2FwVG9XZWJQcm9jZXNzKCkuCisgICAgICAgIC0g U3VzcGVuZGluZyB0aGUgY3VycmVudCBwYWdlLgorICAgICAgICAtIExldHRpbmcgdGhlIGNsaWVu dCBrbm93IHRoZSBsb2FkIGlzIGNvbWl0dGVkCisgICAgICAgIC0gRGVzdHJveSB0aGUgUHJvdmlz aW9uYWxQYWdlUHJveHkuCisgICAgICAgIFRoaXMgd29yayB1c2VkIHRvIGhhcHBlbiBlYXJsaWVy IGluIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcygpLgorCisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKToKKyAgICAgICAg TW92ZWQgc29tZSBvZiB0aGUgbG9naWMgdG8gY29tbWl0UHJvdmlzaW9uYWxQYWdlKCkuIFdlIG5v dyBtZXJlbHkgc3RhcnQgdGhlIGxvYWQgaW4gYSBuZXcgUHJvdmlzaW9uYWxQYWdlUHJveHksCisg ICAgICAgIHdpdGhvdXQgYWN0dWFsbHkgaGF2aW5nIHRoZSBXZWJQYWdlUHJveHkgc3dpdGNoIHRv IHRoZSBuZXcgcHJvY2VzcyB5ZXQuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpk aWRDcmVhdGVNYWluRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZENy ZWF0ZVdpbmRvdyk6CisgICAgICAgIERyb3Agc29tZSBjb2RlIHRoYXQgaXMgbm8gbG9uZ2VyIG5l ZWRlZCwgbm93IHRoYXQgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IHRha2VzIGNhcmUgb2YgdGhp cy4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZERlc3Ryb3lOYXZpZ2F0aW9u KToKKyAgICAgICAgT24gcHJvY2Vzcy1zd2FwLCB3aGVuIHRlbGxpbmcgdGhlIHByZXZpb3VzIHBy b2Nlc3MgdG8gaWdub3JlIHRoZSBsb2FkIGFuZCBzdGFydGluZyB0aGUgbmV3IGxvYWQgaW4gYSBu ZXcKKyAgICAgICAgUHJvdmlzaW9uYWxQYWdlUHJveHksIHRoZSBwcmV2aW91cyBXZWJQYWdlIGF0 dGVtcHRzIHRvIGRlc3Ryb3kgdGhlIG5hdmlnYXRpb24uIEluIHRoaXMgY2FzZSwgd2UgaWdub3Jl CisgICAgICAgIHRoZSBjYWxsIHNpbmNlIHRoZSBuYXZpZ2F0aW9uIGlzIG1lcmVseSB0YWtlbiBv dmVyIGJ5IHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eS4KKworICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICBNb3Zl ZCBzb21lIFBTT04gbG9naWMgdG8gdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGluc3RlYWQuCisK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUpOgorICAgICAgICBXaGVuIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSgpIGlz IGNhbGxlZCBmb3IgYSBQcm92aXNpb25hbFBhZ2VQcm94eSwgZGVzdHJveSBpdC4KKworICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25B c3luYyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yUmVz cG9uc2UpOgorICAgICAgICBDYXB0dXJlIHRoZSBwcm9jZXNzIGluIHRoZSBsYW1iZGEsIHRvIG1h a2Ugc3VyZSB3ZSBzZW5kIHRoZSBwb2xpY3kgZGVjaXNpb24gdG8gdGhlIHNhbWUgcHJvY2VzcyB0 aGF0CisgICAgICAgIGFza2VkIGZvciBpdCwgc28gYXMgdG8gbm90IGdldCBjb25mdXNlZCBieSBw cm9jZXNzIHN3YXBzLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVzZXRTdGF0 ZSk6CisgICAgICAgIERyb3Agc29tZSBjb2RlIHRoYXQgaXMgbm8gbG9uZ2VyIG5lZWRlZC4KKwor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycyk6CisgICAg ICAgIE1vdmUgdGhlIGhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyBmbGFnIGluaXRpYWxpemF0 aW9uIGZyb20gdGhlIGNhbGwgc2l0ZSB0byBoZXJlIG5vdyB0aGF0IHdlIGhhdmUKKyAgICAgICAg bW9yZSB0aGFuIG9uZSBjYWxsIHNpdGUuIFRoaXMgd2FzIGp1c3Qgc29tZSBiYWQgZmFjdG9yaW5n LgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6 UGFnZVByb2Nlc3NPdmVycmlkZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6UGFn ZVByb2Nlc3NPdmVycmlkZTo6flBhZ2VQcm9jZXNzT3ZlcnJpZGUpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp0ZW1w b3JhcmlseU92ZXJyaWRlUHJvY2Vzcyk6CisgICAgICAgIEFkZCB1dGlsaXR5IGNsYXNzIHRvIHRl bXBvcmFyaWx5IG92ZXJyaWRlIHRoZSBXZWJQYWdlUHJveHkncyBtX3Byb2Nlc3Mgd2l0aCB0aGUg cHJvdmlzaW9uYWwgb25lIHdoZW4KKyAgICAgICAgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGlu dGVyYWN0cyB3aXRoIHRoZSBXZWJQYWdlUHJveHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpoYXNQ cm92aXNpb25hbFBhZ2VXaXRoSUQgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNz UHJveHk6OnVwZGF0ZUJhY2tGb3J3YXJkSXRlbSk6CisgICAgICAgIEJlZm9yZSB1cGRhdGluZyBh IEJhY2tGb3J3YXJkTGlzdEl0ZW0sIHdlIG5vcm1hbGx5IG1ha2Ugc3VyZSB0aGUgcHJvY2VzcyBo YXMgYSBXZWJQYWdlUHJveHkgd2l0aCB0aGUKKyAgICAgICAgaXRlbSdzIHBhZ2VJRC4gV2UgaGF2 ZSB0byB0d2VhayB0aGUgbG9naWMgYmVjYXVzZSB0aGVyZSBtYXkgbm93IGJlIG5vIFdlYlBhZ2VQ cm94eSB3aXRoIHRoaXMgcGFnZUlECisgICAgICAgIGFzc29jaWF0ZWQgd2l0aCB0aGlzIHByb2Nl c3MgeWV0LCBiZWNhdXNlIGl0IGlzIHN0aWxsIGEgUHJvdmlzaW9uYWxQYWdlUHJveHkuCisKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpjYW5UZXJtaW5hdGVDaGlsZFByb2Nlc3Mp OgorICAgICAgICBEbyBub3QgdGVybWluYXRlIHRoZSBXZWJQcm9jZXNzIGlmIHRoZXJlIGFyZSBQ cm92aXNpb25hbFBhZ2VQcm94eSBvYmplY3RzIHVzaW5nIGl0LgorCisgICAgICAgICogVUlQcm9j ZXNzL1dlYlByb2Nlc3NQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6 OmFkZFByb3Zpc2lvbmFsUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1By b3h5OjpyZW1vdmVQcm92aXNpb25hbFBhZ2VQcm94eSk6CisKKyAgICAgICAgKiBXZWJLaXQueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9X ZWJGcmFtZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OnRvUG9saWN5QWN0aW9uKToKKyAgICAgICAg KFdlYktpdDo6V2ViRnJhbWU6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbik6CisgICAgICAgIFN0 b3AgZGVhbGluZyB3aXRoIFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZCBhcyBpdCBubyBsb25nZXIg ZXhpc3RzLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlOjpyZWluaXRpYWxpemVXZWJQYWdlKToKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKToKKworICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlOjpzZXRJc1N1c3BlbmRlZCk6CisgICAgICAgIFN1c3BlbmQgdGhlIFBhZ2Ug d2hlbiBzZXRJc1N1c3BlbmRlZCh0cnVlKSBpcyBjYWxsZWQsIG5vdyB0aGF0IHRoZXJlIGlzIG5v IGxvbmdlciBhIFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZC4KKyAgICAgICAgc2V0SXNTdXNwZW5k ZWQodHJ1ZSkgSVBDIGlzIHNlbnQgd2hlbiB3ZSBhY3R1YWxseSBjb21taXQgdGhlIHByb3Zpc2lv bmFsIHBhZ2UuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFu aW1hdGlvbkRyYXdpbmdBcmVhLm1tOgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYTo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEpOgorCiAyMDE5LTAx LTE0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgU3BsaXQgaGVhZGVyVmFsdWVGb3JWYXJ5IGludG8gc3BlY2lhbGl6ZWQgZnVuY3Rpb25zIGZv ciBOZXR3b3JrUHJvY2VzcyBhbmQgV2ViUHJvY2Vzcy9XZWJLaXRMZWdhY3kKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDRjMjZhNjk4MWI0NjRkYTU5MTZmMDVlYjczNTk2 NjkxNTdlZTlmZmUuLmViZjk1MGJhNmMyZWQ5MWY2MjMyYmQyYjVlZmI5Zjc5NTU3YWI1OGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMjAzMiwxMSArMjAzMiwxMSBA QCB2b2lkIEZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQoKQogCiAgICAgICAgIE9w dGlvbmFsPEhhc0luc2VjdXJlQ29udGVudD4gaGFzSW5zZWN1cmVDb250ZW50ID0gY2FjaGVkUGFn ZS0+Y2FjaGVkTWFpbkZyYW1lKCktPmhhc0luc2VjdXJlQ29udGVudCgpOwogCisgICAgICAgIGRp c3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOworCiAgICAgICAgIC8vIEZJ WE1FOiBUaGlzIEFQSSBzaG91bGQgYmUgdHVybmVkIGFyb3VuZCBzbyB0aGF0IHdlIGdyb3VuZCBD YWNoZWRQYWdlIGludG8gdGhlIFBhZ2UuCiAgICAgICAgIGNhY2hlZFBhZ2UtPnJlc3RvcmUoKm1f ZnJhbWUucGFnZSgpKTsKIAotICAgICAgICBkaXNwYXRjaERpZENvbW1pdExvYWQoaGFzSW5zZWN1 cmVDb250ZW50KTsKLQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgICAgIG1fZnJhbWUu cGFnZSgpLT5jaHJvbWUoKS5zZXREaXNwYXRjaFZpZXdwb3J0RGF0YURpZENoYW5nZVN1cHByZXNz ZWQoZmFsc2UpOwogICAgICAgICBtX2ZyYW1lLnBhZ2UoKS0+Y2hyb21lKCkuZGlzcGF0Y2hWaWV3 cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UobV9mcmFtZS5wYWdlKCktPnZpZXdwb3J0QXJndW1lbnRz KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzLmNwcAppbmRleCBjYTJkZjQwZWUxZGQyY2EzNmYzYTQ4YTA0NzU3Zjk3YmRiYjYzNjQ3Li42 ZDA3YzAzYWQ4YzkyN2U1NDUzYzVmZGE5NTk2NzA5YTc3MjYxZTJiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcApAQCAtNzMsNyAr NzMsNyBAQCB2b2lkIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZShJUEM6OkVuY29k ZXImIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2Rlci5lbmNvZGVFbnVtKGxheWVySG9zdGluZ01v ZGUpOwogICAgIGVuY29kZXIgPDwgbWltZVR5cGVzV2l0aEN1c3RvbUNvbnRlbnRQcm92aWRlcnM7 CiAgICAgZW5jb2RlciA8PCBjb250cm9sbGVkQnlBdXRvbWF0aW9uOwotICAgIGVuY29kZXIgPDwg aXNTd2FwRnJvbVN1c3BlbmRlZDsKKyAgICBlbmNvZGVyIDw8IGlzUHJvY2Vzc1N3YXA7CiAKICNp ZiBQTEFURk9STShNQUMpCiAgICAgZW5jb2RlciA8PCBjb2xvclNwYWNlOwpAQCAtMjI3LDcgKzIy Nyw3IEBAIE9wdGlvbmFsPFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM+IFdlYlBhZ2VDcmVhdGlv blBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkRlY29kCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxv cHQ7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmNvbnRyb2xsZWRCeUF1dG9t YXRpb24pKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotICAgIGlmICghZGVjb2Rlci5k ZWNvZGUocGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKSkKKyAgICBpZiAoIWRlY29kZXIu ZGVjb2RlKHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkpCiAgICAgICAgIHJldHVybiBXVEY6Om51 bGxvcHQ7CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9X ZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgKaW5kZXggYWU0MzI1Y2JkNWYxZTU2NzYxNjU4NmY1 ZTlmYTczZWU1YjM1YjkzNy4uYjM4MmNlZWRkNDQ5YThkOWEwZjg2OTQ3MzVmMjZjMDU5NWRkZWNk OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1l dGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnMuaApAQCAtMTI5LDcgKzEyOSw3IEBAIHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz IHsKICAgICBWZWN0b3I8U3RyaW5nPiBtaW1lVHlwZXNXaXRoQ3VzdG9tQ29udGVudFByb3ZpZGVy czsKIAogICAgIGJvb2wgY29udHJvbGxlZEJ5QXV0b21hdGlvbjsKLSAgICBib29sIGlzU3dhcEZy b21TdXNwZW5kZWQgeyBmYWxzZSB9OworICAgIGJvb2wgaXNQcm9jZXNzU3dhcCB7IGZhbHNlIH07 CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgQ29sb3JTcGFjZURhdGEgY29sb3JTcGFjZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oIGIvU291cmNl L1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKaW5kZXggMTQyYTUxOGRmMDk3ZTVlZjJm YTE4MDQ4NGUwOWQwMzMzYzEwNWI4MS4uMzk3MTc5NWM0NmE1MWIzODgxOGM1NWI3NmQ2NTNhMzRi NTI4OWU5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9u LmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKQEAgLTI5LDEx ICsyOSwxMSBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorLy8gRklYTUU6IFJlbW92ZSB0aGlz IHR5cGUgYW5kIHVzZSBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gaW5zdGVhZC4KIGVudW0gY2xhc3Mg V2ViUG9saWN5QWN0aW9uIDogdWludDhfdCB7CiAgICAgVXNlLAogICAgIERvd25sb2FkLAotICAg IElnbm9yZSwKLSAgICBTdXNwZW5kCisgICAgSWdub3JlCiB9OwogCiB9CkBAIC00NSw4ICs0NSw3 IEBAIHRlbXBsYXRlPD4gc3RydWN0IEVudW1UcmFpdHM8V2ViS2l0OjpXZWJQb2xpY3lBY3Rpb24+ IHsKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb24sCiAgICAgICAgIFdlYktpdDo6V2Vi UG9saWN5QWN0aW9uOjpVc2UsCiAgICAgICAgIFdlYktpdDo6V2ViUG9saWN5QWN0aW9uOjpEb3du bG9hZCwKLSAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246Oklnbm9yZSwKLSAgICAgICAg V2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQKKyAgICAgICAgV2ViS2l0OjpXZWJQb2xp Y3lBY3Rpb246Oklnbm9yZQogICAgID47CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1NvdXJjZXMudHh0IGIvU291cmNlL1dlYktpdC9Tb3VyY2VzLnR4dAppbmRleCBhMGI2ZjcyODQ2 MDQxYzI2M2E1NDc2NzEwZWFjOTg3ZmVkMWQxNjA0Li44YWVjYjg2NDcyNTAyZDAyN2EzNGFmMzcx OWRkODI4YjAwN2RiMTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMudHh0Cisr KyBiL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQKQEAgLTIzMCw2ICsyMzAsNyBAQCBVSVByb2Nl c3MvSW5zcGVjdG9yVGFyZ2V0UHJveHkuY3BwCiBVSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5jcHAK IFVJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcAogVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRs ZXIuY3BwCitVSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCiBVSVByb2Nlc3MvUmVt b3RlV2ViSW5zcGVjdG9yUHJveHkuY3BwCiBVSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NUaW1lci5j cHAKIFVJUHJvY2Vzcy9TZXJ2aWNlV29ya2VyUHJvY2Vzc1Byb3h5LmNwcApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMDc0Y2RkZmQyNzg0 ZTg2OTEyOGQwMjBiZWQ1OTIxM2ExY2JkZGU2OC4uNGRmYWQ2NGUwMTU0MzU5MjgwZTYxNjhiMWYx ZWQ1ZWJlNmQ3ZDliYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tCkBAIC00NCw2ICs0NCw3IEBACiAjaW1wb3J0ICJOYXZpZ2F0aW9uU3RhdGUu aCIKICNpbXBvcnQgIk9iakNPYmplY3RHcmFwaC5oIgogI2ltcG9ydCAiUGFnZUNsaWVudC5oIgor I2ltcG9ydCAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbXBvcnQgIlJlbW90ZUxheWVyVHJl ZVNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YS5oIgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJUcmVlVHJh bnNhY3Rpb24uaCIKICNpbXBvcnQgIlJlbW90ZU9iamVjdFJlZ2lzdHJ5LmgiCkBAIC00NzAwLDYg KzQ3MDEsMTEgQEAgLSAodm9pZClfa2lsbFdlYkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRTdGF0ZQog ewogICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nlc3NQcm94eT4gcHJvdGVjdGVkUHJvY2Vzc1Byb3h5 KF9wYWdlLT5wcm9jZXNzKCkpOwogICAgIHByb3RlY3RlZFByb2Nlc3NQcm94eS0+cmVxdWVzdFRl cm1pbmF0aW9uKFdlYktpdDo6UHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpSZXF1ZXN0ZWRCeUNs aWVudCk7CisKKyAgICBpZiAoYXV0byogcHJvdmlzaW9uYWxQYWdlUHJveHkgPSBfcGFnZS0+cHJv dmlzaW9uYWxQYWdlUHJveHkoKSkgeworICAgICAgICBSZWY8V2ViS2l0OjpXZWJQcm9jZXNzUHJv eHk+IHByb3RlY3RlZFByb2Nlc3NQcm94eShwcm92aXNpb25hbFBhZ2VQcm94eS0+cHJvY2Vzcygp KTsKKyAgICAgICAgcHJvdGVjdGVkUHJvY2Vzc1Byb3h5LT5yZXF1ZXN0VGVybWluYXRpb24oV2Vi S2l0OjpQcm9jZXNzVGVybWluYXRpb25SZWFzb246OlJlcXVlc3RlZEJ5Q2xpZW50KTsKKyAgICB9 CiB9CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9QYWdlQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgK aW5kZXggMTQ5NzE0YWIxZDIyNjVhNjgzNGQ1N2VmNDdiMTE2ZWE0ZTI5ZTM1MS4uODJjNzczMjJm MmRmODdlM2FlZDVlMDA0YzYxYjJmNzkzOTUwZTM4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Bh Z2VDbGllbnQuaApAQCAtNDgsNiArNDgsNyBAQAogCiBPQkpDX0NMQVNTIENBTGF5ZXI7CiBPQkpD X0NMQVNTIE5TRmlsZVdyYXBwZXI7CitPQkpDX0NMQVNTIE5TTWVudTsKIE9CSkNfQ0xBU1MgTlNT ZXQ7CiBPQkpDX0NMQVNTIFdLRHJhd2luZ1ZpZXc7CiBPQkpDX0NMQVNTIF9XS1JlbW90ZU9iamVj dFJlZ2lzdHJ5OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9u YWxQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdl UHJveHkuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjE2NGUwOTZhOTg5ODVjMGYyODM0MGMxYTk4MDQ0NWYzZTJk YmY0OWMKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNp b25hbFBhZ2VQcm94eS5jcHAKQEAgLTAsMCArMSwzMTQgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMp IDIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAor ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJj ZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIu IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUg Y29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRI SVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9S UyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElO Q0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBP RiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9T RSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09O VFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVO VEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElO Q0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVU RSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJV U0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZ IE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFks IE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVk ZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKKworI2luY2x1 ZGUgIkFQSU5hdmlnYXRpb24uaCIKKyNpbmNsdWRlICJEcmF3aW5nQXJlYVByb3h5LmgiCisjaW5j bHVkZSAiTG9nZ2luZy5oIgorI2luY2x1ZGUgIlBhZ2VDbGllbnQuaCIKKyNpbmNsdWRlICJXZWJC YWNrRm9yd2FyZExpc3QuaCIKKyNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3RJdGVtLmgiCisj aW5jbHVkZSAiV2ViRXJyb3JzLmgiCisjaW5jbHVkZSAiV2ViTmF2aWdhdGlvblN0YXRlLmgiCisj aW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2VzLmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCisj aW5jbHVkZSAiV2ViUGFnZVByb3h5TWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNzTWVz c2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNzUHJveHkuaCIKKyNpbmNsdWRlIDxXZWJDb3Jl L1Nob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZC5oPgorCituYW1lc3BhY2UgV2ViS2l0IHsKKwor I2RlZmluZSBSRUxFQVNFX0xPR19JRl9BTExPV0VEKGNoYW5uZWwsIGZtdCwgLi4uKSBSRUxFQVNF X0xPR19JRihtX3BhZ2UuaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCksIGNoYW5uZWwsICIlcCAt IFByb3Zpc2lvbmFsUGFnZVByb3h5OjoiIGZtdCwgdGhpcywgIyNfX1ZBX0FSR1NfXykKKyNkZWZp bmUgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChjaGFubmVsLCBmbXQsIC4uLikgUkVMRUFT RV9MT0dfRVJST1JfSUYobV9wYWdlLmlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpLCBjaGFubmVs LCAiJXAgLSBQcm92aXNpb25hbFBhZ2VQcm94eTo6IiBmbXQsIHRoaXMsICMjX19WQV9BUkdTX18p CisKK1Byb3Zpc2lvbmFsUGFnZVByb3h5OjpQcm92aXNpb25hbFBhZ2VQcm94eShXZWJQYWdlUHJv eHkmIHBhZ2UsIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2Vzcywgc3RkOjp1bmlxdWVfcHRy PFN1c3BlbmRlZFBhZ2VQcm94eT4gc3VzcGVuZGVkUGFnZSwgdWludDY0X3QgbmF2aWdhdGlvbklE LCBib29sIGlzU2VydmVyUmVkaXJlY3QsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYg cmVxdWVzdCwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50KQorICAgIDogbV9wYWdlKHBhZ2UpCisgICAgLCBtX3Byb2Nlc3MoV1RGTW92ZShw cm9jZXNzKSkKKyAgICAsIG1fbmF2aWdhdGlvbklEKG5hdmlnYXRpb25JRCkKKyAgICAsIG1faXNT ZXJ2ZXJSZWRpcmVjdChpc1NlcnZlclJlZGlyZWN0KQorICAgICwgbV9yZXF1ZXN0KHJlcXVlc3Qp CisgICAgLCBtX3Byb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQocHJvY2Vzc1N3YXBSZXF1ZXN0 ZWRCeUNsaWVudCkKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgICwgbV9zdXNwZW5zaW9u VG9rZW4obV9wcm9jZXNzLT50aHJvdHRsZXIoKS5mb3JlZ3JvdW5kQWN0aXZpdHlUb2tlbigpKQor I2VuZGlmCit7CisgICAgbV9wcm9jZXNzLT5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCksICp0aGlz KTsKKyAgICBtX3Byb2Nlc3MtPmFkZFByb3Zpc2lvbmFsUGFnZVByb3h5KCp0aGlzKTsKKworICAg IC8vIElmIHdlIGFyZSByZWF0dGFjaGluZyB0byBhIFN1c3BlbmRlZFBhZ2UsIHRoZW4gdGhlIFdl YlByb2Nlc3MnIFdlYlBhZ2UgYWxyZWFkeSBleGlzdHMgYW5kCisgICAgLy8gV2ViUGFnZVByb3h5 OjpkaWRDcmVhdGVNYWluRnJhbWUoKSB3aWxsIG5vdCBiZSBjYWxsZWQgdG8gaW5pdGlhbGl6ZSBt X21haW5GcmFtZS4gSW4gc3VjaAorICAgIC8vIGNhc2UsIHdlIG5lZWQgdG8gaW5pdGlhbGl6ZSBt X21haW5GcmFtZSB0byByZWZsZWN0IHRoZSBmYWN0IHRoZSB0aGUgV2ViUHJvY2VzcycgV2ViUGFn ZQorICAgIC8vIGFscmVhZHkgZXhpc3RzIGFuZCBhbHJlYWR5IGhhcyBhIG1haW4gZnJhbWUuCisg ICAgaWYgKHN1c3BlbmRlZFBhZ2UpIHsKKyAgICAgICAgQVNTRVJUKCZzdXNwZW5kZWRQYWdlLT5w cm9jZXNzKCkgPT0gbV9wcm9jZXNzLnB0cigpKTsKKyAgICAgICAgc3VzcGVuZGVkUGFnZS0+dW5z dXNwZW5kKCk7CisgICAgICAgIG1fbWFpbkZyYW1lID0gV2ViRnJhbWVQcm94eTo6Y3JlYXRlKG1f cGFnZSwgc3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSk7CisgICAgICAgIG1fcHJvY2Vzcy0+ ZnJhbWVDcmVhdGVkKHN1c3BlbmRlZFBhZ2UtPm1haW5GcmFtZUlEKCksICptX21haW5GcmFtZSk7 CisgICAgfQorCisgICAgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsKK30KKworUHJvdmlzaW9uYWxQYWdl UHJveHk6On5Qcm92aXNpb25hbFBhZ2VQcm94eSgpCit7CisgICAgbV9wcm9jZXNzLT5yZW1vdmVQ cm92aXNpb25hbFBhZ2VQcm94eSgqdGhpcyk7CisKKyAgICBpZiAobV93YXNDb21taXR0ZWQpCisg ICAgICAgIHJldHVybjsKKworICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJ RCgpKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNsb3NlKCksIG1f cGFnZS5wYWdlSUQoKSk7CisKKyAgICBpZiAobV9kcmF3aW5nQXJlYSkgeworICAgICAgICBhdXRv IHBhZ2VQcm9jZXNzT3ZlcnJpZGUgPSBtX3BhZ2UudGVtcG9yYXJpbHlPdmVycmlkZVByb2Nlc3Mo bV9wcm9jZXNzKTsKKyAgICAgICAgbV9kcmF3aW5nQXJlYSA9IG51bGxwdHI7CisgICAgfQorCisg ICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtwcm9jZXNzID0gbV9wcm9jZXNzLmNvcHlSZWYo KV0geworICAgICAgICBwcm9jZXNzLT5tYXliZVNodXREb3duKCk7CisgICAgfSk7Cit9CisKK3Zv aWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OnByb2Nlc3NEaWRUZXJtaW5hdGUoKQoreworICAgIFJF TEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAicHJvY2Vzc0RpZFRl cm1pbmF0ZTogcGFnZUlEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCkpOworICAgIG1fcGFn ZS5wcm92aXNpb25hbFByb2Nlc3NEaWRUZXJtaW5hdGUoKTsKK30KKworc3RkOjp1bmlxdWVfcHRy PERyYXdpbmdBcmVhUHJveHk+IFByb3Zpc2lvbmFsUGFnZVByb3h5Ojp0YWtlRHJhd2luZ0FyZWEo KQoreworICAgIHJldHVybiBXVEZNb3ZlKG1fZHJhd2luZ0FyZWEpOworfQorCit2b2lkIFByb3Zp c2lvbmFsUGFnZVByb3h5OjpjYW5jZWwoKQoreworICAgIC8vIElmIHRoZSBwcm92aXNpb25hbCBs b2FkIHN0YXJ0ZWQsIHRoZW4gaW5kaWNhdGUgdGhhdCBpdCBmYWlsZWQgZHVlIHRvIGNhbmNlbGxh dGlvbiBieSBjYWxsaW5nIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSgpLgorICAgIGlm IChtX3Byb3Zpc2lvbmFsTG9hZFVSTC5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKworICAg IFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiY2FuY2VsOiBTaW11bGF0 aW5nIGEgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lIGZvciBwYWdlSUQgPSAlIiBQUkl1 NjQsIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKKyAgICBhdXRv IGVycm9yID0gV2ViS2l0OjpjYW5jZWxsZWRFcnJvcihtX3JlcXVlc3QpOworICAgIGVycm9yLnNl dFR5cGUoV2ViQ29yZTo6UmVzb3VyY2VFcnJvcjo6VHlwZTo6Q2FuY2VsbGF0aW9uKTsKKyAgICBk aWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUobV9tYWluRnJhbWUtPmZyYW1lSUQoKSwgeyB9 LCBtX25hdmlnYXRpb25JRCwgbV9wcm92aXNpb25hbExvYWRVUkwsIGVycm9yLCBVc2VyRGF0YSB7 IH0pOyAvLyBXaWxsIGRlbGV0ZSB8dGhpc3wuCit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJv eHk6OnByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmcoKQoreworICAgIFJFTEVBU0VfTE9HX0lGX0FM TE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAicHJvY2Vzc0RpZEZpbmlzaExhdW5jaGluZzogcGFnZUlE ID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCkpOworICAgIGZpbmlzaEluaXRpYWxpemluZ1dl YlBhZ2VBZnRlclByb2Nlc3NMYXVuY2goKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94 eTo6ZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCgpCit7CisgICAg QVNTRVJUKG1fcHJvY2Vzcy0+c3RhdGUoKSA9PSBXZWJQcm9jZXNzUHJveHk6OlN0YXRlOjpSdW5u aW5nKTsKKworICAgIC8vIEZJWE1FOiBUaGUgV2ViUGFnZVByb3h5IGRlbGF5cyBhZGRpbmcgdGhl IHZpc2l0ZWQgbGluayBzdG9yZSB1bnRpbCBhZnRlciB0aGUgcHJvY2VzcyBoYXMgbGF1bmNoZWQK KyAgICAvLyBzbyB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkgZG9lcyB0aGUgc2FtZS4gSG93ZXZl ciwgZG8gd2UgcmVhbGx5IG5lZWQgdG8/CisgICAgbV9wcm9jZXNzLT5hZGRWaXNpdGVkTGlua1N0 b3JlKG1fcGFnZS52aXNpdGVkTGlua1N0b3JlKCkpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFn ZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSgpCit7CisgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJy aWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAg bV9kcmF3aW5nQXJlYSA9IG1fcGFnZS5wYWdlQ2xpZW50KCkuY3JlYXRlRHJhd2luZ0FyZWFQcm94 eSgpOworCisgICAgYXV0byBwYXJhbWV0ZXJzID0gbV9wYWdlLmNyZWF0aW9uUGFyYW1ldGVycygp OworICAgIHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCA9IHRydWU7CisgICAgbV9wcm9jZXNzLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpDcmVhdGVXZWJQYWdlKG1fcGFnZS5wYWdlSUQoKSwg cGFyYW1ldGVycyksIDApOworCisgICAgaWYgKG1fcHJvY2Vzcy0+c3RhdGUoKSA9PSBXZWJQcm9j ZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKQorICAgICAgICBmaW5pc2hJbml0aWFsaXppbmdXZWJQ YWdlQWZ0ZXJQcm9jZXNzTGF1bmNoKCk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6 OmxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBjb25z dCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0 IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVz ZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykK K3sKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImxvYWREYXRh V2l0aE5hdmlnYXRpb246IHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wYWdlLnBhZ2VJRCgpKTsKKwor ICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3JhcmlseU92ZXJyaWRl UHJvY2VzcyhtX3Byb2Nlc3MpOworICAgIG1fcGFnZS5sb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKG5h dmlnYXRpb24sIGRhdGEsIE1JTUVUeXBlLCBlbmNvZGluZywgYmFzZVVSTCwgdXNlckRhdGEsIFdl YkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNpdGVQ b2xpY2llcykpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdp dGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0JiYgcmVxdWVzdCwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGlj eSBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIE9w dGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQoreworICAgIFJF TEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAibG9hZFJlcXVlc3RXaXRoTmF2 aWdhdGlvbjogcGFnZUlEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAgYXV0 byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNz KG1fcHJvY2Vzcyk7CisgICAgbV9wYWdlLmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24obmF2aWdh dGlvbiwgV1RGTW92ZShyZXF1ZXN0KSwgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgdXNl ckRhdGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3Zl KHdlYnNpdGVQb2xpY2llcykpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpnb1Rv QmFja0ZvcndhcmRJdGVtKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgV2ViQmFja0Zvcndh cmRMaXN0SXRlbSYgaXRlbSwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRl UG9saWNpZXMpCit7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcs ICJnb1RvQmFja0ZvcndhcmRJdGVtOiBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQo KSk7CisKKyAgICBhdXRvIGl0ZW1TdGF0ZXMgPSBtX3BhZ2UuYmFja0ZvcndhcmRMaXN0KCkuZmls dGVyZWRJdGVtU3RhdGVzKFt0aGlzLCB0YXJnZXRJdGVtID0gJml0ZW1dKGF1dG8mIGl0ZW0pIHsK KyAgICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBpdGVtLnN1c3BlbmRlZFBhZ2UoKSkgeworICAgICAg ICAgICAgaWYgKCZwYWdlLT5wcm9jZXNzKCkgPT0gbV9wcm9jZXNzLnB0cigpKQorICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gJml0ZW0gIT0g dGFyZ2V0SXRlbTsKKyAgICB9KTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OlVwZGF0ZUJhY2tGb3J3YXJkTGlzdEZvclJlYXR0YWNoKFdURk1vdmUoaXRlbVN0YXRlcykp LCBtX3BhZ2UucGFnZUlEKCkpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBpdGVtLml0 ZW1JRCgpLCAqbmF2aWdhdGlvbi5iYWNrRm9yd2FyZEZyYW1lTG9hZFR5cGUoKSwgV2ViQ29yZTo6 U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVz KSksIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVy KCkuc3RhcnQoKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFp bkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCit7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQ cm9jZXNzU3dhcHBpbmcsICJkaWRDcmVhdGVNYWluRnJhbWU6IHBhZ2VJRCA9ICUiIFBSSXU2NCAi LCBmcmFtZUlEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQpOworICAgIEFT U0VSVCghbV9tYWluRnJhbWUpOworCisgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5Ojpj cmVhdGUobV9wYWdlLCBmcmFtZUlEKTsKKworICAgIC8vIEFkZCB0aGUgZnJhbWUgdG8gdGhlIHBy b2Nlc3Mgd2lkZSBtYXAuCisgICAgbV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoZnJhbWVJRCwgKm1f bWFpbkZyYW1lKTsKKworICAgIC8vIFRoaXMgbmF2aWdhdGlvbiB3YXMgZGVzdHJveWVkIHNvIG5v IG5lZWQgdG8gbm90aWZ5IG9mIHJlZGlyZWN0LgorICAgIGlmICghbV9wYWdlLm5hdmlnYXRpb25T dGF0ZSgpLmhhc05hdmlnYXRpb24obV9uYXZpZ2F0aW9uSUQpKQorICAgICAgICByZXR1cm47CisK KyAgICAvLyBSZXN0b3JlIHRoZSBtYWluIGZyYW1lJ3MgY29tbWl0dGVkIFVSTCBhcyBzb21lIGNs aWVudHMgbWF5IHJlbHkgb24gaXQgdW50aWwgdGhlIG5leHQgbG9hZCBpcyBjb21taXR0ZWQuCisg ICAgaWYgKGF1dG8qIG1haW5GcmFtZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAgICAgbV9t YWluRnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkuc2V0VVJMKG1haW5GcmFtZS0+ZnJhbWVMb2FkU3Rh dGUoKS51cmwoKSk7CisKKyAgICAvLyBOb3JtYWxseSwgbm90aWZpY2F0aW9uIG9mIGEgc2VydmVy IHJlZGlyZWN0IGNvbWVzIGZyb20gdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KKyAgICAvLyBJZiB3 ZSBhcmUgcHJvY2VzcyBzd2FwcGluZyBpbiByZXNwb25zZSB0byBhIHNlcnZlciByZWRpcmVjdCB0 aGVuIHRoYXQgbm90aWZpY2F0aW9uIHdpbGwgbm90IGNvbWUgZnJvbSB0aGUgbmV3IFdlYkNvbnRl bnQgcHJvY2Vzcy4KKyAgICAvLyBJbiB0aGlzIGNhc2Ugd2UgaGF2ZSB0aGUgVUlQcm9jZXNzIHN5 bnRoZXNpemUgdGhlIHJlZGlyZWN0IG5vdGlmaWNhdGlvbiBhdCB0aGUgYXBwcm9wcmlhdGUgdGlt ZS4KKyAgICBpZiAobV9pc1NlcnZlclJlZGlyZWN0KSB7CisgICAgICAgIG1fbWFpbkZyYW1lLT5m cmFtZUxvYWRTdGF0ZSgpLmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKG1fcmVxdWVzdC51cmwoKSk7 CisKKyAgICAgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRlbXBvcmFyaWx5 T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgICAgIG1fcGFnZS5kaWRSZWNlaXZlU2Vy dmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZShtX21haW5GcmFtZS0+ZnJhbWVJ RCgpLCBtX25hdmlnYXRpb25JRCwgV1RGTW92ZShtX3JlcXVlc3QpLCB7IH0pOworICAgIH0KK30K Kwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JG cmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmIHVybCwg VVJMJiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICAv LyBJZiB0aGUgcHJldmlvdXMgcHJvdmlzaW9uYWwgbG9hZCB1c2VkIHRoZSBzYW1lIHByb2Nlc3Ms IHdlIG1heSByZWNlaXZlIElQQyBmb3IgdGhpcyBwcmV2aW91cyBwcm92aXNpb25hbCdzIG1haW4g ZnJhbWUgdGhhdCB3ZSBuZWVkIHRvIGlnbm9yZS4KKyAgICBpZiAoIW1fbWFpbkZyYW1lIHx8IG1f bWFpbkZyYW1lLT5mcmFtZUlEKCkgIT0gZnJhbWVJRCkKKyAgICAgICAgcmV0dXJuOworCisgICAg UkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJkaWRTdGFydFByb3Zpc2lv bmFsTG9hZEZvckZyYW1lOiBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2 NCAiLCBuYXZpZ2F0aW9uSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSwgZnJhbWVJRCwg bmF2aWdhdGlvbklEKTsKKyAgICBBU1NFUlQobV9wcm92aXNpb25hbExvYWRVUkwuaXNOdWxsKCkp OworICAgIG1fcHJvdmlzaW9uYWxMb2FkVVJMID0gdXJsOworCisgICAgLy8gTWVyZWx5IGZvbGxv d2luZyBhIHNlcnZlciBzaWRlIHJlZGlyZWN0IHNvIHRoZXJlIGlzIG5vIG5lZWQgdG8gc2VuZCBh IGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkIGFnYWluLgorICAgIGlmIChtX2lzU2VydmVyUmVkaXJl Y3QpCisgICAgICAgIHJldHVybjsKKworICAgIC8vIENsaWVudHMgZXhwZWN0IHRoZSBQYWdlJ3Mg bWFpbiBmcmFtZSdzIGV4cGVjdGVkVVJMIHRvIGJlIHRoZSBwcm92aXNpb25hbCBvbmUgd2hlbiBh IHByb3Zpc2lvbmFsIGxvYWQgaXMgc3RhcnRlZC4KKyAgICBpZiAoYXV0byogcGFnZU1haW5GcmFt ZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAgICAgcGFnZU1haW5GcmFtZS0+ZGlkU3RhcnRQ cm92aXNpb25hbExvYWQodXJsKTsKKworICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1f cGFnZS50ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgIG1fcGFnZS5k aWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgV1RG TW92ZSh1cmwpLCBXVEZNb3ZlKHVucmVhY2hhYmxlVVJMKSwgdXNlckRhdGEpOworfQorCit2b2lk IFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWlu dDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNl Y3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlz aW9uYWxVUkwsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImIGVycm9yLCBjb25zdCBVc2Vy RGF0YSYgdXNlckRhdGEpCit7CisgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdl LnRlbXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisKKyAgICBSRUxFQVNFX0xP R19FUlJPUl9JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZEZhaWxQcm92aXNpb25hbExv YWRGb3JGcmFtZTogcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwg bmF2aWdhdGlvbklEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQsIG5hdmln YXRpb25JRCk7CisgICAgbV9wcm92aXNpb25hbExvYWRVUkwgPSB7IH07CisKKyAgICAvLyBNYWtl IHN1cmUgdGhlIFBhZ2UncyBtYWluIGZyYW1lJ3MgZXhwZWN0ZWRVUkwgZ2V0cyBjbGVhcmVkIHNp bmNlIHdlIHVwZGF0ZWQgaXQgaW4gZGlkU3RhcnRQcm92aXNpb25hbExvYWQuCisgICAgaWYgKGF1 dG8qIHBhZ2VNYWluRnJhbWUgPSBtX3BhZ2UubWFpbkZyYW1lKCkpCisgICAgICAgIHBhZ2VNYWlu RnJhbWUtPmRpZEZhaWxQcm92aXNpb25hbExvYWQoKTsKKworICAgIG1fcGFnZS5kaWRGYWlsUHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUoZnJhbWVJRCwgZnJhbWVTZWN1cml0eU9yaWdpbiwgbmF2aWdh dGlvbklELCBwcm92aXNpb25hbFVSTCwgZXJyb3IsIHVzZXJEYXRhKTsgLy8gV2lsbCBkZWxldGUg fHRoaXN8LgorfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9y RnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJp bmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJf dCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmlj YXRlSW5mbywgYm9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpI YXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRh dGEmIHVzZXJEYXRhKQoreworICAgIC8vIElmIHRoZSBwcmV2aW91cyBwcm92aXNpb25hbCBsb2Fk IHVzZWQgdGhlIHNhbWUgcHJvY2Vzcywgd2UgbWF5IHJlY2VpdmUgSVBDIGZvciB0aGlzIHByZXZp b3VzIHByb3Zpc2lvbmFsJ3MgbWFpbiBmcmFtZSB0aGF0IHdlIG5lZWQgdG8gaWdub3JlLgorICAg IGlmICghbV9tYWluRnJhbWUgfHwgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSAhPSBmcmFtZUlEKQor ICAgICAgICByZXR1cm47CisKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2Fw cGluZywgImRpZENvbW1pdExvYWRGb3JGcmFtZTogcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1l SUQgPSAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlE KCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCk7CisgICAgbV9wcm92aXNpb25hbExvYWRVUkwgPSB7 IH07CisgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAg bV93YXNDb21taXR0ZWQgPSB0cnVlOworICAgIG1fcGFnZS5jb21taXRQcm92aXNpb25hbFBhZ2Uo ZnJhbWVJRCwgbmF2aWdhdGlvbklELCBtaW1lVHlwZSwgZnJhbWVIYXNDdXN0b21Db250ZW50UHJv dmlkZXIsIGZyYW1lTG9hZFR5cGUsIGNlcnRpZmljYXRlSW5mbywgY29udGFpbnNQbHVnaW5Eb2N1 bWVudCwgZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCB1c2VyRGF0YSk7IC8vIFdpbGwgZGVsZXRl IHx0aGlzfC4KK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkUmVjZWl2ZU1lc3Nh Z2UoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBJUEM6OkRlY29kZXImIGRlY29kZXIpCit7 CisgICAgQVNTRVJUKGRlY29kZXIubWVzc2FnZVJlY2VpdmVyTmFtZSgpID09IE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSk7CisKKyAgICBpZiAoZGVjb2Rlci5t ZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFN0YXJ0UHJvZ3Jlc3M6 Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6RGlkQ2hhbmdlUHJvZ3Jlc3M6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVy Lm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6QmFja0ZvcndhcmRBZGRJ dGVtOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OkxvZ0RpYWdub3N0aWNNZXNzYWdlOjpuYW1lKCkKKyAgICAgICAgfHwg ZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkxvZ0RpYWdu b3N0aWNNZXNzYWdlV2l0aEVuaGFuY2VkUHJpdmFjeTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29k ZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTZXROZXR3b3JrUmVx dWVzdHNJblByb2dyZXNzOjpuYW1lKCkKKyNpZiBQTEFURk9STShDT0NPQSkKKyAgICAgICAgfHwg ZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlJlZ2lzdGVy V2ViUHJvY2Vzc0FjY2Vzc2liaWxpdHlUb2tlbjo6bmFtZSgpCisjZW5kaWYKKyAgICAgICAgfHwg ZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRlY2lkZVBv bGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYzo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIu bWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTdGFydFVSTFNjaGVtZVRh c2s6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6RGVjaWRlUG9saWN5Rm9yUmVzcG9uc2U6Om5hbWUoKQorICAgICAgICB8 fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkUGVy Zm9ybUNsaWVudFJlZGlyZWN0OjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFt ZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9y RnJhbWU6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6RGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGE6Om5hbWUoKSkK KyAgICB7CisgICAgICAgIGF1dG8gcGFnZVByb2Nlc3NPdmVycmlkZSA9IG1fcGFnZS50ZW1wb3Jh cmlseU92ZXJyaWRlUHJvY2VzcyhtX3Byb2Nlc3MpOworICAgICAgICBtX3BhZ2UuZGlkUmVjZWl2 ZU1lc3NhZ2UoY29ubmVjdGlvbiwgZGVjb2Rlcik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisK KyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 OkRpZENyZWF0ZU1haW5GcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2Fn ZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDcmVhdGVNYWluRnJhbWU+KGRlY29kZXIsIHRo aXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKTsKKyAgICAgICAg cmV0dXJuOworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6RGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTo6bmFtZSgp KSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpE aWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lPihkZWNvZGVyLCB0aGlzLCAmUHJvdmlzaW9u YWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOworICAgICAgICBy ZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpEaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6Om5hbWUoKSkg eworICAgICAgICBJUEM6OmhhbmRsZU1lc3NhZ2U8TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlk RmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lPihkZWNvZGVyLCB0aGlzLCAmUHJvdmlzaW9uYWxQ YWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSk7CisgICAgICAgIHJldHVy bjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OkRpZENvbW1pdExvYWRGb3JGcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQ Qzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDb21taXRMb2FkRm9y RnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9h ZEZvckZyYW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIExPRyhQcm9jZXNzU3dh cHBpbmcsICJVbmhhbmRsZWQgbWVzc2FnZSAlczo6JXMgZnJvbSBwcm92aXNpb25hbCBwcm9jZXNz IiwgZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkudG9TdHJpbmcoKS5kYXRhKCksIGRlY29k ZXIubWVzc2FnZU5hbWUoKS50b1N0cmluZygpLmRhdGEoKSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9u YWxQYWdlUHJveHk6OmRpZFJlY2VpdmVTeW5jTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mIGNvbm5l Y3Rpb24sIElQQzo6RGVjb2RlciYgZGVjb2Rlciwgc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rl cj4mIGVuY29kZXIpCit7CisgICAgYXV0byBwYWdlUHJvY2Vzc092ZXJyaWRlID0gbV9wYWdlLnRl bXBvcmFyaWx5T3ZlcnJpZGVQcm9jZXNzKG1fcHJvY2Vzcyk7CisgICAgbV9wYWdlLmRpZFJlY2Vp dmVTeW5jTWVzc2FnZShjb25uZWN0aW9uLCBkZWNvZGVyLCBlbmNvZGVyKTsKK30KKworfSAvLyBu YW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92 aXNpb25hbFBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQ YWdlUHJveHkuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44YTBmNzFkZjhjYjRjNzYyNDI1MWU0MWRjOTNhY2UxODM2 NDkxYzNlCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlz aW9uYWxQYWdlUHJveHkuaApAQCAtMCwwICsxLDk1IEBACisvKgorICogQ29weXJpZ2h0IChDKSAy MDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAq IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2Ug Y29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBS ZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNv cHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3Ro ZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElT IFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMg YGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0Yg TUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0Ug QVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRS SUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRB TCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUg R09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJ TkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBP RiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBP UiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElO IEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI3ByYWdtYSBv bmNlCisKKyNpbmNsdWRlICJNZXNzYWdlUmVjZWl2ZXIuaCIKKyNpbmNsdWRlIDx3dGYvV2Vha1B0 ci5oPgorCituYW1lc3BhY2UgV2ViQ29yZSB7CitjbGFzcyBSZXNvdXJjZVJlcXVlc3Q7Cit9CisK K25hbWVzcGFjZSBXZWJLaXQgeworCitjbGFzcyBEcmF3aW5nQXJlYVByb3h5OworY2xhc3MgU3Vz cGVuZGVkUGFnZVByb3h5OworY2xhc3MgV2ViRnJhbWVQcm94eTsKK2NsYXNzIFdlYlBhZ2VQcm94 eTsKK2NsYXNzIFdlYlByb2Nlc3NQcm94eTsKKworY2xhc3MgUHJvdmlzaW9uYWxQYWdlUHJveHkg OiBwdWJsaWMgSVBDOjpNZXNzYWdlUmVjZWl2ZXIsIHB1YmxpYyBDYW5NYWtlV2Vha1B0cjxQcm92 aXNpb25hbFBhZ2VQcm94eT4geworICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOworcHVibGlj OgorICAgIFByb3Zpc2lvbmFsUGFnZVByb3h5KFdlYlBhZ2VQcm94eSYsIFJlZjxXZWJQcm9jZXNz UHJveHk+JiYsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+LCB1aW50NjRfdCBu YXZpZ2F0aW9uSUQsIGJvb2wgaXNTZXJ2ZXJSZWRpcmVjdCwgY29uc3QgV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0JiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCk7CisgICAgflByb3Zpc2lv bmFsUGFnZVByb3h5KCk7CisKKyAgICBXZWJQYWdlUHJveHkmIHBhZ2UoKSB7IHJldHVybiBtX3Bh Z2U7IH0KKyAgICBXZWJGcmFtZVByb3h5KiBtYWluRnJhbWUoKSBjb25zdCB7IHJldHVybiBtX21h aW5GcmFtZS5nZXQoKTsgfQorICAgIFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcygpIHsgcmV0dXJu IG1fcHJvY2Vzcy5nZXQoKTsgfQorICAgIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJv Y2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fcHJvY2Vzc1N3YXBS ZXF1ZXN0ZWRCeUNsaWVudDsgfQorICAgIHVpbnQ2NF90IG5hdmlnYXRpb25JRCgpIGNvbnN0IHsg cmV0dXJuIG1fbmF2aWdhdGlvbklEOyB9CisKKyAgICBEcmF3aW5nQXJlYVByb3h5KiBkcmF3aW5n QXJlYSgpIGNvbnN0IHsgcmV0dXJuIG1fZHJhd2luZ0FyZWEuZ2V0KCk7IH0KKyAgICBzdGQ6OnVu aXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gdGFrZURyYXdpbmdBcmVhKCk7CisKKyAgICB2b2lk IGxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgY29uc3QgSVBDOjpEYXRh UmVmZXJlbmNlJiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGlu ZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIE9wdGlvbmFs PFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOworICAgIHZvaWQgbG9hZFJl cXVlc3RXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBXZWJDb3JlOjpSZXNvdXJjZVJl cXVlc3QmJiwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgQVBJOjpPYmpl Y3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxs b3B0KTsKKyAgICB2b2lkIGdvVG9CYWNrRm9yd2FyZEl0ZW0oQVBJOjpOYXZpZ2F0aW9uJiwgV2Vi QmFja0ZvcndhcmRMaXN0SXRlbSYsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYpOwor ICAgIHZvaWQgY2FuY2VsKCk7CisKKyAgICB2b2lkIHByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmco KTsKKyAgICB2b2lkIHByb2Nlc3NEaWRUZXJtaW5hdGUoKTsKKworcHJpdmF0ZToKKyAgICAvLyBJ UEM6Ok1lc3NhZ2VSZWNlaXZlcgorICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25u ZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgZmluYWw7CisgICAgdm9pZCBkaWRSZWNlaXZlU3luY01l c3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJiwgc3RkOjp1bmlxdWVfcHRyPElQ Qzo6RW5jb2Rlcj4mKSBmaW5hbDsKKworICAgIHZvaWQgZGlkQ3JlYXRlTWFpbkZyYW1lKHVpbnQ2 NF90IGZyYW1lSUQpOworICAgIHZvaWQgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1 aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmLCBVUkwmJiB1bnJl YWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2b2lkIGRpZENvbW1pdExvYWRGb3JG cmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmlu ZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90 IGZyYW1lTG9hZFR5cGUsIGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYsIGJvb2wgY29u dGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50 PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBk aWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2Vi Q29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBu YXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNvcmU6 OlJlc291cmNlRXJyb3ImLCBjb25zdCBVc2VyRGF0YSYpOworCisgICAgdm9pZCBpbml0aWFsaXpl V2ViUGFnZSgpOworICAgIHZvaWQgZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vz c0xhdW5jaCgpOworCisgICAgV2ViUGFnZVByb3h5JiBtX3BhZ2U7CisgICAgUmVmPFdlYlByb2Nl c3NQcm94eT4gbV9wcm9jZXNzOworICAgIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5 PiBtX2RyYXdpbmdBcmVhOworICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5PiBtX21haW5GcmFtZTsK KyAgICB1aW50NjRfdCBtX25hdmlnYXRpb25JRDsKKyAgICBib29sIG1faXNTZXJ2ZXJSZWRpcmVj dDsKKyAgICBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QgbV9yZXF1ZXN0OworICAgIFByb2Nlc3NT d2FwUmVxdWVzdGVkQnlDbGllbnQgbV9wcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50OworICAg IGJvb2wgbV93YXNDb21taXR0ZWQgeyBmYWxzZSB9OworICAgIFVSTCBtX3Byb3Zpc2lvbmFsTG9h ZFVSTDsKKworI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgUHJvY2Vzc1Rocm90dGxlcjo6 QmFja2dyb3VuZEFjdGl2aXR5VG9rZW4gbV9zdXNwZW5zaW9uVG9rZW47CisjZW5kaWYKK307CisK K30gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3Bl bmRlZFBhZ2VQcm94eS5jcHAKaW5kZXggZjE5OGE4MTUzM2Y3NmIyZThlMmJmNzFkNGEzYjlkMjc0 MGM5NTA3OC4uZmY3NmQ5ZjdmOTdhYzZmYTRmYmIzMDJmNjQ2NjYxZDE2NzhhZTI1NyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwCkBAIC0xMDAs NyArMTAwLDkgQEAgU3VzcGVuZGVkUGFnZVByb3h5Ojp+U3VzcGVuZGVkUGFnZVByb3h5KCkKICAg ICAvLyBJZiB0aGUgc3VzcGVuZGVkIHBhZ2Ugd2FzIG5vdCBjb25zdW1lZCBiZWZvcmUgZ2V0dGlu ZyBkZXN0cm95ZWQsIHRoZW4gY2xvc2UgdGhlIGNvcnJlc3BvbmRpbmcgcGFnZQogICAgIC8vIG9u IHRoZSBXZWJQcm9jZXNzIHNpZGUuCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQ YWdlOjpDbG9zZSgpLCBtX3BhZ2UucGFnZUlEKCkpOwotICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVz c2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUo KSwgbV9wYWdlLnBhZ2VJRCgpKTsKKworICAgIGlmIChtX3N1c3BlbnNpb25TdGF0ZSA9PSBTdXNw ZW5zaW9uU3RhdGU6OlN1c3BlbmRpbmcpCisgICAgICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2Fn ZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwg bV9wYWdlLnBhZ2VJRCgpKTsKIAogICAgIC8vIFdlIGNhbGwgbWF5YmVTaHV0RG93bigpIGFzeW5j aHJvbm91c2x5IHNpbmNlIHRoZSBTdXNwZW5kZWRQYWdlIGlzIGN1cnJlbnRseSBiZWluZyByZW1v dmVkIGZyb20gdGhlIFdlYlByb2Nlc3NQb29sCiAgICAgLy8gYW5kIHdlIHdhbnQgdG8gYXZvaWQg cmUtZW50ZXJpbmcgV2ViUHJvY2Vzc1Bvb2wgbWV0aG9kcy4KQEAgLTEzNCw3ICsxMzYsNiBAQCB2 b2lkIFN1c3BlbmRlZFBhZ2VQcm94eTo6dW5zdXNwZW5kKCkKICAgICBBU1NFUlQobV9zdXNwZW5z aW9uU3RhdGUgPT0gU3VzcGVuc2lvblN0YXRlOjpTdXNwZW5kZWQpOwogCiAgICAgbV9zdXNwZW5z aW9uU3RhdGUgPSBTdXNwZW5zaW9uU3RhdGU6OlJlc3VtZWQ7Ci0gICAgbV9wcm9jZXNzLT5yZW1v dmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVy TmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOwogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6U2V0SXNTdXNwZW5kZWQoZmFsc2UpLCBtX3BhZ2UucGFnZUlEKCkpOwogfQogCkBA IC0xNTEsNiArMTUyLDggQEAgdm9pZCBTdXNwZW5kZWRQYWdlUHJveHk6OmRpZFByb2Nlc3NSZXF1 ZXN0VG9TdXNwZW5kKFN1c3BlbnNpb25TdGF0ZSBuZXdTdXNwZW5zaW8KICAgICBtX3N1c3BlbnNp b25Ub2tlbiA9IG51bGxwdHI7CiAjZW5kaWYKIAorICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2Fn ZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwg bV9wYWdlLnBhZ2VJRCgpKTsKKwogICAgIGlmIChtX3JlYWR5VG9VbnN1c3BlbmRIYW5kbGVyKQog ICAgICAgICBtX3JlYWR5VG9VbnN1c3BlbmRIYW5kbGVyKHRoaXMpOwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcAppbmRleCBjNzdhMjZiNzQyN2MzMWM4MjhlMmVh YTIyMWY4MDcwYjc3YWRkMjYyLi41M2M3MTk2YzJhYTBhMzNkMjIwNzU4MTkwY2Q0YmQ5NWE1Y2Qw MjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcApAQCAtMjcs NiArMjcsNyBAQAogI2luY2x1ZGUgIldlYkZyYW1lUHJveHkuaCIKIAogI2luY2x1ZGUgIkFQSU5h dmlnYXRpb24uaCIKKyNpbmNsdWRlICJQcm92aXNpb25hbFBhZ2VQcm94eS5oIgogI2luY2x1ZGUg IldlYkNlcnRpZmljYXRlSW5mby5oIgogI2luY2x1ZGUgIldlYkZyYW1lUG9saWN5TGlzdGVuZXJQ cm94eS5oIgogI2luY2x1ZGUgIldlYlBhZ2VNZXNzYWdlcy5oIgpAQCAtNzQsNyArNzUsNyBAQCBi b29sIFdlYkZyYW1lUHJveHk6OmlzTWFpbkZyYW1lKCkgY29uc3QKICAgICBpZiAoIW1fcGFnZSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgcmV0dXJuIHRoaXMgPT0gbV9wYWdlLT5tYWlu RnJhbWUoKTsKKyAgICByZXR1cm4gdGhpcyA9PSBtX3BhZ2UtPm1haW5GcmFtZSgpIHx8IChtX3Bh Z2UtPnByb3Zpc2lvbmFsUGFnZVByb3h5KCkgJiYgdGhpcyA9PSBtX3BhZ2UtPnByb3Zpc2lvbmFs UGFnZVByb3h5KCktPm1haW5GcmFtZSgpKTsKIH0KIAogdm9pZCBXZWJGcmFtZVByb3h5Ojpsb2Fk VVJMKGNvbnN0IFVSTCYgdXJsKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAKaW5kZXggYzhhYjcwMzMzYjQwMzlhODc3OWM0Y2EzZjMxZTE5MDc1NjNhMzM2OS4uYjA0ODcz YTViY2I1NTFhNzA4NWUwMjQyYjIwN2ZjM2M2NjAyZTdjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC03Nyw2ICs3Nyw3IEBACiAjaW5jbHVkZSAiUGx1Z2lu SW5mb3JtYXRpb24uaCIKICNpbmNsdWRlICJQbHVnaW5Qcm9jZXNzTWFuYWdlci5oIgogI2luY2x1 ZGUgIlByaW50SW5mby5oIgorI2luY2x1ZGUgIlByb3Zpc2lvbmFsUGFnZVByb3h5LmgiCiAjaW5j bHVkZSAiU2FmZUJyb3dzaW5nV2FybmluZy5oIgogI2luY2x1ZGUgIlNoYXJlU2hlZXRDYWxsYmFj a0lELmgiCiAjaW5jbHVkZSAiU2hhcmVkQnVmZmVyRGF0YVJlZmVyZW5jZS5oIgpAQCAtNTQ1LDYg KzU0NiwxMyBAQCBQQUw6OlNlc3Npb25JRCBXZWJQYWdlUHJveHk6OnNlc3Npb25JRCgpIGNvbnN0 CiAgICAgcmV0dXJuIG1fd2Vic2l0ZURhdGFTdG9yZS0+c2Vzc2lvbklEKCk7CiB9CiAKK0RyYXdp bmdBcmVhUHJveHkqIFdlYlBhZ2VQcm94eTo6ZHJhd2luZ0FyZWEoKSBjb25zdAoreworICAgIGlm IChtX3Byb3Zpc2lvbmFsUGFnZSAmJiBtX3Byb2Nlc3MucHRyKCkgPT0gJm1fcHJvdmlzaW9uYWxQ YWdlLT5wcm9jZXNzKCkgJiYgbV9wcm92aXNpb25hbFBhZ2UtPmRyYXdpbmdBcmVhKCkpCisgICAg ICAgIHJldHVybiBtX3Byb3Zpc2lvbmFsUGFnZS0+ZHJhd2luZ0FyZWEoKTsKKyAgICByZXR1cm4g bV9kcmF3aW5nQXJlYS5nZXQoKTsKK30KKwogdm9pZCBXZWJQYWdlUHJveHk6OmNoYW5nZVdlYnNp dGVEYXRhU3RvcmUoV2Vic2l0ZURhdGFTdG9yZSYgd2Vic2l0ZURhdGFTdG9yZSkKIHsKICAgICBt X3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkucGFnZUVuZFVzaW5nV2Vic2l0ZURhdGFTdG9yZSgqdGhp cyk7CkBAIC03NjgsMzggKzc3NiwyNiBAQCBib29sIFdlYlBhZ2VQcm94eTo6c3VzcGVuZEN1cnJl bnRQYWdlSWZQb3NzaWJsZShBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIE9wdAogICAgIHJl dHVybiB0cnVlOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6c3dhcFRvV2ViUHJvY2VzcyhSZWY8 V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdl UHJveHk+JiYgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLCBJc1N3YXBGcm9tU3VzcGVuZGVkIGlz U3dhcEZyb21TdXNwZW5kZWQpCit2b2lkIFdlYlBhZ2VQcm94eTo6c3dhcFRvV2ViUHJvY2VzcyhS ZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJl YVByb3h5PiYmIGRyYXdpbmdBcmVhLCBSZWZQdHI8V2ViRnJhbWVQcm94eT4mJiBtYWluRnJhbWUp CiB7CiAgICAgQVNTRVJUKCFtX2lzQ2xvc2VkKTsKICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VE KExvYWRpbmcsICJzd2FwVG9XZWJQcm9jZXNzOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJ dTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKIAogICAgIG1f cHJvY2VzcyA9IFdURk1vdmUocHJvY2Vzcyk7CisgICAgQVNTRVJUKCFtX2RyYXdpbmdBcmVhKTsK KyAgICBzZXREcmF3aW5nQXJlYShXVEZNb3ZlKGRyYXdpbmdBcmVhKSk7CisgICAgQVNTRVJUKCFt X21haW5GcmFtZSk7CisgICAgbV9tYWluRnJhbWUgPSBXVEZNb3ZlKG1haW5GcmFtZSk7CiAgICAg bV9pc1ZhbGlkID0gdHJ1ZTsKIAotICAgIC8vIElmIHdlIGFyZSByZWF0dGFjaGluZyB0byBhIFN1 c3BlbmRlZFBhZ2UsIHRoZW4gdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UgYWxyZWFkeSBleGlzdHMg YW5kCi0gICAgLy8gV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUoKSB3aWxsIG5vdCBi ZSBjYWxsZWQgdG8gaW5pdGlhbGl6ZSBtX21haW5GcmFtZS4gSW4gc3VjaAotICAgIC8vIGNhc2Us IHdlIG5lZWQgdG8gaW5pdGlhbGl6ZSBtX21haW5GcmFtZSB0byByZWZsZWN0IHRoZSBmYWN0IHRo ZSB0aGUgV2ViUHJvY2VzcycgV2ViUGFnZQotICAgIC8vIGFscmVhZHkgZXhpc3RzIGFuZCBhbHJl YWR5IGhhcyBhIG1haW4gZnJhbWUuCi0gICAgaWYgKGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSkg ewotICAgICAgICBpZiAoIWRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZS0+ZmFpbGVkVG9TdXNwZW5k KCkpIHsKLSAgICAgICAgICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOwotICAgICAgICAgICAgQVNT RVJUKCZkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRy KCkpOwotICAgICAgICAgICAgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT51bnN1c3BlbmQoKTsK LSAgICAgICAgICAgIG1fbWFpbkZyYW1lID0gV2ViRnJhbWVQcm94eTo6Y3JlYXRlKCp0aGlzLCBk ZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPm1haW5GcmFtZUlEKCkpOwotICAgICAgICAgICAgbV9w cm9jZXNzLT5mcmFtZUNyZWF0ZWQoZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJ RCgpLCAqbV9tYWluRnJhbWUpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgLy8gV2Ug ZmFpbGVkIHRvIHN1c3BlbmQgdGhlIHBhZ2Ugc28gZGVzdHJveSBpdCBub3cgYW5kIG1lcmVseSBy ZXVzZSBpdHMgV2ViQ29udGVudCBwcm9jZXNzLgotICAgICAgICAgICAgZGVzdGluYXRpb25TdXNw ZW5kZWRQYWdlID0gbnVsbHB0cjsKLSAgICAgICAgfQotICAgIH0KLQogICAgIG1fcHJvY2Vzcy0+ YWRkRXhpc3RpbmdXZWJQYWdlKCp0aGlzLCBtX3BhZ2VJRCwgV2ViUHJvY2Vzc1Byb3h5OjpCZWdp bnNVc2luZ0RhdGFTdG9yZTo6Tm8pOwogICAgIG1fcHJvY2Vzcy0+YWRkTWVzc2FnZVJlY2VpdmVy KE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlSUQs ICp0aGlzKTsKIAotICAgIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2Vzcyhpc1N3YXBGcm9tU3Vz cGVuZGVkKTsKKyAgICAvLyBObyBuZWVkIHRvIGluaXRpYWxpemUgdGhlIFdlYlBhZ2Ugc2luY2Ug aXQgd2FzIGNyZWF0ZWQgd2hlbiB3ZSBjcmVhdGVkIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eS4K KyAgICBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoU2hvdWxkSW5pdGlhbGl6ZVdlYlBhZ2U6 Ok5vKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2Vz cyhJc1N3YXBGcm9tU3VzcGVuZGVkIGlzU3dhcEZyb21TdXNwZW5kZWQpCit2b2lkIFdlYlBhZ2VQ cm94eTo6ZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKFNob3VsZEluaXRpYWxpemVXZWJQYWdl IHNob3VsZEluaXRpYWxpemVQYWdlKQogewogICAgIEFTU0VSVChtX3Byb2Nlc3MtPnN0YXRlKCkg IT0gQ2hpbGRQcm9jZXNzUHJveHk6OlN0YXRlOjpUZXJtaW5hdGVkKTsKIApAQCAtODM1LDcgKzgz MSw4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoSXNT d2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzCiAgICAgbV9lZGl0YWJsZUltYWdlQ29udHJv bGxlciA9IHN0ZDo6bWFrZV91bmlxdWU8RWRpdGFibGVJbWFnZUNvbnRyb2xsZXI+KCp0aGlzKTsK ICNlbmRpZgogCi0gICAgaW5pdGlhbGl6ZVdlYlBhZ2UoaXNTd2FwRnJvbVN1c3BlbmRlZCk7Cisg ICAgaWYgKHNob3VsZEluaXRpYWxpemVQYWdlID09IFNob3VsZEluaXRpYWxpemVXZWJQYWdlOjpZ ZXMpCisgICAgICAgIGluaXRpYWxpemVXZWJQYWdlKCk7CiAKICAgICBtX2luc3BlY3Rvci0+dXBk YXRlRm9yTmV3UGFnZVByb2Nlc3ModGhpcyk7CiAKQEAgLTkwMCwxMiArODk3LDExIEBAIFJlZlB0 cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRo SXRlbShXZWJCYWNrRm9yd2FyCiAgICAgcmV0dXJuIFdURk1vdmUobmF2aWdhdGlvbik7CiB9CiAK LXZvaWQgV2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZShJc1N3YXBGcm9tU3VzcGVuZGVk IGlzU3dhcEZyb21TdXNwZW5kZWQpCit2b2lkIFdlYlBhZ2VQcm94eTo6c2V0RHJhd2luZ0FyZWEo c3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+JiYgZHJhd2luZ0FyZWEpCiB7Ci0gICAg QVNTRVJUKGlzVmFsaWQoKSk7Ci0KLSAgICBtX2RyYXdpbmdBcmVhID0gcGFnZUNsaWVudCgpLmNy ZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKLSAgICBBU1NFUlQobV9kcmF3aW5nQXJlYSk7CisgICAg bV9kcmF3aW5nQXJlYSA9IFdURk1vdmUoZHJhd2luZ0FyZWEpOworICAgIGlmICghbV9kcmF3aW5n QXJlYSkKKyAgICAgICAgcmV0dXJuOwogCiAjaWYgRU5BQkxFKEFTWU5DX1NDUk9MTElORykgJiYg UExBVEZPUk0oQ09DT0EpCiAgICAgaWYgKG1fZHJhd2luZ0FyZWEtPnR5cGUoKSA9PSBEcmF3aW5n QXJlYVR5cGVSZW1vdGVMYXllclRyZWUpIHsKQEAgLTkxNiwxNSArOTEyLDE2IEBAIHZvaWQgV2Vi UGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZShJc1N3YXBGcm9tU3VzcGVuZGVkIGlzU3dhcEZy b21TdXNwZW5kZWQpCiAjZW5kaWYKICAgICB9CiAjZW5kaWYKK30KIAotICAgIGF1dG8gcGFyYW1l dGVycyA9IGNyZWF0aW9uUGFyYW1ldGVycygpOwotICAgIHBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1 c3BlbmRlZCA9IGlzU3dhcEZyb21TdXNwZW5kZWQgPT0gSXNTd2FwRnJvbVN1c3BlbmRlZDo6WWVz Owordm9pZCBXZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKCkKK3sKKyAgICBBU1NFUlQo aXNWYWxpZCgpKTsKIAotI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikKLSAgICBwYXJhbWV0ZXJz Lmhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyA9IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLm1h eUhhdmVSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMobV93ZWJzaXRlRGF0YVN0b3JlKTsKLSNlbmRp ZgorICAgIHNldERyYXdpbmdBcmVhKHBhZ2VDbGllbnQoKS5jcmVhdGVEcmF3aW5nQXJlYVByb3h5 KCkpOworICAgIEFTU0VSVChtX2RyYXdpbmdBcmVhKTsKIAotICAgIHByb2Nlc3MoKS5zZW5kKE1l c3NhZ2VzOjpXZWJQcm9jZXNzOjpDcmVhdGVXZWJQYWdlKG1fcGFnZUlELCBwYXJhbWV0ZXJzKSwg MCk7CisgICAgcHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OkNyZWF0ZVdlYlBh Z2UobV9wYWdlSUQsIGNyZWF0aW9uUGFyYW1ldGVycygpKSwgMCk7CiAKICAgICBtX25lZWRzVG9G aW5pc2hJbml0aWFsaXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNoID0gdHJ1ZTsKICAgICBm aW5pc2hJbml0aWFsaXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNoKCk7CkBAIC0xMDc2LDcg KzEwNzMsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihB UEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIFJlc291cgogICAgIGF1dG8gdHJhbnNhY3Rpb24g PSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKIAogICAgIGF1dG8gdXJsID0gcmVxdWVz dC51cmwoKTsKLSAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0UGVuZGluZ0FQSVJlcXVlc3RVUkwodHJh bnNhY3Rpb24sIHVybCk7CisgICAgaWYgKHNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCAhPSBT aG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcykKKyAgICAgICAgbV9wYWdlTG9hZFN0YXRl LnNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCB1cmwpOwogCiAgICAgaWYgKCFp c1ZhbGlkKCkpCiAgICAgICAgIHJlYXR0YWNoVG9XZWJQcm9jZXNzKCk7CkBAIC0xMjk0LDYgKzEy OTIsMTAgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnN0b3BMb2FkaW5nKCkKICAgICB9CiAKICAgICBt X3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlN0b3BMb2FkaW5nKCksIG1fcGFnZUlE KTsKKyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UpIHsKKyAgICAgICAgbV9wcm92aXNpb25hbFBh Z2UtPmNhbmNlbCgpOworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7CisgICAg fQogICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7CiB9CiAKQEAg LTI2OTgsNyArMjcwMCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZE5hdmlnYXRpb25Q b2xpY3lEZWNpc2lvbihXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uCiAgICAgICAgIH0KIAog ICAgICAgICBpZiAocHJvY2Vzc0Zvck5hdmlnYXRpb24ucHRyKCkgIT0gJnByb2Nlc3MoKSkgewot ICAgICAgICAgICAgcG9saWN5QWN0aW9uID0gaXNQYWdlT3BlbmVkQnlET01TaG93aW5nSW5pdGlh bEVtcHR5RG9jdW1lbnQoKSA/IFdlYlBvbGljeUFjdGlvbjo6SWdub3JlIDogV2ViUG9saWN5QWN0 aW9uOjpTdXNwZW5kOworICAgICAgICAgICAgcG9saWN5QWN0aW9uID0gV2ViUG9saWN5QWN0aW9u OjpJZ25vcmU7CiAgICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2Fw cGluZywgImRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24sIHN3YXBwaW5nIHByb2Nlc3Mg JWkgd2l0aCBwcm9jZXNzICVpIGZvciBuYXZpZ2F0aW9uLCByZWFzb246ICV7cHVibGljfXMiLCBw cm9jZXNzSWRlbnRpZmllcigpLCBwcm9jZXNzRm9yTmF2aWdhdGlvbi0+cHJvY2Vzc0lkZW50aWZp ZXIoKSwgcmVhc29uLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICAgICAgTE9HKFByb2Nlc3NTd2Fw cGluZywgIihQcm9jZXNzU3dhcHBpbmcpIFN3aXRjaGluZyBmcm9tIHByb2Nlc3MgJWkgdG8gbmV3 IHByb2Nlc3MgKCVpKSBmb3IgbmF2aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMnIiwgcHJvY2Vzc0lk ZW50aWZpZXIoKSwgcHJvY2Vzc0Zvck5hdmlnYXRpb24tPnByb2Nlc3NJZGVudGlmaWVyKCksIG5h dmlnYXRpb24tPm5hdmlnYXRpb25JRCgpLCBuYXZpZ2F0aW9uLT5sb2dnaW5nU3RyaW5nKCkpOwog ICAgICAgICB9IGVsc2UKQEAgLTI3MDcsOCArMjcwOSwxNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 cmVjZWl2ZWROYXZpZ2F0aW9uUG9saWN5RGVjaXNpb24oV2ViUG9saWN5QWN0aW9uIHBvbGljeUFj dGlvbgogICAgICAgICBib29sIHNob3VsZFByb2Nlc3NTd2FwID0gcHJvY2Vzc0Zvck5hdmlnYXRp b24ucHRyKCkgIT0gJnByb2Nlc3MoKTsKICAgICAgICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihw b2xpY3lBY3Rpb24sIG5hdmlnYXRpb24ucHRyKCksIHNob3VsZFByb2Nlc3NTd2FwID8gV1RGOjpu dWxsb3B0IDogV1RGTW92ZShkYXRhKSwgV1RGTW92ZShzZW5kZXIpKTsKIAotICAgICAgICBpZiAo c2hvdWxkUHJvY2Vzc1N3YXApCi0gICAgICAgICAgICBjb250aW51ZU5hdmlnYXRpb25Jbk5ld1By b2Nlc3MobmF2aWdhdGlvbiwgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlID8gcHJvY2VzcygpLnBy b2Nlc3NQb29sKCkudGFrZVN1c3BlbmRlZFBhZ2UoKmRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSkg OiBudWxscHRyLCBXVEZNb3ZlKHByb2Nlc3NGb3JOYXZpZ2F0aW9uKSwgcHJvY2Vzc1N3YXBSZXF1 ZXN0ZWRCeUNsaWVudCwgV1RGTW92ZShkYXRhKSk7CisgICAgICAgIGlmICghc2hvdWxkUHJvY2Vz c1N3YXApCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgYXV0byBzdXNwZW5kZWRQYWdl ID0gZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlID8gcHJvY2VzcygpLnByb2Nlc3NQb29sKCkudGFr ZVN1c3BlbmRlZFBhZ2UoKmRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSkgOiBudWxscHRyOworICAg ICAgICBpZiAoc3VzcGVuZGVkUGFnZSAmJiBzdXNwZW5kZWRQYWdlLT5mYWlsZWRUb1N1c3BlbmQo KSkKKyAgICAgICAgICAgIHN1c3BlbmRlZFBhZ2UgPSBudWxscHRyOworCisgICAgICAgIGNvbnRp bnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhuYXZpZ2F0aW9uLCBXVEZNb3ZlKHN1c3BlbmRlZFBh Z2UpLCBXVEZNb3ZlKHByb2Nlc3NGb3JOYXZpZ2F0aW9uKSwgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRC eUNsaWVudCwgV1RGTW92ZShkYXRhKSk7CiAgICAgfSk7CiB9CiAKQEAgLTI3NDQsMjQgKzI3NTIs NDUgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVkUG9saWN5RGVjaXNpb24oV2ViUG9saWN5 QWN0aW9uIGFjdGlvbiwgQVBJOjpOYXZpZ2F0aW8KICAgICBzZW5kZXItPnNlbmQoYWN0aW9uLCBu YXZpZ2F0aW9uID8gbmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCkgOiAwLCBkb3dubG9hZElELCBX VEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6Y29udGlu dWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgc3Rk Ojp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiBzdXNwZW5kZWRQYWdlUHJveHksIFJl ZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzcywgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVu dCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNE YXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3ZvaWQgV2ViUGFnZVByb3h5Ojpjb21taXRQcm92aXNp b25hbFBhZ2UodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBT dHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50 MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mIGNlcnRp ZmljYXRlSW5mbywgYm9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3Jl OjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNl ckRhdGEmIHVzZXJEYXRhKQogewotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywg ImNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2Vzczogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUi IFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCk7Ci0gICAg TE9HKExvYWRpbmcsICJDb250aW51aW5nIG5hdmlnYXRpb24gJSIgUFJJdTY0ICIgJyVzJyBpbiBh IG5ldyB3ZWIgcHJvY2VzcyIsIG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24u bG9nZ2luZ1N0cmluZygpKTsKKyAgICBBU1NFUlQobV9wcm92aXNpb25hbFBhZ2UpOworICAgIFJF TEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImNvbW1pdFByb3Zpc2lvbmFsUGFnZTogcHJl dmlvdXNQSUQgPSAlaSwgbmV3UElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNz LT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2VzcygpLnByb2Nl c3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKIAotICAgIFJlZjxXZWJQcm9jZXNzUHJveHk+IHBy ZXZpb3VzUHJvY2VzcyA9IG1fcHJvY2Vzcy5jb3B5UmVmKCk7CiAgICAgT3B0aW9uYWw8dWludDY0 X3Q+IG1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MgPSBtX21haW5GcmFtZSA/IG1ha2VPcHRp b25hbChtX21haW5GcmFtZS0+ZnJhbWVJRCgpKSA6IFdURjo6bnVsbG9wdDsKLSAgICBhdXRvIG1h aW5GcmFtZVVSTCA9IG1fbWFpbkZyYW1lID8gbV9tYWluRnJhbWUtPnVybCgpIDogVVJMKCk7CiAK LSAgICBBU1NFUlQobV9wcm9jZXNzLnB0cigpICE9IHByb2Nlc3MucHRyKCkpOworICAgIEFTU0VS VChtX3Byb2Nlc3MucHRyKCkgIT0gJm1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCkpOwogCiAg ICAgcHJvY2Vzc0RpZFRlcm1pbmF0ZShQcm9jZXNzVGVybWluYXRpb25SZWFzb246Ok5hdmlnYXRp b25Td2FwKTsKIAogICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlSUQpOwotICAgIGJv b2wgZGlkU3VzcGVuZFByZXZpb3VzUGFnZSA9IHN1c3BlbmRDdXJyZW50UGFnZUlmUG9zc2libGUo bmF2aWdhdGlvbiwgbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcywgcHJvY2Vzc1N3YXBSZXF1 ZXN0ZWRCeUNsaWVudCk7CisgICAgYXV0byogbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25TdGF0ZSgp Lm5hdmlnYXRpb24obV9wcm92aXNpb25hbFBhZ2UtPm5hdmlnYXRpb25JRCgpKTsKKyAgICBib29s IGRpZFN1c3BlbmRQcmV2aW91c1BhZ2UgPSBuYXZpZ2F0aW9uID8gc3VzcGVuZEN1cnJlbnRQYWdl SWZQb3NzaWJsZSgqbmF2aWdhdGlvbiwgbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcywgbV9w cm92aXNpb25hbFBhZ2UtPnByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQoKSkgOiBmYWxzZTsK ICAgICBtX3Byb2Nlc3MtPnJlbW92ZVdlYlBhZ2UoKnRoaXMsIG1fcGFnZUlELCBXZWJQcm9jZXNz UHJveHk6OkVuZHNVc2luZ0RhdGFTdG9yZTo6Tm8pOwogCi0gICAgc3dhcFRvV2ViUHJvY2VzcyhX VEZNb3ZlKHByb2Nlc3MpLCBXVEZNb3ZlKHN1c3BlbmRlZFBhZ2VQcm94eSksIGRpZFN1c3BlbmRQ cmV2aW91c1BhZ2UgPyBJc1N3YXBGcm9tU3VzcGVuZGVkOjpZZXMgOiBJc1N3YXBGcm9tU3VzcGVu ZGVkOjpObyk7CisgICAgLy8gVGhlcmUgaXMgbm8gd2F5IHdlJ2xsIGJlIGFibGUgdG8gcmV0dXJu IHRvIHRoZSBwYWdlIGluIHRoZSBwcmV2aW91cyBwYWdlIHNvIGNsb3NlIGl0LgorICAgIGlmICgh ZGlkU3VzcGVuZFByZXZpb3VzUGFnZSkKKyAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlOjpDbG9zZSgpLCBwYWdlSUQoKSk7CisKKyAgICBzd2FwVG9XZWJQcm9jZXNzKG1f cHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCksIG1fcHJvdmlzaW9uYWxQYWdlLT50YWtlRHJhd2lu Z0FyZWEoKSwgbV9wcm92aXNpb25hbFBhZ2UtPm1haW5GcmFtZSgpKTsKKworICAgIGRpZENvbW1p dExvYWRGb3JGcmFtZShmcmFtZUlELCBuYXZpZ2F0aW9uSUQsIG1pbWVUeXBlLCBmcmFtZUhhc0N1 c3RvbUNvbnRlbnRQcm92aWRlciwgZnJhbWVMb2FkVHlwZSwgY2VydGlmaWNhdGVJbmZvLCBjb250 YWluc1BsdWdpbkRvY3VtZW50LCBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIHVzZXJEYXRhKTsK KworICAgIG1fcHJvdmlzaW9uYWxQYWdlID0gbnVsbHB0cjsKK30KKwordm9pZCBXZWJQYWdlUHJv eHk6OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhBUEk6Ok5hdmlnYXRpb24mIG5hdmln YXRpb24sIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYgc3VzcGVuZGVkUGFn ZVByb3h5LCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIG5ld1Byb2Nlc3MsIFByb2Nlc3NTd2FwUmVx dWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgT3B0aW9uYWw8V2Vi c2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit7CisgICAgUkVMRUFTRV9MT0df SUZfQUxMT1dFRChMb2FkaW5nLCAiY29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzOiB3ZWJQ SUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVy KCksIG1fcGFnZUlEKTsKKyAgICBMT0coTG9hZGluZywgIkNvbnRpbnVpbmcgbmF2aWdhdGlvbiAl IiBQUkl1NjQgIiAnJXMnIGluIGEgbmV3IHdlYiBwcm9jZXNzIiwgbmF2aWdhdGlvbi5uYXZpZ2F0 aW9uSUQoKSwgbmF2aWdhdGlvbi5sb2dnaW5nU3RyaW5nKCkpOworCisgICAgaWYgKG1fcHJvdmlz aW9uYWxQYWdlKSB7CisgICAgICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklE KCkgIT0gbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSkKKyAgICAgICAgICAgIG1fcHJvdmlzaW9u YWxQYWdlLT5jYW5jZWwoKTsKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBudWxscHRyOwor ICAgIH0KKworICAgIG1fcHJvdmlzaW9uYWxQYWdlID0gc3RkOjptYWtlX3VuaXF1ZTxQcm92aXNp b25hbFBhZ2VQcm94eT4oKnRoaXMsIG5ld1Byb2Nlc3MuY29weVJlZigpLCBXVEZNb3ZlKHN1c3Bl bmRlZFBhZ2VQcm94eSksIG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24uY3Vy cmVudFJlcXVlc3RJc1JlZGlyZWN0KCksIG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKSwgcHJv Y2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCk7CiAKICAgICBpZiAoYXV0byogaXRlbSA9IG5hdmln YXRpb24udGFyZ2V0SXRlbSgpKSB7CiAgICAgICAgIExPRyhMb2FkaW5nLCAiV2ViUGFnZVByb3h5 ICVwIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyB0byBiYWNrIGl0ZW0gVVJMICVzIiwg dGhpcywgaXRlbS0+dXJsKCkudXRmOCgpLmRhdGEoKSk7CkBAIC0yNzY5LDY3ICsyNzk4LDIyIEBA IHZvaWQgV2ViUGFnZVByb3h5Ojpjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpO YXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBzCiAgICAgICAgIGF1dG8gdHJhbnNhY3Rpb24gPSBtX3Bh Z2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKICAgICAgICAgbV9wYWdlTG9hZFN0YXRlLnNldFBl bmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCBpdGVtLT51cmwoKSk7CiAKLSAgICAgICAg YXV0byBpdGVtU3RhdGVzID0gbV9iYWNrRm9yd2FyZExpc3QtPmZpbHRlcmVkSXRlbVN0YXRlcyhb dGhpcywgdGFyZ2V0SXRlbSA9IGl0ZW1dKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mIGl0ZW0pIHsK LSAgICAgICAgICAgIGlmIChhdXRvKiBwYWdlID0gaXRlbS5zdXNwZW5kZWRQYWdlKCkpIHsKLSAg ICAgICAgICAgICAgICBpZiAoJnBhZ2UtPnByb2Nlc3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpCi0g ICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAg ICAgIHJldHVybiAmaXRlbSAhPSB0YXJnZXRJdGVtOwotICAgICAgICB9KTsKLSAgICAgICAgbV9w cm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpVcGRhdGVCYWNrRm9yd2FyZExpc3RGb3JS ZWF0dGFjaChXVEZNb3ZlKGl0ZW1TdGF0ZXMpKSwgbV9wYWdlSUQpOwotICAgICAgICBtX3Byb2Nl c3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0obmF2aWdhdGlv bi5uYXZpZ2F0aW9uSUQoKSwgaXRlbS0+aXRlbUlEKCksICpuYXZpZ2F0aW9uLmJhY2tGb3J3YXJk RnJhbWVMb2FkVHlwZSgpLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92 ZSh3ZWJzaXRlUG9saWNpZXMpKSwgbV9wYWdlSUQpOwotICAgICAgICBtX3Byb2Nlc3MtPnJlc3Bv bnNpdmVuZXNzVGltZXIoKS5zdGFydCgpOwotCisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5n b1RvQmFja0ZvcndhcmRJdGVtKG5hdmlnYXRpb24sICppdGVtLCBXVEZNb3ZlKHdlYnNpdGVQb2xp Y2llcykpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgaWYgKG1fYmFja0ZvcndhcmRM aXN0LT5jdXJyZW50SXRlbSgpICYmIChuYXZpZ2F0aW9uLmxvY2tCYWNrRm9yd2FyZExpc3QoKSA9 PSBMb2NrQmFja0ZvcndhcmRMaXN0OjpZZXMgfHwgbmF2aWdhdGlvbi5sb2NrSGlzdG9yeSgpID09 IExvY2tIaXN0b3J5OjpZZXMpKSB7CiAgICAgICAgIC8vIElmIFdlYkNvcmUgaXMgc3VwcG9zZWQg dG8gbG9jayB0aGUgaGlzdG9yeSBmb3IgdGhpcyBsb2FkLCB0aGVuIHRoZSBuZXcgcHJvY2VzcyBu ZWVkcyB0byBrbm93IGFib3V0IHRoZSBjdXJyZW50IGhpc3RvcnkgaXRlbSBzbyBpdCBjYW4gdXBk YXRlCiAgICAgICAgIC8vIGl0IGluc3RlYWQgb2YgY3JlYXRpbmcgYSBuZXcgb25lLgotICAgICAg ICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldEN1cnJlbnRIaXN0b3J5SXRl bUZvclJlYXR0YWNoKG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50SXRlbSgpLT5pdGVtU3RhdGUo KSksIG1fcGFnZUlEKTsKKyAgICAgICAgbmV3UHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6U2V0Q3VycmVudEhpc3RvcnlJdGVtRm9yUmVhdHRhY2gobV9iYWNrRm9yd2FyZExpc3QtPmN1 cnJlbnRJdGVtKCktPml0ZW1TdGF0ZSgpKSwgbV9wYWdlSUQpOwogICAgIH0KIAogICAgIC8vIEZJ WE1FOiBXb3JrIG91dCB0aW1pbmcgb2YgcmVzcG9uZGluZyB3aXRoIHRoZSBsYXN0IHBvbGljeSBk ZWxlZ2F0ZSwgZXRjCiAgICAgQVNTRVJUKCFuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCkuaXNF bXB0eSgpKTsKICAgICBpZiAoYXV0byYgc3Vic3RpdHV0ZURhdGEgPSBuYXZpZ2F0aW9uLnN1YnN0 aXR1dGVEYXRhKCkpCi0gICAgICAgIGxvYWREYXRhV2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwg eyBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5kYXRhKCksIHN1YnN0aXR1dGVEYXRhLT5jb250ZW50 LnNpemUoKSB9LCBzdWJzdGl0dXRlRGF0YS0+TUlNRVR5cGUsIHN1YnN0aXR1dGVEYXRhLT5lbmNv ZGluZywgc3Vic3RpdHV0ZURhdGEtPmJhc2VVUkwsIHN1YnN0aXR1dGVEYXRhLT51c2VyRGF0YS5n ZXQoKSwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBv bGljaWVzKSk7CisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5sb2FkRGF0YVdpdGhOYXZpZ2F0 aW9uKG5hdmlnYXRpb24sIHsgc3Vic3RpdHV0ZURhdGEtPmNvbnRlbnQuZGF0YSgpLCBzdWJzdGl0 dXRlRGF0YS0+Y29udGVudC5zaXplKCkgfSwgc3Vic3RpdHV0ZURhdGEtPk1JTUVUeXBlLCBzdWJz dGl0dXRlRGF0YS0+ZW5jb2RpbmcsIHN1YnN0aXR1dGVEYXRhLT5iYXNlVVJMLCBzdWJzdGl0dXRl RGF0YS0+dXNlckRhdGEuZ2V0KCksIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiAgICAgZWxz ZQotICAgICAgICBsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIFJlc291cmNl UmVxdWVzdCB7IG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKSB9LCBXZWJDb3JlOjpTaG91bGRP cGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGRBbGxvd0V4dGVybmFsU2NoZW1lcywgbnVsbHB0 ciwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGlj aWVzKSk7Ci0KLSAgICBBU1NFUlQoIW1fbWFpbkZyYW1lKTsKLSAgICBtX21haW5GcmFtZUNyZWF0 aW9uSGFuZGxlciA9IFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKSwgbmF2aWdh dGlvbklEID0gbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgcmVxdWVzdCA9ICBuYXZpZ2F0aW9u LmN1cnJlbnRSZXF1ZXN0KCksIG1haW5GcmFtZVVSTCwgaXNTZXJ2ZXJSZWRpcmVjdCA9IG5hdmln YXRpb24uY3VycmVudFJlcXVlc3RJc1JlZGlyZWN0KCldKCkgbXV0YWJsZSB7Ci0gICAgICAgIGlm ICghd2Vha1RoaXMpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgQVNTRVJUKG1fbWFp bkZyYW1lKTsKLSAgICAgICAgLy8gVGhpcyBuYXZpZ2F0aW9uIHdhcyBkZXN0cm95ZWQgc28gbm8g bmVlZCB0byBub3RpZnkgb2YgcmVkaXJlY3QuCi0gICAgICAgIGlmICghbmF2aWdhdGlvblN0YXRl KCkubmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAg ICAgIC8vIFJlc3RvcmUgdGhlIG1haW4gZnJhbWUncyBjb21taXR0ZWQgVVJMIGFzIHNvbWUgY2xp ZW50cyBtYXkgcmVseSBvbiBpdCB1bnRpbCB0aGUgbmV4dCBsb2FkIGlzIGNvbW1pdHRlZC4KLSAg ICAgICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkuc2V0VVJMKG1haW5GcmFtZVVSTCk7 Ci0KLSAgICAgICAgLy8gTm9ybWFsbHksIG5vdGlmaWNhdGlvbiBvZiBhIHNlcnZlciByZWRpcmVj dCBjb21lcyBmcm9tIHRoZSBXZWJDb250ZW50IHByb2Nlc3MuCi0gICAgICAgIC8vIElmIHdlIGFy ZSBwcm9jZXNzIHN3YXBwaW5nIGluIHJlc3BvbnNlIHRvIGEgc2VydmVyIHJlZGlyZWN0IHRoZW4g dGhhdCBub3RpZmljYXRpb24gd2lsbCBub3QgY29tZSBmcm9tIHRoZSBuZXcgV2ViQ29udGVudCBw cm9jZXNzLgotICAgICAgICAvLyBJbiB0aGlzIGNhc2Ugd2UgaGF2ZSB0aGUgVUlQcm9jZXNzIHN5 bnRoZXNpemUgdGhlIHJlZGlyZWN0IG5vdGlmaWNhdGlvbiBhdCB0aGUgYXBwcm9wcmlhdGUgdGlt ZS4KLSAgICAgICAgaWYgKGlzU2VydmVyUmVkaXJlY3QpIHsKLSAgICAgICAgICAgIG1fbWFpbkZy YW1lLT5mcmFtZUxvYWRTdGF0ZSgpLmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKHJlcXVlc3QudXJs KCkpOwotICAgICAgICAgICAgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxM b2FkRm9yRnJhbWUobV9tYWluRnJhbWUtPmZyYW1lSUQoKSwgbmF2aWdhdGlvbklELCBXVEZNb3Zl KHJlcXVlc3QpLCB7IH0pOwotICAgICAgICB9Ci0gICAgfTsKLQotICAgIGlmICghbV9wcm9jZXNz LT5wcm9jZXNzUG9vbCgpLmNvbmZpZ3VyYXRpb24oKS5wcm9jZXNzU3dhcHNPbldpbmRvd09wZW5X aXRoT3BlbmVyKCkgfHwgIWlzUGFnZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURvY3Vt ZW50KCkgfHwgIW1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MpIHsKLSAgICAgICAgLy8gVGhl cmUgaXMgbm8gd2F5IHdlJ2xsIGJlIGFibGUgdG8gcmV0dXJuIHRvIHRoZSBwYWdlIGluIHRoZSBw cmV2aW91cyBwYWdlIHNvIGNsb3NlIGl0LgotICAgICAgICBpZiAoIWRpZFN1c3BlbmRQcmV2aW91 c1BhZ2UpCi0gICAgICAgICAgICBwcmV2aW91c1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OkNsb3NlKCksIG1fcGFnZUlEKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIG1f bWFpbkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyID0gW3RoaXMsIHByZXZpb3VzUHJvY2VzcyA9 IFdURk1vdmUocHJldmlvdXNQcm9jZXNzKSwgbWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2VzcyA9 ICptYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzXShjb25zdCBHbG9iYWxXaW5kb3dJZGVudGlm aWVyJiB3aW5kb3dJZGVudGlmaWVyKSB7Ci0gICAgICAgIEFTU0VSVChtX21haW5GcmFtZSk7Ci0g ICAgICAgIEdsb2JhbEZyYW1lSWRlbnRpZmllciBuYXZpZ2F0ZWRGcmFtZUlkZW50aWZpZXJJbk5l d1Byb2Nlc3MgeyBwYWdlSUQoKSwgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSB9OwotICAgICAgICBw cmV2aW91c1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkZyYW1lQmVjYW1lUmVtb3Rl KG1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MsIG5hdmlnYXRlZEZyYW1lSWRlbnRpZmllcklu TmV3UHJvY2Vzcywgd2luZG93SWRlbnRpZmllciksIHBhZ2VJRCgpKTsKLSAgICB9OworICAgICAg ICBtX3Byb3Zpc2lvbmFsUGFnZS0+bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9u LCBSZXNvdXJjZVJlcXVlc3QgeyBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCkgfSwgV2ViQ29y ZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkQWxsb3dFeHRlcm5hbFNjaGVt ZXMsIG51bGxwdHIsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiB9CiAKIGJvb2wgV2ViUGFn ZVByb3h5Ojppc1BhZ2VPcGVuZWRCeURPTVNob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpIGNv bnN0CkBAIC0zNjk0LDExICszNjc4LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZU1h aW5GcmFtZSh1aW50NjRfdCBmcmFtZUlEKQogCiAgICAgLy8gQWRkIHRoZSBmcmFtZSB0byB0aGUg cHJvY2VzcyB3aWRlIG1hcC4KICAgICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChmcmFtZUlELCAq bV9tYWluRnJhbWUpOwotCi0gICAgaWYgKG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyKSB7Ci0g ICAgICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyKCk7Ci0gICAgICAgIG1fbWFpbkZyYW1l Q3JlYXRpb25IYW5kbGVyID0gbnVsbHB0cjsKLSAgICB9CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5 OjpkaWRDcmVhdGVTdWJmcmFtZSh1aW50NjRfdCBmcmFtZUlEKQpAQCAtMzcyMywxMCArMzcwMiw2 IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVTdWJmcmFtZSh1aW50NjRfdCBmcmFtZUlE KQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlV2luZG93KHVpbnQ2NF90IGZyYW1lSUQs IEdsb2JhbFdpbmRvd0lkZW50aWZpZXImJiB3aW5kb3dJZGVudGlmaWVyKQogewotICAgIGlmICht X21haW5GcmFtZSAmJiBtX21haW5GcmFtZS0+ZnJhbWVJRCgpID09IGZyYW1lSUQpIHsKLSAgICAg ICAgaWYgKGF1dG8gbWFpbkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyID0gV1RGTW92ZShtX21h aW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlcikpCi0gICAgICAgICAgICBtYWluRnJhbWVXaW5k b3dDcmVhdGlvbkhhbmRsZXIod2luZG93SWRlbnRpZmllcik7Ci0gICAgfQogfQogCiBkb3VibGUg V2ViUGFnZVByb3h5Ojplc3RpbWF0ZWRQcm9ncmVzcygpIGNvbnN0CkBAIC0zNzc5LDYgKzM3NTQs MTAgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZERlc3Ryb3lOYXZpZ2F0aW9uKHVpbnQ2NF90IG5h dmlnYXRpb25JRCkKIHsKICAgICBQYWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3RvcihwYWdlQ2xp ZW50KCkpOwogCisgICAgLy8gT24gcHJvY2Vzcy1zd2FwLCB0aGUgcHJldmlvdXMgcHJvY2VzcyB0 cmllcyB0byBkZXN0cm95IHRoZSBuYXZpZ2F0aW9uIGJ1dCB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vz cyBpcyBhY3R1YWxseSB0YWtpbmcgb3ZlciB0aGUgbmF2aWdhdGlvbi4KKyAgICBpZiAobV9wcm92 aXNpb25hbFBhZ2UgJiYgbV9wcm92aXNpb25hbFBhZ2UtPm5hdmlnYXRpb25JRCgpID09IG5hdmln YXRpb25JRCkKKyAgICAgICAgcmV0dXJuOworCiAgICAgLy8gRklYTUU6IE1lc3NhZ2UgY2hlY2sg dGhlIG5hdmlnYXRpb25JRC4KICAgICBtX25hdmlnYXRpb25TdGF0ZS0+ZGlkRGVzdHJveU5hdmln YXRpb24obmF2aWdhdGlvbklEKTsKIH0KQEAgLTM3OTYsMTQgKzM3NzUsNiBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlE LCB1aW50NjRfdCBuYQogICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSAmJiBuYXZpZ2F0aW9u SUQpCiAgICAgICAgIG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG5h dmlnYXRpb25JRCk7CiAKLSAgICAvLyBJZiB0aGlzIHNlZW1pbmdseSBuZXcgbG9hZCBpcyBhY3R1 YWxseSBjb250aW51aW5nIGEgc2VydmVyIHJlZGlyZWN0IGZvciBhIHByZXZpb3VzIG5hdmlnYXRp b24gaW4gYSBuZXcgcHJvY2VzcywKLSAgICAvLyB0aGVuIHdlIGlnbm9yZSB0aGlzIG5vdGlmaWNh dGlvbi4KLSAgICBpZiAobmF2aWdhdGlvbiAmJiBuYXZpZ2F0aW9uLT5jdXJyZW50UmVxdWVzdElz UmVkaXJlY3QoKSkgewotICAgICAgICBhdXRvIG5hdmlnYXRpb25Qcm9jZXNzSWRlbnRpZmllciA9 IG5hdmlnYXRpb24tPmN1cnJlbnRSZXF1ZXN0UHJvY2Vzc0lkZW50aWZpZXIoKTsKLSAgICAgICAg aWYgKG5hdmlnYXRpb25Qcm9jZXNzSWRlbnRpZmllciAmJiAqbmF2aWdhdGlvblByb2Nlc3NJZGVu dGlmaWVyICE9IG1fcHJvY2Vzcy0+Y29yZVByb2Nlc3NJZGVudGlmaWVyKCkpCi0gICAgICAgICAg ICByZXR1cm47Ci0gICAgfQotCiAgICAgTE9HKExvYWRpbmcsICJXZWJQYWdlUHJveHkgJSIgUFJJ dTY0ICIgaW4gcHJvY2VzcyBwaWQgJWkgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSB0 byBmcmFtZUlEICUiIFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgJSIgUFJJdTY0ICIsIHVybCAlcyIs IG1fcGFnZUlELCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIGZyYW1lSUQsIG5hdmln YXRpb25JRCwgdXJsLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgIFJFTEVBU0VfTE9HX0lG X0FMTE9XRUQoTG9hZGluZywgImRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6IHdlYlBJ RCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCwgbV9wcm9j ZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCwgZnJhbWVJRCk7CiAKQEAgLTM5MTEs NiArMzg4MiwxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaQogCiAgICAgUGFnZUNsaWVudFBy b3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAorICAgIGlmIChtX3Byb3Zpc2lvbmFs UGFnZSAmJiBtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkgPT0gbmF2aWdhdGlvbklE ICYmICZtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2VzcygpICE9IG1fcHJvY2Vzcy5wdHIoKSkgewor ICAgICAgICAvLyBUaGUgbG9hZCBkaWQgbm90IGZhaWwsIGl0IGlzIG1lcmVseSBoYXBwZW5pbmcg aW4gYSBuZXcgcHJvdmlzaW9uYWwgcHJvY2Vzcy4KKyAgICAgICAgcmV0dXJuOworICAgIH0KKwog ICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsK ICAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKIApAQCAtMzk0OSw2ICszOTI1LDEwIEBAIHZvaWQg V2ViUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJh bWVJRCwgY29uc3QgU2VjdXJpCiAgICAgfQogCiAgICAgbV9mYWlsaW5nUHJvdmlzaW9uYWxMb2Fk VVJMID0geyB9OworCisgICAgLy8gSWYgdGhlIHByb3Zpc2lvbmFsIHBhZ2UncyBsb2FkIGZhaWxz IHRoZW4gd2UgZGVzdHJveSB0aGUgcHJvdmlzaW9uYWwgcGFnZS4KKyAgICBpZiAobV9wcm92aXNp b25hbFBhZ2UgJiYgbV9wcm92aXNpb25hbFBhZ2UtPm1haW5GcmFtZSgpID09IGZyYW1lKQorICAg ICAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5 OjpjbGVhckxvYWREZXBlbmRlbnRDYWxsYmFja3MoKQpAQCAtNDM0MCw4ICs0MzIwLDggQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYyh1aW50 NjRfdCBmcmFtZUlELCBXZWJDb3IKICAgICBhdXRvKiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJh bWUoZnJhbWVJRCk7CiAgICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CiAKLSAgICBkZWNpZGVQb2xp Y3lGb3JOYXZpZ2F0aW9uQWN0aW9uKCpmcmFtZSwgV1RGTW92ZShmcmFtZVNlY3VyaXR5T3JpZ2lu KSwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb25EYXRhKSwgV1RGTW92ZShm cmFtZUluZm9EYXRhKSwgb3JpZ2luYXRpbmdQYWdlSUQsIG9yaWdpbmFsUmVxdWVzdCwgV1RGTW92 ZShyZXF1ZXN0KSwgV1RGTW92ZShyZXF1ZXN0Qm9keSksIFdURk1vdmUocmVkaXJlY3RSZXNwb25z ZSksIHVzZXJEYXRhLCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0 ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySURdIChhdXRvLi4uIGFy Z3MpIHsKLSAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRSZWNl aXZlUG9saWN5RGVjaXNpb24oZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJncy4uLiksIG1fcGFnZUlE KTsKKyAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKCpmcmFtZSwgV1RGTW92ZShm cmFtZVNlY3VyaXR5T3JpZ2luKSwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rp b25EYXRhKSwgV1RGTW92ZShmcmFtZUluZm9EYXRhKSwgb3JpZ2luYXRpbmdQYWdlSUQsIG9yaWdp bmFsUmVxdWVzdCwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShyZXF1ZXN0Qm9keSksIFdURk1v dmUocmVkaXJlY3RSZXNwb25zZSksIHVzZXJEYXRhLCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6Y3Jl YXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxpc3Rl bmVySUQsIHByb2Nlc3MgPSBtX3Byb2Nlc3MuY29weVJlZigpXSAoYXV0by4uLiBhcmdzKSB7Cisg ICAgICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xpY3lE ZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQpOwogICAgIH0p KTsKIH0KIApAQCAtNDU3NSwxMiArNDU1NSwxMiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRl UG9saWN5Rm9yUmVzcG9uc2UodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2VjdXJpdHlPcmlnaQog ICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHJlc3BvbnNlLnVybCgpKTsKIAogICAgIFJlZlB0cjxBUEk6 Ok5hdmlnYXRpb24+IG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uSUQgPyBtX25hdmlnYXRpb25TdGF0 ZS0+bmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpIDogbnVsbHB0cjsKLSAgICBhdXRvIGxpc3RlbmVy ID0gbWFrZVJlZihmcmFtZS0+c2V0VXBQb2xpY3lMaXN0ZW5lclByb3h5KFt0aGlzLCBwcm90ZWN0 ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIG5hdmlnYXRpb24g PSBXVEZNb3ZlKG5hdmlnYXRpb24pXSAoV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbiwgQVBJ OjpXZWJzaXRlUG9saWNpZXMqLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NT d2FwUmVxdWVzdGVkQnlDbGllbnQsIFJlZlB0cjxTYWZlQnJvd3NpbmdXYXJuaW5nPiYmIHNhZmVC cm93c2luZ1dhcm5pbmcpIG11dGFibGUgeworICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtlUmVmKGZy YW1lLT5zZXRVcFBvbGljeUxpc3RlbmVyUHJveHkoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtl UmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRCwgbmF2aWdhdGlvbiA9IFdURk1vdmUobmF2 aWdhdGlvbiksIHByb2Nlc3MgPSBtX3Byb2Nlc3MuY29weVJlZigpXSAoV2ViUG9saWN5QWN0aW9u IHBvbGljeUFjdGlvbiwgQVBJOjpXZWJzaXRlUG9saWNpZXMqLCBQcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFJlZlB0cjxTYWZlQnJvd3Np bmdXYXJuaW5nPiYmIHNhZmVCcm93c2luZ1dhcm5pbmcpIG11dGFibGUgewogICAgICAgICAvLyBG SVhNRTogQXNzZXJ0IHRoZSBBUEk6OldlYnNpdGVQb2xpY2llcyogaXMgbnVsbHB0ciBoZXJlIG9u Y2UgY2xpZW50cyBvZiBXS0ZyYW1lUG9saWN5TGlzdGVuZXJVc2VXaXRoUG9saWNpZXMgZ28gYXdh eS4KICAgICAgICAgUkVMRUFTRV9BU1NFUlQocHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCA9 PSBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50OjpObyk7CiAgICAgICAgIEFTU0VSVF9VTlVT RUQoc2FmZUJyb3dzaW5nV2FybmluZywgIXNhZmVCcm93c2luZ1dhcm5pbmcpOwotICAgICAgICBy ZWNlaXZlZFBvbGljeURlY2lzaW9uKHBvbGljeUFjdGlvbiwgbmF2aWdhdGlvbi5nZXQoKSwgV1RG OjpudWxsb3B0LCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRU aGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRF0gKGF1dG8u Li4gYXJncykgewotICAgICAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdl OjpEaWRSZWNlaXZlUG9saWN5RGVjaXNpb24oZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJncy4uLiks IG1fcGFnZUlEKTsKKyAgICAgICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24s IG5hdmlnYXRpb24uZ2V0KCksIFdURjo6bnVsbG9wdCwgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNy ZWF0ZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGZyYW1l SUQsIGxpc3RlbmVySUQsIHByb2Nlc3MgPSBXVEZNb3ZlKHByb2Nlc3MpXSAoYXV0by4uLiBhcmdz KSB7CisgICAgICAgICAgICBwcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRSZWNl aXZlUG9saWN5RGVjaXNpb24oZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJncy4uLiksIG1fcGFnZUlE KTsKICAgICAgICAgfSkpOwogICAgIH0sIFNob3VsZEV4cGVjdFNhZmVCcm93c2luZ1Jlc3VsdDo6 Tm8pKTsKIApAQCAtNjQwMCw2ICs2MzgwLDEzIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpwcm9jZXNz RGlkVGVybWluYXRlKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbiByZWFzb24pCiAgICAgc3RvcEFs bFVSTFNjaGVtZVRhc2tzKCk7CiB9CiAKK3ZvaWQgV2ViUGFnZVByb3h5Ojpwcm92aXNpb25hbFBy b2Nlc3NEaWRUZXJtaW5hdGUoKQoreworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFnZSk7Cisg ICAgbV9wcm92aXNpb25hbFBhZ2UtPmNhbmNlbCgpOworICAgIG1fcHJvdmlzaW9uYWxQYWdlID0g bnVsbHB0cjsKK30KKwogc3RhdGljIGJvb2wgc2hvdWxkUmVsb2FkQWZ0ZXJQcm9jZXNzVGVybWlu YXRpb24oUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uIHJlYXNvbikKIHsKICAgICBzd2l0Y2ggKHJl YXNvbikgewpAQCAtNjQ4Nyw4ICs2NDc0LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnByb2Nlc3NX aWxsQmVjb21lRm9yZWdyb3VuZCgpCiB2b2lkIFdlYlBhZ2VQcm94eTo6cmVzZXRTdGF0ZShSZXNl dFN0YXRlUmVhc29uIHJlc2V0U3RhdGVSZWFzb24pCiB7CiAgICAgbV9tYWluRnJhbWUgPSBudWxs cHRyOwotICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyID0gbnVsbHB0cjsKLSAgICBtX21h aW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlciA9IG51bGxwdHI7CiAKICNpZiBQTEFURk9STShD T0NPQSkKICAgICBtX3Njcm9sbGluZ1BlcmZvcm1hbmNlRGF0YSA9IG51bGxwdHI7CkBAIC02Nzc5 LDYgKzY3NjQsMTAgQEAgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyBXZWJQYWdlUHJveHk6OmNy ZWF0aW9uUGFyYW1ldGVycygpCiAgICAgcGFyYW1ldGVycy5hcHBsaWNhdGlvbk1hbmlmZXN0ID0g bV9jb25maWd1cmF0aW9uLT5hcHBsaWNhdGlvbk1hbmlmZXN0KCkgPyBPcHRpb25hbDxXZWJDb3Jl OjpBcHBsaWNhdGlvbk1hbmlmZXN0PihtX2NvbmZpZ3VyYXRpb24tPmFwcGxpY2F0aW9uTWFuaWZl c3QoKS0+YXBwbGljYXRpb25NYW5pZmVzdCgpKSA6IFdURjo6bnVsbG9wdDsKICNlbmRpZgogCisj aWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQorICAgIHBhcmFtZXRlcnMuaGFzUmVnaXN0ZXJlZFNl cnZpY2VXb3JrZXJzID0gcHJvY2VzcygpLnByb2Nlc3NQb29sKCkubWF5SGF2ZVJlZ2lzdGVyZWRT ZXJ2aWNlV29ya2VycyhtX3dlYnNpdGVEYXRhU3RvcmUpOworI2VuZGlmCisKICAgICBwYXJhbWV0 ZXJzLm5lZWRzRm9udEF0dHJpYnV0ZXMgPSBtX25lZWRzRm9udEF0dHJpYnV0ZXM7CiAKICAgICBt X3Byb2Nlc3MtPmFkZFdlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5KG1fdXNlckNvbnRlbnRD b250cm9sbGVyLCBwYXJhbWV0ZXJzKTsKQEAgLTg1NDAsNiArODUyOSwyMSBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6c2ltdWxhdGVEZXZpY2VPcmllbnRhdGlvbkNoYW5nZShkb3VibGUgYWxwaGEsIGRv dWJsZSBiZXRhLCBkbwogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2lt dWxhdGVEZXZpY2VPcmllbnRhdGlvbkNoYW5nZShhbHBoYSwgYmV0YSwgZ2FtbWEpLCBtX3BhZ2VJ RCk7CiB9CiAKK1dlYlBhZ2VQcm94eTo6UGFnZVByb2Nlc3NPdmVycmlkZTo6UGFnZVByb2Nlc3NP dmVycmlkZShXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYlByb2Nlc3NQcm94eSYgbmV3UHJvY2VzcykK KyAgICA6IG1fcGFnZSgmcGFnZSkKKyAgICAsIG1fcHJldmlvdXNQcm9jZXNzKHBhZ2UucHJvY2Vz cygpKQoreworICAgIHBhZ2UubV9wcm9jZXNzID0gbmV3UHJvY2VzczsKK30KKworV2ViUGFnZVBy b3h5OjpQYWdlUHJvY2Vzc092ZXJyaWRlOjpQYWdlUHJvY2Vzc092ZXJyaWRlKFBhZ2VQcm9jZXNz T3ZlcnJpZGUmJikgPSBkZWZhdWx0OworCitXZWJQYWdlUHJveHk6OlBhZ2VQcm9jZXNzT3ZlcnJp ZGU6On5QYWdlUHJvY2Vzc092ZXJyaWRlKCkKK3sKKyAgICBpZiAobV9wYWdlKQorICAgICAgICBt X3BhZ2UtPm1fcHJvY2VzcyA9IFdURk1vdmUobV9wcmV2aW91c1Byb2Nlc3MpOworfQorCiAjaWYg RU5BQkxFKERBVEFfREVURUNUSU9OKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGV0ZWN0RGF0YUlu QWxsRnJhbWVzKFdlYkNvcmU6OkRhdGFEZXRlY3RvclR5cGVzIHR5cGVzLCBDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKGNvbnN0IERhdGFEZXRlY3Rpb25SZXN1bHQmKT4mJiBjb21wbGV0aW9uSGFuZGxl cikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggZGU5ODY5NGFhMzdk YjNjN2YyY2UyN2NjODI5YTkyMDAyMTFkZTEwZC4uNDU4MmYwYTE3ZmUxMTc4MTY3M2JlYmVjNjVj ZmQyYjBlNDVmZjgwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAg LTIyNSw2ICsyMjUsNyBAQCBjbGFzcyBOYXRpdmVXZWJLZXlib2FyZEV2ZW50OwogY2xhc3MgTmF0 aXZlV2ViTW91c2VFdmVudDsKIGNsYXNzIE5hdGl2ZVdlYldoZWVsRXZlbnQ7CiBjbGFzcyBQYWdl Q2xpZW50OworY2xhc3MgUHJvdmlzaW9uYWxQYWdlUHJveHk7CiBjbGFzcyBSZW1vdGVMYXllclRy ZWVIb3N0OwogY2xhc3MgUmVtb3RlTGF5ZXJUcmVlU2Nyb2xsaW5nUGVyZm9ybWFuY2VEYXRhOwog Y2xhc3MgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb247CkBAIC0zNTYsNyArMzU3LDcgQEAgcHVi bGljOgogICAgIFdlYkZyYW1lUHJveHkqIGZvY3VzZWRGcmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1f Zm9jdXNlZEZyYW1lLmdldCgpOyB9CiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWVTZXRMYXJnZXN0 RnJhbWUoKSBjb25zdCB7IHJldHVybiBtX2ZyYW1lU2V0TGFyZ2VzdEZyYW1lLmdldCgpOyB9CiAK LSAgICBEcmF3aW5nQXJlYVByb3h5KiBkcmF3aW5nQXJlYSgpIGNvbnN0IHsgcmV0dXJuIG1fZHJh d2luZ0FyZWEuZ2V0KCk7IH0KKyAgICBEcmF3aW5nQXJlYVByb3h5KiBkcmF3aW5nQXJlYSgpIGNv bnN0OwogCiAgICAgV2ViTmF2aWdhdGlvblN0YXRlJiBuYXZpZ2F0aW9uU3RhdGUoKSB7IHJldHVy biAqbV9uYXZpZ2F0aW9uU3RhdGUuZ2V0KCk7IH0KIApAQCAtMzc5LDYgKzM4MCw3IEBAIHB1Ymxp YzoKIAogICAgIGJvb2wgYWRkc1Zpc2l0ZWRMaW5rcygpIGNvbnN0IHsgcmV0dXJuIG1fYWRkc1Zp c2l0ZWRMaW5rczsgfQogICAgIHZvaWQgc2V0QWRkc1Zpc2l0ZWRMaW5rcyhib29sIGFkZHNWaXNp dGVkTGlua3MpIHsgbV9hZGRzVmlzaXRlZExpbmtzID0gYWRkc1Zpc2l0ZWRMaW5rczsgfQorICAg IFZpc2l0ZWRMaW5rU3RvcmUmIHZpc2l0ZWRMaW5rU3RvcmUoKSB7IHJldHVybiBtX3Zpc2l0ZWRM aW5rU3RvcmU7IH0KIAogICAgIHZvaWQgZXhpdEZ1bGxzY3JlZW5JbW1lZGlhdGVseSgpOwogICAg IHZvaWQgZnVsbHNjcmVlbk1heVJldHVyblRvSW5saW5lKCk7CkBAIC00NTgsOCArNDYwLDggQEAg cHVibGljOgogICAgIEFQSTo6SWNvbkxvYWRpbmdDbGllbnQmIGljb25Mb2FkaW5nQ2xpZW50KCkg eyByZXR1cm4gKm1faWNvbkxvYWRpbmdDbGllbnQ7IH0KICAgICB2b2lkIHNldEljb25Mb2FkaW5n Q2xpZW50KHN0ZDo6dW5pcXVlX3B0cjxBUEk6Okljb25Mb2FkaW5nQ2xpZW50PiYmKTsKIAotICAg IGVudW0gY2xhc3MgSXNTd2FwRnJvbVN1c3BlbmRlZCB7IE5vLCBZZXMgfTsKLSAgICB2b2lkIGlu aXRpYWxpemVXZWJQYWdlKElzU3dhcEZyb21TdXNwZW5kZWQgPSBJc1N3YXBGcm9tU3VzcGVuZGVk OjpObyk7CisgICAgdm9pZCBpbml0aWFsaXplV2ViUGFnZSgpOworICAgIHZvaWQgc2V0RHJhd2lu Z0FyZWEoc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+JiYpOwogCiAgICAgV2Vha1B0 cjxTZWNLZXlQcm94eVN0b3JlPiBzZWNLZXlQcm94eVN0b3JlKGNvbnN0IFdlYkNvcmU6OkF1dGhl bnRpY2F0aW9uQ2hhbGxlbmdlJik7CiAgICAgICAgIApAQCAtOTk3LDYgKzk5OSw3IEBAIHB1Ymxp YzoKICAgICB2b2lkIHByb2Nlc3NEaWRCZWNvbWVVbnJlc3BvbnNpdmUoKTsKICAgICB2b2lkIHBy b2Nlc3NEaWRCZWNvbWVSZXNwb25zaXZlKCk7CiAgICAgdm9pZCBwcm9jZXNzRGlkVGVybWluYXRl KFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbik7CisgICAgdm9pZCBwcm92aXNpb25hbFByb2Nlc3NE aWRUZXJtaW5hdGUoKTsKICAgICB2b2lkIGRpc3BhdGNoUHJvY2Vzc0RpZFRlcm1pbmF0ZShQcm9j ZXNzVGVybWluYXRpb25SZWFzb24pOwogICAgIHZvaWQgd2lsbENoYW5nZVByb2Nlc3NJc1Jlc3Bv bnNpdmUoKTsKICAgICB2b2lkIGRpZENoYW5nZVByb2Nlc3NJc1Jlc3BvbnNpdmUoKTsKQEAgLTEw MjUsNiArMTAyOCwxOSBAQCBwdWJsaWM6CiAgICAgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKCkg eyByZXR1cm4gbV9wcm9jZXNzOyB9CiAgICAgUHJvY2Vzc0lEIHByb2Nlc3NJZGVudGlmaWVyKCkg Y29uc3Q7CiAKKyAgICBjbGFzcyBQYWdlUHJvY2Vzc092ZXJyaWRlIHsKKyAgICBwdWJsaWM6Cisg ICAgICAgIFBhZ2VQcm9jZXNzT3ZlcnJpZGUoV2ViUGFnZVByb3h5JiwgV2ViUHJvY2Vzc1Byb3h5 JiBuZXdQcm9jZXNzKTsKKyAgICAgICAgUGFnZVByb2Nlc3NPdmVycmlkZShQYWdlUHJvY2Vzc092 ZXJyaWRlJiYpOworICAgICAgICB+UGFnZVByb2Nlc3NPdmVycmlkZSgpOworCisgICAgcHJpdmF0 ZToKKyAgICAgICAgUmVmUHRyPFdlYlBhZ2VQcm94eT4gbV9wYWdlOworICAgICAgICBSZWY8V2Vi UHJvY2Vzc1Byb3h5PiBtX3ByZXZpb3VzUHJvY2VzczsKKyAgICB9OworCisgICAgUGFnZVByb2Nl c3NPdmVycmlkZSB0ZW1wb3JhcmlseU92ZXJyaWRlUHJvY2VzcyhXZWJQcm9jZXNzUHJveHkmIG5l d1Byb2Nlc3MpIHsgcmV0dXJuIFBhZ2VQcm9jZXNzT3ZlcnJpZGUoKnRoaXMsIG5ld1Byb2Nlc3Mp OyB9CisKICAgICBXZWJQcmVmZXJlbmNlcyYgcHJlZmVyZW5jZXMoKSB7IHJldHVybiBtX3ByZWZl cmVuY2VzOyB9CiAgICAgdm9pZCBzZXRQcmVmZXJlbmNlcyhXZWJQcmVmZXJlbmNlcyYpOwogCkBA IC0xNDE1LDYgKzE0MzEsMjEgQEAgcHVibGljOgogICAgIEVkaXRhYmxlSW1hZ2VDb250cm9sbGVy JiBlZGl0YWJsZUltYWdlQ29udHJvbGxlcigpIHsgcmV0dXJuICptX2VkaXRhYmxlSW1hZ2VDb250 cm9sbGVyOyB9CiAjZW5kaWYKIAorICAgIFByb3Zpc2lvbmFsUGFnZVByb3h5KiBwcm92aXNpb25h bFBhZ2VQcm94eSgpIGNvbnN0IHsgcmV0dXJuIG1fcHJvdmlzaW9uYWxQYWdlLmdldCgpOyB9Cisg ICAgdm9pZCBjb21taXRQcm92aXNpb25hbFBhZ2UodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3Qg bmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9t Q29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpD ZXJ0aWZpY2F0ZUluZm8mLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdl YkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25z dCBVc2VyRGF0YSYpOworCisgICAgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1l KHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYsIFVSTCYmIHVu cmVhY2hhYmxlVVJMLCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkRmFpbFByb3Zpc2lv bmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5 T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBj b25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJMLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9y JiwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2b2lkIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZv clByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmln YXRpb25JRCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIGNvbnN0IFVzZXJEYXRhJik7CisK KyAgICB2b2lkIGxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgY29uc3Qg SVBDOjpEYXRhUmVmZXJlbmNlJiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5n JiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEs IFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBv bGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7CisgICAgdm9pZCBsb2FkUmVxdWVzdFdpdGhO YXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBX ZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRh dGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0 ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9wdCk7CisKKyAgICAvLyBJUEM6Ok1lc3NhZ2VS ZWNlaXZlcgorICAgIC8vIEltcGxlbWVudGVkIGluIGdlbmVyYXRlZCBXZWJQYWdlUHJveHlNZXNz YWdlUmVjZWl2ZXIuY3BwCisgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rp b24mLCBJUEM6OkRlY29kZXImKSBvdmVycmlkZTsKKyAgICB2b2lkIGRpZFJlY2VpdmVTeW5jTWVz c2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImLCBzdGQ6OnVuaXF1ZV9wdHI8SVBD OjpFbmNvZGVyPiYpIG92ZXJyaWRlOworCiBwcml2YXRlOgogICAgIFdlYlBhZ2VQcm94eShQYWdl Q2xpZW50JiwgV2ViUHJvY2Vzc1Byb3h5JiwgdWludDY0X3QgcGFnZUlELCBSZWY8QVBJOjpQYWdl Q29uZmlndXJhdGlvbj4mJik7CiAgICAgdm9pZCBwbGF0Zm9ybUluaXRpYWxpemUoKTsKQEAgLTE0 MzksMTIgKzE0NzAsNiBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBzZXRVc2VyQWdlbnQoU3RyaW5n JiYpOwogCi0gICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKLSAgICAvLyBJbXBsZW1lbnRlZCBp biBnZW5lcmF0ZWQgV2ViUGFnZVByb3h5TWVzc2FnZVJlY2VpdmVyLmNwcAotICAgIHZvaWQgZGlk UmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgb3ZlcnJpZGU7 Ci0gICAgdm9pZCBkaWRSZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpE ZWNvZGVyJiwgc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mKSBvdmVycmlkZTsKLQotCiAg ICAgLy8gSVBDOjpNZXNzYWdlU2VuZGVyCiAgICAgYm9vbCBzZW5kTWVzc2FnZShzdGQ6OnVuaXF1 ZV9wdHI8SVBDOjpFbmNvZGVyPiwgT3B0aW9uU2V0PElQQzo6U2VuZE9wdGlvbj4pIG92ZXJyaWRl OwogICAgIElQQzo6Q29ubmVjdGlvbiogbWVzc2FnZVNlbmRlckNvbm5lY3Rpb24oKSBvdmVycmlk ZTsKQEAgLTE0NjYsMTIgKzE0OTEsOSBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlkQ3JlYXRlU3Vi ZnJhbWUodWludDY0X3QgZnJhbWVJRCk7CiAgICAgdm9pZCBkaWRDcmVhdGVXaW5kb3codWludDY0 X3QgZnJhbWVJRCwgV2ViQ29yZTo6R2xvYmFsV2luZG93SWRlbnRpZmllciYmKTsKIAotICAgIHZv aWQgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50 NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNl ckRhdGEmKTsKLSAgICB2b2lkIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFs TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIGNvbnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCB3aWxs UGVyZm9ybUNsaWVudFJlZGlyZWN0Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU3Ry aW5nJiB1cmwsIGRvdWJsZSBkZWxheSwgV2ViQ29yZTo6TG9ja0JhY2tGb3J3YXJkTGlzdCk7CiAg ICAgdm9pZCBkaWRDYW5jZWxDbGllbnRSZWRpcmVjdEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQp OwogICAgIHZvaWQgZGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZSh1aW50NjRfdCBmcmFt ZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmKTsKLSAgICB2b2lkIGRpZEZhaWxQcm92 aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1 cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25J RCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VF cnJvciYsIGNvbnN0IFVzZXJEYXRhJik7CiAgICAgdm9pZCBkaWRDb21taXRMb2FkRm9yRnJhbWUo dWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1p bWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFt ZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mLCBib29sIGNvbnRhaW5z UGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4gZm9y Y2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkRmlu aXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdh dGlvbklELCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkRmluaXNoTG9hZEZvckZyYW1l KHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgVXNlckRhdGEm KTsKQEAgLTE1NzUsMTggKzE1OTcsMTYgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldENhblNob3J0 Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50cyhib29sIGNhblNob3J0Q2lyY3VpdEhvcml6b250 YWxXaGVlbEV2ZW50cykgeyBtX2NhblNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50cyA9 IGNhblNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50czsgfQogCiAgICAgdm9pZCByZWF0 dGFjaFRvV2ViUHJvY2VzcygpOwotICAgIHZvaWQgc3dhcFRvV2ViUHJvY2VzcyhSZWY8V2ViUHJv Y2Vzc1Byb3h5PiYmLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmLCBJc1N3 YXBGcm9tU3VzcGVuZGVkKTsKKyAgICB2b2lkIHN3YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nl c3NQcm94eT4mJiwgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+JiYsIFJlZlB0cjxX ZWJGcmFtZVByb3h5PiYmIG1haW5GcmFtZSk7CiAgICAgdm9pZCBkaWRGYWlsVG9TdXNwZW5kQWZ0 ZXJQcm9jZXNzU3dhcCgpOwogICAgIHZvaWQgZGlkU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAoKTsK IAotICAgIHZvaWQgZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKElzU3dhcEZyb21TdXNwZW5k ZWQgPSBJc1N3YXBGcm9tU3VzcGVuZGVkOjpObyk7CisgICAgZW51bSBjbGFzcyBTaG91bGRJbml0 aWFsaXplV2ViUGFnZSB7IE5vLCBZZXMgfTsKKyAgICB2b2lkIGZpbmlzaEF0dGFjaGluZ1RvV2Vi UHJvY2VzcyhTaG91bGRJbml0aWFsaXplV2ViUGFnZSA9IFNob3VsZEluaXRpYWxpemVXZWJQYWdl OjpZZXMpOwogCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVhdHRhY2hUb1dlYlByb2Nl c3NGb3JSZWxvYWQoKTsKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiByZWF0dGFjaFRvV2Vi UHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKTsKIAotICAgIHZvaWQgbG9h ZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mLCBjb25zdCBJUEM6OkRhdGFSZWZl cmVuY2UmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBj b25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hv dWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYm ID0gV1RGOjpudWxsb3B0KTsKLSAgICB2b2lkIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oQVBJ OjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlNob3Vs ZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6 U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRh PiYmID0gV1RGOjpudWxsb3B0KTsKLQogICAgIHZvaWQgcmVxdWVzdE5vdGlmaWNhdGlvblBlcm1p c3Npb24odWludDY0X3Qgbm90aWZpY2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5n KTsKICAgICB2b2lkIHNob3dOb3RpZmljYXRpb24oY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3Qg U3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcmIGljb25VUkwsIGNvbnN0IFN0cmluZyYgdGFnLCBj b25zdCBTdHJpbmcmIGxhbmcsIFdlYkNvcmU6Ok5vdGlmaWNhdGlvbkRpcmVjdGlvbiwgY29uc3Qg U3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsKICAgICB2b2lk IGNhbmNlbE5vdGlmaWNhdGlvbih1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CkBAIC0xOTUyLDgg KzE5NzIsNiBAQCBwcml2YXRlOgogICAgIFJlZjxXZWJzaXRlRGF0YVN0b3JlPiBtX3dlYnNpdGVE YXRhU3RvcmU7CiAKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9tYWluRnJhbWU7Ci0gICAg RnVuY3Rpb248dm9pZCgpPiBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlcjsKLSAgICBGdW5jdGlv bjx2b2lkKGNvbnN0IFdlYkNvcmU6Okdsb2JhbFdpbmRvd0lkZW50aWZpZXImKT4gbV9tYWluRnJh bWVXaW5kb3dDcmVhdGlvbkhhbmRsZXI7CiAKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9m b2N1c2VkRnJhbWU7CiAgICAgUmVmUHRyPFdlYkZyYW1lUHJveHk+IG1fZnJhbWVTZXRMYXJnZXN0 RnJhbWU7CkBAIC0yMzI0LDYgKzIzNDIsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9uZWVkc0Zv bnRBdHRyaWJ1dGVzIHsgZmFsc2UgfTsKICAgICBib29sIG1fbWF5SGF2ZVVuaXZlcnNhbEZpbGVS ZWFkU2FuZGJveEV4dGVuc2lvbiB7IGZhbHNlIH07CiAKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJv dmlzaW9uYWxQYWdlUHJveHk+IG1fcHJvdmlzaW9uYWxQYWdlOworCiAjaWYgSEFWRShQRU5DSUxL SVQpCiAgICAgc3RkOjp1bmlxdWVfcHRyPEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyPiBtX2VkaXRh YmxlSW1hZ2VDb250cm9sbGVyOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Byb3h5LmNwcAppbmRleCBkYjFmZDU4YjkzZGZmNTg2NWQxM2ZjNTQxYjZlNWQ4NzQ2 ZWI4ZTBhLi42YmU5ZGMzOTllMDE0ODhkYTY3OGZiNDU2OGVmMzZiMjFmM2M0ODc2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKQEAgLTM0LDYgKzM0LDcg QEAKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiUGx1Z2luSW5mb1N0b3JlLmgiCiAj aW5jbHVkZSAiUGx1Z2luUHJvY2Vzc01hbmFnZXIuaCIKKyNpbmNsdWRlICJQcm92aXNpb25hbFBh Z2VQcm94eS5oIgogI2luY2x1ZGUgIlRleHRDaGVja2VyLmgiCiAjaW5jbHVkZSAiVGV4dENoZWNr ZXJTdGF0ZS5oIgogI2luY2x1ZGUgIlVJTWVzc2FnZVBvcnRDaGFubmVsUHJvdmlkZXIuaCIKQEAg LTU4NCw2ICs1ODUsMTUgQEAgYm9vbCBXZWJQcm9jZXNzUHJveHk6OmZ1bGxLZXlib2FyZEFjY2Vz c0VuYWJsZWQoKQogfQogI2VuZGlmCiAKK2Jvb2wgV2ViUHJvY2Vzc1Byb3h5OjpoYXNQcm92aXNp b25hbFBhZ2VXaXRoSUQodWludDY0X3QgcGFnZUlEKSBjb25zdAoreworICAgIGZvciAoYXV0byog cHJvdmlzaW9uYWxQYWdlIDogbV9wcm92aXNpb25hbFBhZ2VzKSB7CisgICAgICAgIGlmIChwcm92 aXNpb25hbFBhZ2UtPnBhZ2UoKS5wYWdlSUQoKSA9PSBwYWdlSUQpCisgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorCiB2b2lkIFdlYlByb2Nlc3NQ cm94eTo6dXBkYXRlQmFja0ZvcndhcmRJdGVtKGNvbnN0IEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0 ZSYgaXRlbVN0YXRlKQogewogICAgIGlmIChhdXRvKiBpdGVtID0gV2ViQmFja0ZvcndhcmRMaXN0 SXRlbTo6aXRlbUZvcklEKGl0ZW1TdGF0ZS5pZGVudGlmaWVyKSkgewpAQCAtNTkxLDcgKzYwMSw3 IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojp1cGRhdGVCYWNrRm9yd2FyZEl0ZW0oY29uc3QgQmFj a0ZvcndhcmRMaXN0SXRlbVN0YXRlJiBpdGVtCiAgICAgICAgIC8vIHRoZSBiYWNrL2ZvcndhcmQg aXRlbXMgcGFnZS4KICAgICAgICAgLy8gZS5nLiBUaGUgb2xkIHdlYiBwcm9jZXNzIGlzIG5hdmln YXRpbmcgdG8gYWJvdXQ6YmxhbmsgZm9yIHN1c3BlbnNpb24uCiAgICAgICAgIC8vIFdlIGlnbm9y ZSB0aGVzZSB1cGRhdGVzLgotICAgICAgICBpZiAobV9wYWdlTWFwLmNvbnRhaW5zKGl0ZW0tPnBh Z2VJRCgpKSkKKyAgICAgICAgaWYgKG1fcGFnZU1hcC5jb250YWlucyhpdGVtLT5wYWdlSUQoKSkg fHwgaGFzUHJvdmlzaW9uYWxQYWdlV2l0aElEKGl0ZW0tPnBhZ2VJRCgpKSkKICAgICAgICAgICAg IGl0ZW0tPnNldFBhZ2VTdGF0ZShpdGVtU3RhdGUucGFnZVN0YXRlKTsKICAgICB9CiB9CkBAIC02 OTQsNiArNzA0LDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OnByb2Nlc3NEaWRUZXJtaW5hdGVP ckZhaWxlZFRvTGF1bmNoKCkKICAgICAgICAgd2ViQ29ubmVjdGlvbi0+ZGlkQ2xvc2UoKTsKIAog ICAgIGF1dG8gcGFnZXMgPSBjb3B5VG9WZWN0b3JPZjxSZWZQdHI8V2ViUGFnZVByb3h5Pj4obV9w YWdlTWFwLnZhbHVlcygpKTsKKyAgICBhdXRvIHByb3Zpc2lvbmFsUGFnZXMgPSBXVEY6Om1hcCht X3Byb3Zpc2lvbmFsUGFnZXMsIFtdKGF1dG8qIHByb3Zpc2lvbmFsUGFnZSkgeyByZXR1cm4gbWFr ZVdlYWtQdHIocHJvdmlzaW9uYWxQYWdlKTsgfSk7CiAKICAgICBzaHV0RG93bigpOwogCkBAIC03 MDgsNiArNzE5LDExIEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojpwcm9jZXNzRGlkVGVybWluYXRl T3JGYWlsZWRUb0xhdW5jaCgpCiAKICAgICBmb3IgKGF1dG8mIHBhZ2UgOiBwYWdlcykKICAgICAg ICAgcGFnZS0+cHJvY2Vzc0RpZFRlcm1pbmF0ZShQcm9jZXNzVGVybWluYXRpb25SZWFzb246OkNy YXNoKTsKKworICAgIGZvciAoYXV0byYgcHJvdmlzaW9uYWxQYWdlIDogcHJvdmlzaW9uYWxQYWdl cykgeworICAgICAgICBpZiAocHJvdmlzaW9uYWxQYWdlKQorICAgICAgICAgICAgcHJvdmlzaW9u YWxQYWdlLT5wcm9jZXNzRGlkVGVybWluYXRlKCk7CisgICAgfQogfQogCiB2b2lkIFdlYlByb2Nl c3NQcm94eTo6ZGlkUmVjZWl2ZUludmFsaWRNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYgY29ubmVj dGlvbiwgSVBDOjpTdHJpbmdSZWZlcmVuY2UgbWVzc2FnZVJlY2VpdmVyTmFtZSwgSVBDOjpTdHJp bmdSZWZlcmVuY2UgbWVzc2FnZU5hbWUpCkBAIC03ODAsNiArNzk2LDEyIEBAIHZvaWQgV2ViUHJv Y2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVuY2hpbmcoUHJvY2Vzc0xhdW5jaGVyKiBsYXVuY2hlciwg SVBDOjpDb25uZWN0CiAgICAgICAgIHBhZ2UtPnByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmcoKTsK ICAgICB9CiAKKyAgICBmb3IgKGF1dG8qIHByb3Zpc2lvbmFsUGFnZSA6IG1fcHJvdmlzaW9uYWxQ YWdlcykgeworICAgICAgICBBU1NFUlQodGhpcyA9PSAmcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNz KCkpOworICAgICAgICBwcm92aXNpb25hbFBhZ2UtPnByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmco KTsKKyAgICB9CisKKwogICAgIFJFTEVBU0VfQVNTRVJUKCFtX3dlYkNvbm5lY3Rpb24pOwogICAg IG1fd2ViQ29ubmVjdGlvbiA9IFdlYkNvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmNyZWF0ZSh0aGlz KTsKIApAQCAtODczLDcgKzg5NSw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjptYXliZVNodXRE b3duKCkKIAogYm9vbCBXZWJQcm9jZXNzUHJveHk6OmNhblRlcm1pbmF0ZUNoaWxkUHJvY2Vzcygp CiB7Ci0gICAgaWYgKCFtX3BhZ2VNYXAuaXNFbXB0eSgpIHx8IG1fcHJvY2Vzc1Bvb2wtPmhhc1N1 c3BlbmRlZFBhZ2VGb3IoKnRoaXMpKQorICAgIGlmICghbV9wYWdlTWFwLmlzRW1wdHkoKSB8fCBt X3Byb2Nlc3NQb29sLT5oYXNTdXNwZW5kZWRQYWdlRm9yKCp0aGlzKSB8fCAhbV9wcm92aXNpb25h bFBhZ2VzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKCFtX3By b2Nlc3NQb29sLT5zaG91bGRUZXJtaW5hdGUodGhpcykpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlByb2Nlc3NQcm94eS5oCmluZGV4IDc1ZjY1YTdmN2ViMWFjYzgxOTk5MWNlNGY5ZjY5ODZj OTViNjFmZjMuLjUwNDI2MzBkZTM3MWQ4NWE4MjgzNzQzNDhhYTk2OTE3MzljOWNkNzAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCkBAIC03MCw2ICs3MCw3IEBA IG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgTmV0d29ya1Byb2Nlc3NQcm94eTsKIGNsYXNzIE9i akNPYmplY3RHcmFwaDsKIGNsYXNzIFBhZ2VDbGllbnQ7CitjbGFzcyBQcm92aXNpb25hbFBhZ2VQ cm94eTsKIGNsYXNzIFVzZXJNZWRpYUNhcHR1cmVNYW5hZ2VyUHJveHk7CiBjbGFzcyBWaXNpdGVk TGlua1N0b3JlOwogY2xhc3MgV2ViQmFja0ZvcndhcmRMaXN0SXRlbTsKQEAgLTEyNCw2ICsxMjUs OSBAQCBwdWJsaWM6CiAgICAgZW51bSBjbGFzcyBFbmRzVXNpbmdEYXRhU3RvcmUgOiBib29sIHsg Tm8sIFllcyB9OwogICAgIHZvaWQgcmVtb3ZlV2ViUGFnZShXZWJQYWdlUHJveHkmLCB1aW50NjRf dCBwYWdlSUQsIEVuZHNVc2luZ0RhdGFTdG9yZSk7CiAKKyAgICB2b2lkIGFkZFByb3Zpc2lvbmFs UGFnZVByb3h5KFByb3Zpc2lvbmFsUGFnZVByb3h5JiBwcm92aXNpb25hbFBhZ2UpIHsgQVNTRVJU KCFtX3Byb3Zpc2lvbmFsUGFnZXMuY29udGFpbnMoJnByb3Zpc2lvbmFsUGFnZSkpOyBtX3Byb3Zp c2lvbmFsUGFnZXMuYWRkKCZwcm92aXNpb25hbFBhZ2UpOyB9CisgICAgdm9pZCByZW1vdmVQcm92 aXNpb25hbFBhZ2VQcm94eShQcm92aXNpb25hbFBhZ2VQcm94eSYgcHJvdmlzaW9uYWxQYWdlKSB7 IEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFnZXMuY29udGFpbnMoJnByb3Zpc2lvbmFsUGFnZSkpOyBt X3Byb3Zpc2lvbmFsUGFnZXMucmVtb3ZlKCZwcm92aXNpb25hbFBhZ2UpOyB9CisKICAgICB0eXBl bmFtZSBXZWJQYWdlUHJveHlNYXA6OlZhbHVlc0NvbnN0SXRlcmF0b3JSYW5nZSBwYWdlcygpIGNv bnN0IHsgcmV0dXJuIG1fcGFnZU1hcC52YWx1ZXMoKTsgfQogICAgIHVuc2lnbmVkIHBhZ2VDb3Vu dCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZU1hcC5zaXplKCk7IH0KICAgICB1bnNpZ25lZCB2aXNp YmxlUGFnZUNvdW50KCkgY29uc3QgeyByZXR1cm4gbV92aXNpYmxlUGFnZUNvdW50ZXIudmFsdWUo KTsgfQpAQCAtMzMwLDYgKzMzNCw4IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGxvZ0RpYWdub3N0 aWNNZXNzYWdlRm9yUmVzb3VyY2VMaW1pdFRlcm1pbmF0aW9uKGNvbnN0IFN0cmluZyYgbGltaXRL ZXkpOwogCisgICAgYm9vbCBoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQodWludDY0X3QgcGFnZUlE KSBjb25zdDsKKwogICAgIGVudW0gY2xhc3MgSXNXZWFrIHsgTm8sIFllcyB9OwogICAgIHRlbXBs YXRlPHR5cGVuYW1lIFQ+IGNsYXNzIFdlYWtPclN0cm9uZ1B0ciB7CiAgICAgcHVibGljOgpAQCAt MzczLDYgKzM3OSw3IEBAIHByaXZhdGU6CiAKICAgICBXZWJQYWdlUHJveHlNYXAgbV9wYWdlTWFw OwogICAgIFdlYkZyYW1lUHJveHlNYXAgbV9mcmFtZU1hcDsKKyAgICBIYXNoU2V0PFByb3Zpc2lv bmFsUGFnZVByb3h5Kj4gbV9wcm92aXNpb25hbFBhZ2VzOwogICAgIFVzZXJJbml0aWF0ZWRBY3Rp b25NYXAgbV91c2VySW5pdGlhdGVkQWN0aW9uTWFwOwogCiAgICAgSGFzaFNldDxWaXNpdGVkTGlu a1N0b3JlKj4gbV92aXNpdGVkTGlua1N0b3JlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv V2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC54 Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IGRlZGJhZGNjZDM0ZjBhNDM0ZDZkZTE0NTRj NDRhOTg5MjJjYTAxY2QuLmQ3ZGEyN2EwNTEyODllN2U1MWY0OGUyYzllY2E3OWZhODkxMTI0NTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2oKKysrIGIvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpA QCAtMzA3MCw2ICszMDcwLDggQEAKIAkJNDY2QkMwMzgxRkEyNjZDOTAwMkZBOUMxIC8qIFdlYlNX Q29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNw cDsgcGF0aCA9IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJNDY2QkMwMzkxRkEyNjZDOTAwMkZBOUMxIC8qIFdlYlNXQ29udGV4 dE1hbmFnZXJDb25uZWN0aW9uLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdl YlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTQ2NkJDMDNBMUZBMjY2QzkwMDJGQTlDMSAvKiBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVj dGlvbi5tZXNzYWdlcy5pbiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7IHBhdGggPSBXZWJTV0NvbnRleHRNYW5h Z2VyQ29ubmVjdGlvbi5tZXNzYWdlcy5pbjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJ NDY4MzU2OUEyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmggKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFByb3Zpc2lvbmFsUGFnZVByb3h5Lmg7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTQ2ODM1NjlCMjFFODFDQzcwMDZFMjdBMyAvKiBQcm92 aXNpb25hbFBhZ2VQcm94eS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGgg PSBQcm92aXNpb25hbFBhZ2VQcm94eS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CTQ2QTJCNjA2MUU1Njc1QTIwMEMzREVEQSAvKiBCYWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVu ZXNzVGltZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gQmFja2dy b3VuZFByb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJNDZBMkI2MDcxRTU2NzVBMjAwQzNERURBIC8qIEJhY2tncm91bmRQcm9jZXNzUmVz cG9uc2l2ZW5lc3NUaW1lci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBCYWNr Z3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVuZXNzVGltZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJNDZERjA2MzkxRjM5MDVFNTAwMTk4MEJCIC8qIE5ldHdvcmtDT1JTUHJlZmxpZ2h0 Q2hlY2tlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBOZXR3b3Jr Q09SU1ByZWZsaWdodENoZWNrZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAt NzMxMiw2ICs3MzE0LDggQEAKIAkJCQk4NkU2N0EyMjE5MEY0MTE4MDAwMDRBQjcgLyogUHJvY2Vz c1Rocm90dGxlci5jcHAgKi8sCiAJCQkJODZFNjdBMjExOTBGNDExODAwMDA0QUI3IC8qIFByb2Nl c3NUaHJvdHRsZXIuaCAqLywKIAkJCQk4MzA0OEFFNTFBQ0E0NURDMDA4MkM4MzIgLyogUHJvY2Vz c1Rocm90dGxlckNsaWVudC5oICovLAorCQkJCTQ2ODM1NjlCMjFFODFDQzcwMDZFMjdBMyAvKiBQ cm92aXNpb25hbFBhZ2VQcm94eS5jcHAgKi8sCisJCQkJNDY4MzU2OUEyMUU4MUNDNzAwNkUyN0Ez IC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmggKi8sCiAJCQkJQTU1QkE4MUIxQkEyNUIxRTAwN0NE MzNEIC8qIFJlbW90ZVdlYkluc3BlY3RvclByb3h5LmNwcCAqLywKIAkJCQlBNTVCQTgxOTFCQTI1 QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkuaCAqLywKIAkJCQlBNTVCQTgx QTFCQTI1QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2ViSW5zcGVjdG9yUHJveHkubWVzc2FnZXMuaW4g Ki8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFt ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAKaW5k ZXggMDA3NDliNDc3YTI0Y2U4Y2NjODI1MDFkOTRlMDhiNjBlZTFhNjI2My4uZmZlZDAwYzgyMDZh OTRmMGU0ZmZjN2ZmM2E4YTlkZmY4NjEzZmFjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcApAQCAtMjYzLDggKzI2Myw2IEBAIHN0YXRpYyBXZWJD b3JlOjpQb2xpY3lBY3Rpb24gdG9Qb2xpY3lBY3Rpb24oV2ViUG9saWN5QWN0aW9uIHBvbGljeUFj dGlvbikKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6SWdub3JlOwogICAg IGNhc2UgV2ViUG9saWN5QWN0aW9uOjpEb3dubG9hZDoKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6 OlBvbGljeUFjdGlvbjo6RG93bmxvYWQ7Ci0gICAgY2FzZSBXZWJQb2xpY3lBY3Rpb246OlN1c3Bl bmQ6Ci0gICAgICAgIGJyZWFrOwogICAgIH0KICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAg ICByZXR1cm4gV2ViQ29yZTo6UG9saWN5QWN0aW9uOjpJZ25vcmU7CkBAIC0yNzIsMTEgKzI3MCw4 IEBAIHN0YXRpYyBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gdG9Qb2xpY3lBY3Rpb24oV2ViUG9saWN5 QWN0aW9uIHBvbGljeUFjdGlvbikKIAogdm9pZCBXZWJGcmFtZTo6ZGlkUmVjZWl2ZVBvbGljeURl Y2lzaW9uKHVpbnQ2NF90IGxpc3RlbmVySUQsIFdlYlBvbGljeUFjdGlvbiBhY3Rpb24sIHVpbnQ2 NF90IG5hdmlnYXRpb25JRCwgRG93bmxvYWRJRCBkb3dubG9hZElELCBPcHRpb25hbDxXZWJzaXRl UG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKIHsKLSAgICBpZiAoIW1fY29yZUZyYW1l IHx8ICFtX3BvbGljeUxpc3RlbmVySUQgfHwgbGlzdGVuZXJJRCAhPSBtX3BvbGljeUxpc3RlbmVy SUQgfHwgIW1fcG9saWN5RnVuY3Rpb24pIHsKLSAgICAgICAgaWYgKGFjdGlvbiA9PSBXZWJQb2xp Y3lBY3Rpb246OlN1c3BlbmQpCi0gICAgICAgICAgICBwYWdlKCktPnNlbmQoTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6RGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAoKSk7CisgICAgaWYg KCFtX2NvcmVGcmFtZSB8fCAhbV9wb2xpY3lMaXN0ZW5lcklEIHx8IGxpc3RlbmVySUQgIT0gbV9w b2xpY3lMaXN0ZW5lcklEIHx8ICFtX3BvbGljeUZ1bmN0aW9uKQogICAgICAgICByZXR1cm47Ci0g ICAgfQogCiAgICAgRnJhbWVQb2xpY3lGdW5jdGlvbiBmdW5jdGlvbiA9IFdURk1vdmUobV9wb2xp Y3lGdW5jdGlvbik7CiAgICAgYm9vbCBmb3JOYXZpZ2F0aW9uQWN0aW9uID0gbV9wb2xpY3lGdW5j dGlvbkZvck5hdmlnYXRpb25BY3Rpb24gPT0gRm9yTmF2aWdhdGlvbkFjdGlvbjo6WWVzOwpAQCAt MjkyLDE2ICsyODcsNyBAQCB2b2lkIFdlYkZyYW1lOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24o dWludDY0X3QgbGlzdGVuZXJJRCwgV2ViUG9saWN5QWN0aW9uIGFjdAogICAgICAgICAgICAgZG9j dW1lbnRMb2FkZXItPnNldE5hdmlnYXRpb25JRChuYXZpZ2F0aW9uSUQpOwogICAgIH0KIAotICAg IGJvb2wgc2hvdWxkU3VzcGVuZCA9IGZhbHNlOwotICAgIGlmIChhY3Rpb24gPT0gV2ViUG9saWN5 QWN0aW9uOjpTdXNwZW5kKSB7Ci0gICAgICAgIHNob3VsZFN1c3BlbmQgPSB0cnVlOwotICAgICAg ICBhY3Rpb24gPSBXZWJQb2xpY3lBY3Rpb246Oklnbm9yZTsKLSAgICB9Ci0KICAgICBmdW5jdGlv bih0b1BvbGljeUFjdGlvbihhY3Rpb24pKTsKLQotICAgIGlmIChzaG91bGRTdXNwZW5kKQotICAg ICAgICBwYWdlKCktPnN1c3BlbmRGb3JQcm9jZXNzU3dhcCgpOwogfQogCiB2b2lkIFdlYkZyYW1l OjpzdGFydERvd25sb2FkKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwg Y29uc3QgU3RyaW5nJiBzdWdnZXN0ZWROYW1lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCA4MDNiYThiOTk1ZWQzZWM4MzFhYjQ2YjUzOTdjNzY2 MmU2YTgxYzY1Li4xMGU1YTc3MjMzYzk1NzY4MTJhMzA5N2UwODNhMTVmOTAwZmRlYmUzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtNDAxLDcg KzQwMSw3IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBXZWJQYWdlQ3JlYXRp b25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICAsIG1fb3ZlcnJpZGVDb250ZW50U2VjdXJp dHlQb2xpY3kgeyBwYXJhbWV0ZXJzLm92ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5IH0KICAg ICAsIG1fY3B1TGltaXQocGFyYW1ldGVycy5jcHVMaW1pdCkKICNpZiBQTEFURk9STShNQUMpCi0g ICAgLCBtX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNpdGlvbihwYXJhbWV0ZXJz LmlzU3dhcEZyb21TdXNwZW5kZWQpCisgICAgLCBtX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25Q YWdlVHJhbnNpdGlvbihwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXApCiAjZW5kaWYKIHsKICAgICBB U1NFUlQobV9wYWdlSUQpOwpAQCAtNDcxLDggKzQ3MSw4IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWlu dDY0X3QgcGFnZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAg ICBtX2RyYXdpbmdBcmVhLT5zZXRQYWludGluZ0VuYWJsZWQoZmFsc2UpOwogICAgIG1fZHJhd2lu Z0FyZWEtPnNldFNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQocGFyYW1ldGVycy5zaG91bGRT Y2FsZVZpZXdUb0ZpdERvY3VtZW50KTsKIAotICAgIGlmIChwYXJhbWV0ZXJzLmlzU3dhcEZyb21T dXNwZW5kZWQpCi0gICAgICAgIGZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246 OlN3YXBGcm9tU3VzcGVuZGVkKTsKKyAgICBpZiAocGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwKQor ICAgICAgICBmcmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29uOjpQcm9jZXNzU3dh cCk7CiAKICNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKQogICAgIG1fdXNlQXN5bmNTY3JvbGxp bmcgPSBwYXJhbWV0ZXJzLnN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tl eTo6dGhyZWFkZWRTY3JvbGxpbmdFbmFibGVkS2V5KCkpOwpAQCAtNjk2LDcgKzY5Niw3IEBAIHZv aWQgV2ViUGFnZTo6cmVpbml0aWFsaXplV2ViUGFnZShXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz JiYgcGFyYW1ldGVycykKICAgICAgICAgbV9kcmF3aW5nQXJlYS0+dXBkYXRlUHJlZmVyZW5jZXMo cGFyYW1ldGVycy5zdG9yZSk7CiAgICAgICAgIG1fZHJhd2luZ0FyZWEtPnNldFBhaW50aW5nRW5h YmxlZCh0cnVlKTsKICNpZiBQTEFURk9STShNQUMpCi0gICAgICAgIG1fc2hvdWxkQXR0YWNoRHJh d2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uID0gcGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVk OworICAgICAgICBtX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNpdGlvbiA9IHBh cmFtZXRlcnMuaXNQcm9jZXNzU3dhcDsKICNlbmRpZgogICAgICAgICB1bmZyZWV6ZUxheWVyVHJl ZShMYXllclRyZWVGcmVlemVSZWFzb246OlBhZ2VTdXNwZW5kZWQpOwogICAgIH0KQEAgLTMwNTMs MTIgKzMwNTMsNiBAQCB2b2lkIFdlYlBhZ2U6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1aW50 NjRfdCBmcmFtZUlELCB1aW50NjRfdCBsaXN0ZW5lcklELCBXZQogICAgIFdlYkZyYW1lKiBmcmFt ZSA9IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLndlYkZyYW1lKGZyYW1lSUQpOwogICAgIGlmICgh ZnJhbWUpCiAgICAgICAgIHJldHVybjsKLSAgICBpZiAocG9saWN5QWN0aW9uID09IFdlYlBvbGlj eUFjdGlvbjo6U3VzcGVuZCkgewotICAgICAgICBBU1NFUlQoZnJhbWUgPT0gbV9tYWluRnJhbWUp OwotICAgICAgICBzZXRJc1N1c3BlbmRlZCh0cnVlKTsKLQotICAgICAgICBXZWJQcm9jZXNzOjpz aW5nbGV0b24oKS5zZW5kUHJld2FybUluZm9ybWF0aW9uKG1haW5XZWJGcmFtZSgpLT51cmwoKSk7 Ci0gICAgfQogICAgIGZyYW1lLT5kaWRSZWNlaXZlUG9saWN5RGVjaXNpb24obGlzdGVuZXJJRCwg cG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uSUQsIGRvd25sb2FkSUQsIFdURk1vdmUod2Vic2l0ZVBv bGljaWVzKSk7CiB9CiAKQEAgLTMxMDAsNyArMzA5NCw3IEBAIHZvaWQgV2ViUGFnZTo6ZGlkQ29t cGxldGVQYWdlVHJhbnNpdGlvbigpCiAKICAgICBib29sIGlzSW5pdGlhbEVtcHR5RG9jdW1lbnQg PSAhbV9tYWluRnJhbWU7CiAgICAgaWYgKCFpc0luaXRpYWxFbXB0eURvY3VtZW50KQotICAgICAg ICB1bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlN3YXBGcm9tU3VzcGVu ZGVkKTsKKyAgICAgICAgdW5mcmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29uOjpQ cm9jZXNzU3dhcCk7CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgaWYgKG1fc2hvdWxkQXR0YWNo RHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uICYmICFpc0luaXRpYWxFbXB0eURvY3VtZW50KSB7 CkBAIC02MzEyLDYgKzYzMDYsMTAgQEAgdm9pZCBXZWJQYWdlOjpzZXRJc1N1c3BlbmRlZChib29s IHN1c3BlbmRlZCkKICAgICBpZiAobV9pc1N1c3BlbmRlZCkgewogICAgICAgICAvLyBVbmZyb3pl biBvbiBkcmF3aW5nIGFyZWEgcmVzZXQuCiAgICAgICAgIGZyZWV6ZUxheWVyVHJlZShMYXllclRy ZWVGcmVlemVSZWFzb246OlBhZ2VTdXNwZW5kZWQpOworCisgICAgICAgIFdlYlByb2Nlc3M6OnNp bmdsZXRvbigpLnNlbmRQcmV3YXJtSW5mb3JtYXRpb24obWFpbldlYkZyYW1lKCktPnVybCgpKTsK KworICAgICAgICBzdXNwZW5kRm9yUHJvY2Vzc1N3YXAoKTsKICAgICB9IGVsc2UKICAgICAgICAg bV9zaG91bGRSZXNldERyYXdpbmdBcmVhQWZ0ZXJTdXNwZW5kID0gdHJ1ZTsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA3MTVlMTI0NTIwZmYwNzZi OTYwYWVkNzBlOWI5MjA3NWE2NTUyYWVmLi5mM2I5MzRlMjdkYTlkNWVhNWExYmJmNTVmMTQ5ZjVh ODUxMjczNmU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5o CkBAIC02OTYsNyArNjk2LDcgQEAgcHVibGljOgogICAgICAgICBQcm9jZXNzU3VzcGVuZGVkICAg ICAgICA9IDEgPDwgMiwKICAgICAgICAgUGFnZVN1c3BlbmRlZCAgICAgICAgICAgPSAxIDw8IDMs CiAgICAgICAgIFByaW50aW5nICAgICAgICAgICAgICAgID0gMSA8PCA0LAotICAgICAgICBTd2Fw RnJvbVN1c3BlbmRlZCAgICAgICA9IDEgPDwgNSwKKyAgICAgICAgUHJvY2Vzc1N3YXAgICAgICAg ICAgICAgPSAxIDw8IDUsCiAgICAgfTsKICAgICB2b2lkIGZyZWV6ZUxheWVyVHJlZShMYXllclRy ZWVGcmVlemVSZWFzb24pOwogICAgIHZvaWQgdW5mcmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJl ZXplUmVhc29uKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbSBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQppbmRl eCA5MWFkNzFhZGUxYjdkYjRmOWRjZTY0ZDRmMzMwNDY3YjIyYjgzM2NjLi44M2I2NTk5MjcwYjUx YzdiYjE4ZWZlNzM3YTU5MmUwMjU3MWEyODA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KKysr IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhLm1tCkBAIC05Nyw3ICs5Nyw3IEBAIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhOjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYShXZWJQYWdlJiB3ZWJQYWdlLCBj CiAgICAgdXBkYXRlTGF5ZXJIb3N0aW5nQ29udGV4dCgpOwogICAgIHNldENvbG9yU3BhY2UocGFy YW1ldGVycy5jb2xvclNwYWNlKTsKIAotICAgIGlmICghcGFyYW1ldGVycy5pc1N3YXBGcm9tU3Vz cGVuZGVkKQorICAgIGlmICghcGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwKQogICAgICAgICBhdHRh Y2goKTsKIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9n CmluZGV4IDlhMjYyNDA0YmVjZGE1ZjE5OWYzMTFhY2UyMGVlMTM0MzNiMTczNTcuLjBlY2JjMThl N2VkZTJhY2UxZmJmZjNmMDI0M2I1NDZjYTFiMmRiNjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5n ZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOS0wMS0xNSAg Q2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFJlZ3Jlc3Npb24oUFNP TikgVmlldyBiZWNvbWVzIGJsYW5rIGFmdGVyIGNsaWNrIGEgY3Jvc3Mtc2l0ZSBkb3dubG9hZCBs aW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMz NjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczPgorCisgICAgICAgIFJldmlld2Vk IGJ5IEdlb2ZmIEdhcmVuLgorCisgICAgICAgIEFkZCBBUEkgdGVzdCBjb3ZlcmFnZS4KKworICAg ICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmln YXRpb24ubW06CisgICAgICAgICgtW1BTT05OYXZpZ2F0aW9uRGVsZWdhdGUgd2ViVmlldzpkZWNp ZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2U6ZGVjaXNpb25IYW5kbGVyOl0pOgorCiAyMDE5 LTAxLTE1ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ10g VXNlIHRoZSBjb250YWluaW5nIGJsb2NrJ3MgcGFkZGluZyBib3ggdG8gcG9zaXRpb24gb3V0LW9m LWZsb3cgZWxlbWVudHMuCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQppbmRleCBmMzVk OGJhYTM1M2YwNzAyNGZkNDBlN2Q1Mjc0NTNhNzQyMTBjM2JhLi5hNDQ1YmYxZjljYmIyZTJjOTYy MDY2NDcyODgxYzVlZDQ5ZDFjYThlIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCisrKyBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0K QEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE3IEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNy0yMDE5IEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwg YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAt NzIsNiArNzIsNyBAQCBzdGF0aWMgYm9vbCBzZXJ2ZXJSZWRpcmVjdGVkOwogc3RhdGljIEhhc2hT ZXQ8cGlkX3Q+IHNlZW5QSURzOwogc3RhdGljIGJvb2wgd2lsbFBlcmZvcm1DbGllbnRSZWRpcmVj dDsKIHN0YXRpYyBib29sIGRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdDsKK3N0YXRpYyBib29sIHNo b3VsZENvbnZlcnRUb0Rvd25sb2FkOwogc3RhdGljIFJldGFpblB0cjxOU1VSTD4gY2xpZW50UmVk aXJlY3RTb3VyY2VVUkw7CiBzdGF0aWMgUmV0YWluUHRyPE5TVVJMPiBjbGllbnRSZWRpcmVjdERl c3RpbmF0aW9uVVJMOwogCkBAIC0xMjgsNiArMTI5LDExIEBAIC0gKHZvaWQpd2ViVmlldzooV0tX ZWJWaWV3ICopd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOihXS05hdmln YXRpCiAgICAgZGlkUmVwb25kVG9Qb2xpY3lEZWNpc2lvbkNhbGwgPSB0cnVlOwogfQogCistICh2 b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlv blJlc3BvbnNlOihXS05hdmlnYXRpb25SZXNwb25zZSAqKW5hdmlnYXRpb25SZXNwb25zZSBkZWNp c2lvbkhhbmRsZXI6KHZvaWQgKF4pKFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5KSlkZWNpc2lv bkhhbmRsZXIKK3sKKyAgICBkZWNpc2lvbkhhbmRsZXIoc2hvdWxkQ29udmVydFRvRG93bmxvYWQg PyBfV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3lCZWNvbWVEb3dubG9hZCA6IFdLTmF2aWdhdGlv blJlc3BvbnNlUG9saWN5QWxsb3cpOworfQorCiAtICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAq KXdlYlZpZXcgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxOYXZpZ2F0aW9u OihXS05hdmlnYXRpb24gKiluYXZpZ2F0aW9uCiB7CiAgICAgc2VlblBJRHMuYWRkKFt3ZWJWaWV3 IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0pOwpAQCAtMTQwNSw3ICsxNDExLDcgQEAgVEVTVChQcm9j ZXNzU3dhcCwgU2VydmVyUmVkaXJlY3QpCiAKICAgICBFWFBFQ1RfRkFMU0Uoc2VydmVyUmVkaXJl Y3RlZCk7CiAgICAgRVhQRUNUX0VRKDMsIG51bWJlck9mRGVjaWRlUG9saWN5Q2FsbHMpOwotICAg IEVYUEVDVF9FUSgydSwgc2VlblBJRHMuc2l6ZSgpKTsKKyAgICBFWFBFQ1RfRVEoM3UsIHNlZW5Q SURzLnNpemUoKSk7CiB9CiAKIFRFU1QoUHJvY2Vzc1N3YXAsIFNlcnZlclJlZGlyZWN0MikKQEAg LTE0NjcsNiArMTQ3MywxMDkgQEAgVEVTVChQcm9jZXNzU3dhcCwgU2VydmVyUmVkaXJlY3QyKQog ICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluMS5odG1sIiwg W1t3ZWJWaWV3IFVSTF0gYWJzb2x1dGVTdHJpbmddKTsKIH0KIAorc3RhdGljIGNvbnN0IGNoYXIq IGxpbmtUb1dlYktpdEJ5dGVzID0gUiJQU09OUkVTT1VSQ0UoCis8Ym9keT4KKyAgPGEgaWQ9InRl c3RMaW5rIiBocmVmPSJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIj5MaW5rPC9hPgor PC9ib2R5PgorKVBTT05SRVNPVVJDRSI7CisKK1RFU1QoUHJvY2Vzc1N3YXAsIFBvbGljeUNhbmNl bEFmdGVyU2VydmVyUmVkaXJlY3QpCit7CisgICAgYXV0byBwcm9jZXNzUG9vbENvbmZpZ3VyYXRp b24gPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7 CisgICAgcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NTd2Fwc09uTmF2aWdh dGlvbiA9IFlFUzsKKyAgICBhdXRvIHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bv b2wgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9u LmdldCgpXSk7CisKKyAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dL V2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlld0NvbmZpZ3Vy YXRpb24gc2V0UHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0KCldOworICAgIGF1dG8gaGFuZGxl ciA9IGFkb3B0TlMoW1tQU09OU2NoZW1lIGFsbG9jXSBpbml0XSk7CisgICAgW2hhbmRsZXIgYWRk TWFwcGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1sIiB0 b0RhdGE6bGlua1RvV2ViS2l0Qnl0ZXNdOworICAgIFtoYW5kbGVyIGFkZFJlZGlyZWN0RnJvbVVS TFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiIHRvVVJMU3RyaW5nOkAi cHNvbjovL3d3dy5hcHBsZS5jb20vaWdub3JlLmh0bWwiXTsKKyAgICBbd2ViVmlld0NvbmZpZ3Vy YXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAInBz b24iXTsKKworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGlu aXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3ZWJW aWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIGF1dG8gbmF2aWdhdGlvbkRlbGVnYXRlID0g YWRvcHROUyhbW1BTT05OYXZpZ2F0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2Vi VmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6bmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpXTsKKwor ICAgIG5hdmlnYXRpb25EZWxlZ2F0ZS0+ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiA9 IF4oV0tOYXZpZ2F0aW9uQWN0aW9uICphY3Rpb24sIHZvaWQgKF5kZWNpc2lvbkhhbmRsZXIpKFdL TmF2aWdhdGlvbkFjdGlvblBvbGljeSkpIHsKKyAgICAgICAgaWYgKFthY3Rpb24ucmVxdWVzdC5V UkwuYWJzb2x1dGVTdHJpbmcgaGFzU3VmZml4OkAiaWdub3JlLmh0bWwiXSkgeworICAgICAgICAg ICAgZGVjaXNpb25IYW5kbGVyKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeUNhbmNlbCk7CisgICAg ICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgZGVjaXNpb25IYW5kbGVyKFdLTmF2 aWdhdGlvbkFjdGlvblBvbGljeUFsbG93KTsKKyAgICB9OworCisgICAgTlNVUkxSZXF1ZXN0ICpy ZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmlu ZzpAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiXV07CisgICAgW3dlYlZpZXcgbG9h ZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUp OworICAgIGRvbmUgPSBmYWxzZTsKKyAgICBhdXRvIHBpZEFmdGVyRmlyc3RMb2FkID0gW3dlYlZp ZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKworICAgIEVYUEVDVF9FUSgxLCBudW1iZXJPZkRl Y2lkZVBvbGljeUNhbGxzKTsKKworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAInRl c3RMaW5rLmNsaWNrKCkiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07CisKKyAgICBUZXN0V2ViS2l0 QVBJOjpVdGlsOjpydW4oJmZhaWxlZCk7CisgICAgZmFpbGVkID0gZmFsc2U7CisgICAgZG9uZSA9 IGZhbHNlOworCisgICAgRVhQRUNUX0VRKDMsIG51bWJlck9mRGVjaWRlUG9saWN5Q2FsbHMpOwor CisgICAgLy8gV2Ugc2hvdWxkIHN0aWxsIGJlIG9uIGdvb2dsZS5jb20uCisgICAgRVhQRUNUX0VR KHBpZEFmdGVyRmlyc3RMb2FkLCBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKKyAg ICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1sIiwgW1t3 ZWJWaWV3IFVSTF0gYWJzb2x1dGVTdHJpbmddKTsKKworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2 YVNjcmlwdDpAInRlc3RMaW5rLmlubmVyVGV4dCIgY29tcGxldGlvbkhhbmRsZXI6IFsmXSAoaWQg aW5uZXJUZXh0LCBOU0Vycm9yICplcnJvcikgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJM aW5rIiwgaW5uZXJUZXh0KTsKKyAgICAgICAgZG9uZSA9IHRydWU7CisgICAgfV07CisgICAgVGVz dFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7Cit9CisKK1RF U1QoUHJvY2Vzc1N3YXAsIENyb3NzU2l0ZURvd25sb2FkKQoreworICAgIGF1dG8gcHJvY2Vzc1Bv b2xDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbiBh bGxvY10gaW5pdF0pOworICAgIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKS5wcm9jZXNz U3dhcHNPbk5hdmlnYXRpb24gPSBZRVM7CisgICAgYXV0byBwcm9jZXNzUG9vbCA9IGFkb3B0TlMo W1tXS1Byb2Nlc3NQb29sIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOnByb2Nlc3NQb29s Q29uZmlndXJhdGlvbi5nZXQoKV0pOworCisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9 IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dl YlZpZXdDb25maWd1cmF0aW9uIHNldFByb2Nlc3NQb29sOnByb2Nlc3NQb29sLmdldCgpXTsKKyAg ICBhdXRvIGhhbmRsZXIgPSBhZG9wdE5TKFtbUFNPTlNjaGVtZSBhbGxvY10gaW5pdF0pOworICAg IFtoYW5kbGVyIGFkZE1hcHBpbmdGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy5nb29nbGUuY29t L21haW4uaHRtbCIgdG9EYXRhOmxpbmtUb1dlYktpdEJ5dGVzXTsKKyAgICBbaGFuZGxlciBhZGRN YXBwaW5nRnJvbVVSTFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiIHRv RGF0YToiSGVsbG8iXTsKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFu ZGxlcjpoYW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAInBzb24iXTsKKworICAgIGF1dG8gd2Vi VmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVj dCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQo KV0pOworICAgIGF1dG8gbmF2aWdhdGlvbkRlbGVnYXRlID0gYWRvcHROUyhbW1BTT05OYXZpZ2F0 aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVs ZWdhdGU6bmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpXTsKKworICAgIE5TVVJMUmVxdWVzdCAqcmVx dWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6 QCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1sIl1dOworICAgIFt3ZWJWaWV3IGxvYWRS ZXF1ZXN0OnJlcXVlc3RdOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsK KyAgICBkb25lID0gZmFsc2U7CisgICAgYXV0byBwaWRBZnRlckZpcnN0TG9hZCA9IFt3ZWJWaWV3 IF93ZWJQcm9jZXNzSWRlbnRpZmllcl07CisKKyAgICBzaG91bGRDb252ZXJ0VG9Eb3dubG9hZCA9 IHRydWU7CisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAidGVzdExpbmsuY2xpY2so KSIgY29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1 bigmZmFpbGVkKTsKKyAgICBmYWlsZWQgPSBmYWxzZTsKKyAgICBzaG91bGRDb252ZXJ0VG9Eb3du bG9hZCA9IGZhbHNlOworCisgICAgLy8gV2Ugc2hvdWxkIHN0aWxsIGJlIG9uIGdvb2dsZS5jb20u CisgICAgRVhQRUNUX0VRKHBpZEFmdGVyRmlyc3RMb2FkLCBbd2ViVmlldyBfd2ViUHJvY2Vzc0lk ZW50aWZpZXJdKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lmdvb2dsZS5jb20v bWFpbi5odG1sIiwgW1t3ZWJWaWV3IFVSTF0gYWJzb2x1dGVTdHJpbmddKTsKKworICAgIFt3ZWJW aWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAInRlc3RMaW5rLmlubmVyVGV4dCIgY29tcGxldGlvbkhh bmRsZXI6IFsmXSAoaWQgaW5uZXJUZXh0LCBOU0Vycm9yICplcnJvcikgeworICAgICAgICBFWFBF Q1RfV0tfU1RSRVEoQCJMaW5rIiwgaW5uZXJUZXh0KTsKKyAgICAgICAgZG9uZSA9IHRydWU7Cisg ICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0g ZmFsc2U7Cit9CisKIGVudW0gY2xhc3MgU2hvdWxkRW5hYmxlUFNPTiB7IE5vLCBZZXMgfTsKIHN0 YXRpYyB2b2lkIHJ1bkNsaWVudFNpZGVSZWRpcmVjdFRlc3QoU2hvdWxkRW5hYmxlUFNPTiBzaG91 bGRFbmFibGVQU09OKQogewpAQCAtMjIzMiwxMiArMjM0MSwyNyBAQCBURVNUKFByb2Nlc3NTd2Fw LCBQYWdlU2hvd0hpZGUpCiAKICAgICBFWFBFQ1RfRVEoN3UsIFtyZWNlaXZlZE1lc3NhZ2VzIGNv dW50XSk7CiAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4u aHRtbCAtIHBhZ2VzaG93IE5PVCBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzBd KTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1s IC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7Ci0gICAg RVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNo b3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOwotICAgIEVYUEVD VF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBl cnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10pOwotICAgIEVYUEVDVF9XS19TVFJF UShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQi LCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29u Oi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2 ZWRNZXNzYWdlcy5nZXQoKVs1XSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5h cHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdl cy5nZXQoKVs2XSk7CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdIGhhc1ByZWZp eDpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiXSkgeworICAgICAgICBFWFBFQ1Rf V0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVy c2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7CisgICAgICAgIEVYUEVDVF9XS19T VFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93IE5PVCBwZXJz aXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsKKyAgICB9IGVsc2UgeworICAgICAg ICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdl c2hvdyBOT1QgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7CisgICAgICAg IEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdl aGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsKKyAgICB9CisgICAg aWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdIGhhc1ByZWZpeDpAInBzb246Ly93d3cuYXBw bGUuY29tL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93 d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVz c2FnZXMuZ2V0KClbM10pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lndl YmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdl cy5nZXQoKVs0XSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNv bjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2Vp dmVkTWVzc2FnZXMuZ2V0KClbM10pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8v d3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1l c3NhZ2VzLmdldCgpWzRdKTsKKyAgICB9CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgp WzVdIGhhc1ByZWZpeDpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiXSkgeworICAg ICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0g cGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7CisgICAgICAg IEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2Vz aG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAgIH0gZWxzZSB7 CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRt bCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0pOworICAg ICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0g cGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7CisgICAgfQog fQogCiAvLyBEaXNhYmxpbmcgdGhlIHBhZ2UgY2FjaGUgZXhwbGljaXRseSBpcyAoZm9yIHNvbWUg cmVhc29uKSBub3QgYXZhaWxhYmxlIG9uIGlPUy4KQEAgLTIzMDcsMTIgKzI0MzEsMjcgQEAgVEVT VChQcm9jZXNzU3dhcCwgTG9hZFVubG9hZCkKIAogICAgIEVYUEVDVF9FUSg3dSwgW3JlY2VpdmVk TWVzc2FnZXMgY291bnRdKTsKICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtp dC5vcmcvbWFpbi5odG1sIC0gbG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMF0pOwotICAg IEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSB1bmxv YWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJw c29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBsb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5n ZXQoKVsyXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFp bi5odG1sIC0gdW5sb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSk7Ci0gICAgRVhQRUNU X1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIGxvYWQiLCByZWNl aXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3 LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gdW5sb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1 XSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1s IC0gbG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAgIGlmIChbcmVjZWl2ZWRN ZXNzYWdlcy5nZXQoKVsxXSBoYXNQcmVmaXg6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5o dG1sIl0pIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3Jn L21haW4uaHRtbCAtIHVubG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0pOworICAgICAg ICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBsb2Fk IiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgRVhQ RUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gbG9hZCIsIHJl Y2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29u Oi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gdW5sb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5n ZXQoKVsyXSk7CisgICAgfQorICAgIGlmIChbcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSBoYXNQ cmVmaXg6QCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwiXSkgeworICAgICAgICBFWFBF Q1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSB1bmxvYWQiLCBy ZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNv bjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIGxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdl dCgpWzRdKTsKKyAgICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8v d3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gbG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClb M10pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWlu Lmh0bWwgLSB1bmxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKKyAgICB9CisgICAg aWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdIGhhc1ByZWZpeDpAInBzb246Ly93d3cud2Vi a2l0Lm9yZy9tYWluLmh0bWwiXSkgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8v d3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gdW5sb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQo KVs1XSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21h aW4uaHRtbCAtIGxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAgICB9IGVsc2Ug eworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0 bWwgLSBsb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7CisgICAgICAgIEVYUEVDVF9X S19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSB1bmxvYWQiLCByZWNl aXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAgICB9CiB9CiAKIFRFU1QoUHJvY2Vzc1N3YXAsIFdl Ykluc3BlY3RvcikKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwppbmRleCAwNGE4Njg2NmVhNjAwZDIwMTAyOTFhYmZiYjk0YjM3MjFkNTlk YTU0Li45ZjI3OGVhOGRlOTdmZWYwZTM2YmJjNjVjYTBjMDUwYTlhODk2MGE1IDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTcgQEAKKzIwMTktMDEtMTUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4K KworICAgICAgICBSZWdyZXNzaW9uKFBTT04pIFZpZXcgYmVjb21lcyBibGFuayBhZnRlciBjbGlj ayBhIGNyb3NzLXNpdGUgZG93bmxvYWQgbGluaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzMzYxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NzA5 OTU3Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZiBHYXJlbi4KKworICAgICAgICBTa2lw IHRlc3QgdGVzdGluZyB0aGUgY3Jvc3MtcHJvY2VzcyBET01XaW5kb3cgQVBJIGFzIEkgYnJva2Ug aXQgd2l0aCB0aGlzIHBhdGNoLgorICAgICAgICBUaGUgZmVhdHVyZSBpcyBmYXIgZnJvbSByZWFk eSBhbmQgb2ZmIGJ5IGRlZmF1bHQgYW55d2F5LiBJIHdpbGwgYWRkIHN1cHBvcnQgYmFjaworICAg ICAgICBpbiBhIGZvbGxvdy11cC4KKworICAgICAgICAqIHBsYXRmb3JtL3drMi9UZXN0RXhwZWN0 YXRpb25zOgorCiAyMDE5LTAxLTE1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBdWRpdDogcHJvdmlkZSBhIHdheSB0byBkZXRlcm1p bmUgd2hldGhlciBhIGdpdmUgbm9kZSBoYXMgZXZlbnQgbGlzdGVuZXJzCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDhlOTU5ZWRhZmZkODkyN2VmOWMyYWFj MzE2ZTllMzEwMGNkMTQwY2IuLjlkOTBiZThiNDhlNTdjOTYwYmNkYTY4NmNlMjQ0MGQ3MTM4YmIw ZjYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25z CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zCkBAIC03MzMs OCArNzMzLDggQEAgaHR0cC90ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL3JlbW92ZS1ibG9j a2luZy1pbi1yZWRpcmVjdC5odG1sIFsgU2tpcCBdCiBodHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0 YXRpc3RpY3Mvbm9uLXByZXZhbGVudC1yZXNvdXJjZXMtY2FuLWFjY2Vzcy1jb29raWVzLWluLWEt dGhpcmQtcGFydHktY29udGV4dC5odG1sIFsgU2tpcCBdCiBodHRwL3Rlc3RzL3Jlc291cmNlTG9h ZFN0YXRpc3RpY3MvY2FwLWNhY2hlLW1heC1hZ2UtZm9yLXByZXZhbGVudC1yZXNvdXJjZS5odG1s IFsgU2tpcCBdCiAKLSMgUHJvY2VzcyBzd2FwcGluZyBpcyBvbmx5IGltcGxlbWVudGVkIG9uIFdl YktpdDIuCi1odHRwL3Rlc3RzL25hdmlnYXRpb24vcHJvY2Vzcy1zd2FwLXdpbmRvdy1vcGVuLmh0 bWwgWyBQYXNzIF0KKyMgVGhpcyBmZWF0dXJlIGlzIGN1cnJlbnRseSBkaXNhYmxlZCBieSBkZWZh dWx0IGFuZCB1bmZpbmlzaGVkIDxyZGFyOi8vcHJvYmxlbS8zODkyNTA3Nz4uCitodHRwL3Rlc3Rz L25hdmlnYXRpb24vcHJvY2Vzcy1zd2FwLXdpbmRvdy1vcGVuLmh0bWwgWyBTa2lwIF0KIAogIyBD cm9zcy1PcmlnaW4tUmVzb3VyY2UtUG9saWN5IHJlc3BvbnNlIGhlYWRlciBpcyBvbmx5IGltcGxl bWVudGVkIGluIFdlYktpdDIuCiBodHRwL3dwdC9jcm9zcy1vcmlnaW4tcmVzb3VyY2UtcG9saWN5 LyBbIFBhc3MgXQo= 359256 2019-01-15 22:00:15 -0800 2019-01-16 09:13:45 -0800 WIP Patch 193361_pson_provisional_page2_wip.patch text/plain 168968 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggOGU5NTllZGFm ZmQuLjlkOTBiZThiNDhlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVz dEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0 aW9ucwpAQCAtNzMzLDggKzczMyw4IEBAIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGlj cy9yZW1vdmUtYmxvY2tpbmctaW4tcmVkaXJlY3QuaHRtbCBbIFNraXAgXQogaHR0cC90ZXN0cy9y ZXNvdXJjZUxvYWRTdGF0aXN0aWNzL25vbi1wcmV2YWxlbnQtcmVzb3VyY2VzLWNhbi1hY2Nlc3Mt Y29va2llcy1pbi1hLXRoaXJkLXBhcnR5LWNvbnRleHQuaHRtbCBbIFNraXAgXQogaHR0cC90ZXN0 cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL2NhcC1jYWNoZS1tYXgtYWdlLWZvci1wcmV2YWxlbnQt cmVzb3VyY2UuaHRtbCBbIFNraXAgXQogCi0jIFByb2Nlc3Mgc3dhcHBpbmcgaXMgb25seSBpbXBs ZW1lbnRlZCBvbiBXZWJLaXQyLgotaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3Byb2Nlc3Mtc3dhcC13 aW5kb3ctb3Blbi5odG1sIFsgUGFzcyBdCisjIFRoaXMgZmVhdHVyZSBpcyBjdXJyZW50bHkgZGlz YWJsZWQgYnkgZGVmYXVsdCBhbmQgdW5maW5pc2hlZCA8cmRhcjovL3Byb2JsZW0vMzg5MjUwNzc+ LgoraHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3Byb2Nlc3Mtc3dhcC13aW5kb3ctb3Blbi5odG1sIFsg U2tpcCBdCiAKICMgQ3Jvc3MtT3JpZ2luLVJlc291cmNlLVBvbGljeSByZXNwb25zZSBoZWFkZXIg aXMgb25seSBpbXBsZW1lbnRlZCBpbiBXZWJLaXQyLgogaHR0cC93cHQvY3Jvc3Mtb3JpZ2luLXJl c291cmNlLXBvbGljeS8gWyBQYXNzIF0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw CmluZGV4IDRjMjZhNjk4MWI0Li5lYmY5NTBiYTZjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuY3BwCkBAIC0yMDMyLDExICsyMDMyLDExIEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNv bW1pdFByb3Zpc2lvbmFsTG9hZCgpCiAKICAgICAgICAgT3B0aW9uYWw8SGFzSW5zZWN1cmVDb250 ZW50PiBoYXNJbnNlY3VyZUNvbnRlbnQgPSBjYWNoZWRQYWdlLT5jYWNoZWRNYWluRnJhbWUoKS0+ aGFzSW5zZWN1cmVDb250ZW50KCk7CiAKKyAgICAgICAgZGlzcGF0Y2hEaWRDb21taXRMb2FkKGhh c0luc2VjdXJlQ29udGVudCk7CisKICAgICAgICAgLy8gRklYTUU6IFRoaXMgQVBJIHNob3VsZCBi ZSB0dXJuZWQgYXJvdW5kIHNvIHRoYXQgd2UgZ3JvdW5kIENhY2hlZFBhZ2UgaW50byB0aGUgUGFn ZS4KICAgICAgICAgY2FjaGVkUGFnZS0+cmVzdG9yZSgqbV9mcmFtZS5wYWdlKCkpOwogCi0gICAg ICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOwotCiAjaWYgUExB VEZPUk0oSU9TX0ZBTUlMWSkKICAgICAgICAgbV9mcmFtZS5wYWdlKCktPmNocm9tZSgpLnNldERp c3BhdGNoVmlld3BvcnREYXRhRGlkQ2hhbmdlU3VwcHJlc3NlZChmYWxzZSk7CiAgICAgICAgIG1f ZnJhbWUucGFnZSgpLT5jaHJvbWUoKS5kaXNwYXRjaFZpZXdwb3J0UHJvcGVydGllc0RpZENoYW5n ZShtX2ZyYW1lLnBhZ2UoKS0+dmlld3BvcnRBcmd1bWVudHMoKSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcCBiL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCmluZGV4IGNhMmRmNDBl ZTFkLi42ZDA3YzAzYWQ4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKQEAgLTczLDcgKzczLDcgQEAgdm9pZCBXZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzOjplbmNvZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAg IGVuY29kZXIuZW5jb2RlRW51bShsYXllckhvc3RpbmdNb2RlKTsKICAgICBlbmNvZGVyIDw8IG1p bWVUeXBlc1dpdGhDdXN0b21Db250ZW50UHJvdmlkZXJzOwogICAgIGVuY29kZXIgPDwgY29udHJv bGxlZEJ5QXV0b21hdGlvbjsKLSAgICBlbmNvZGVyIDw8IGlzU3dhcEZyb21TdXNwZW5kZWQ7Cisg ICAgZW5jb2RlciA8PCBpc1Byb2Nlc3NTd2FwOwogCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIGVu Y29kZXIgPDwgY29sb3JTcGFjZTsKQEAgLTIyNyw3ICsyMjcsNyBAQCBPcHRpb25hbDxXZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzPiBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoSVBD OjpEZWNvZAogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogICAgIGlmICghZGVjb2Rlci5k ZWNvZGUocGFyYW1ldGVycy5jb250cm9sbGVkQnlBdXRvbWF0aW9uKSkKICAgICAgICAgcmV0dXJu IFdURjo6bnVsbG9wdDsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuaXNTd2Fw RnJvbVN1c3BlbmRlZCkpCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmlzUHJv Y2Vzc1N3YXApKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAjaWYgUExBVEZPUk0o TUFDKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVycy5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVy cy5oCmluZGV4IGFlNDMyNWNiZDVmLi5iMzgyY2VlZGQ0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaApAQCAtMTI5LDcgKzEyOSw3IEBA IHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICAgICBWZWN0b3I8U3RyaW5nPiBt aW1lVHlwZXNXaXRoQ3VzdG9tQ29udGVudFByb3ZpZGVyczsKIAogICAgIGJvb2wgY29udHJvbGxl ZEJ5QXV0b21hdGlvbjsKLSAgICBib29sIGlzU3dhcEZyb21TdXNwZW5kZWQgeyBmYWxzZSB9Owor ICAgIGJvb2wgaXNQcm9jZXNzU3dhcCB7IGZhbHNlIH07CiAKICNpZiBQTEFURk9STShNQUMpCiAg ICAgQ29sb3JTcGFjZURhdGEgY29sb3JTcGFjZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv U2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5 QWN0aW9uLmgKaW5kZXggMTQyYTUxOGRmMDkuLjM5NzE3OTVjNDZhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQb2xpY3lBY3Rpb24uaApAQCAtMjksMTEgKzI5LDExIEBACiAKIG5hbWVzcGFjZSBX ZWJLaXQgewogCisvLyBGSVhNRTogUmVtb3ZlIHRoaXMgdHlwZSBhbmQgdXNlIFdlYkNvcmU6OlBv bGljeUFjdGlvbiBpbnN0ZWFkLgogZW51bSBjbGFzcyBXZWJQb2xpY3lBY3Rpb24gOiB1aW50OF90 IHsKICAgICBVc2UsCiAgICAgRG93bmxvYWQsCi0gICAgSWdub3JlLAotICAgIFN1c3BlbmQKKyAg ICBJZ25vcmUKIH07CiAKIH0KQEAgLTQ1LDggKzQ1LDcgQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgRW51 bVRyYWl0czxXZWJLaXQ6OldlYlBvbGljeUFjdGlvbj4gewogICAgICAgICBXZWJLaXQ6OldlYlBv bGljeUFjdGlvbiwKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OlVzZSwKICAgICAg ICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OkRvd25sb2FkLAotICAgICAgICBXZWJLaXQ6Oldl YlBvbGljeUFjdGlvbjo6SWdub3JlLAotICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6 U3VzcGVuZAorICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6SWdub3JlCiAgICAgPjsK IH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQgYi9Tb3VyY2UvV2Vi S2l0L1NvdXJjZXMudHh0CmluZGV4IDM0MGU3YmYyNjE4Li40ZGUwYzZmZWZlOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9Tb3VyY2VzLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMu dHh0CkBAIC0yMzAsNiArMjMwLDcgQEAgVUlQcm9jZXNzL0luc3BlY3RvclRhcmdldFByb3h5LmNw cAogVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuY3BwCiBVSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlv bi5jcHAKIFVJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNwcAorVUlQcm9jZXNzL1Byb3Zpc2lv bmFsUGFnZVByb3h5LmNwcAogVUlQcm9jZXNzL1JlbW90ZVdlYkluc3BlY3RvclByb3h5LmNwcAog VUlQcm9jZXNzL1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwCiBVSVByb2Nlc3MvU2VydmljZVdvcmtl clByb2Nlc3NQcm94eS5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tCmluZGV4IDA3NGNkZGZkMjc4Li40ZGZhZDY0ZTAxNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC00NCw2ICs0NCw3 IEBACiAjaW1wb3J0ICJOYXZpZ2F0aW9uU3RhdGUuaCIKICNpbXBvcnQgIk9iakNPYmplY3RHcmFw aC5oIgogI2ltcG9ydCAiUGFnZUNsaWVudC5oIgorI2ltcG9ydCAiUHJvdmlzaW9uYWxQYWdlUHJv eHkuaCIKICNpbXBvcnQgIlJlbW90ZUxheWVyVHJlZVNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YS5o IgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24uaCIKICNpbXBvcnQgIlJlbW90 ZU9iamVjdFJlZ2lzdHJ5LmgiCkBAIC00NzAwLDYgKzQ3MDEsMTEgQEAgLSAodm9pZClfa2lsbFdl YkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRTdGF0ZQogewogICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nl c3NQcm94eT4gcHJvdGVjdGVkUHJvY2Vzc1Byb3h5KF9wYWdlLT5wcm9jZXNzKCkpOwogICAgIHBy b3RlY3RlZFByb2Nlc3NQcm94eS0+cmVxdWVzdFRlcm1pbmF0aW9uKFdlYktpdDo6UHJvY2Vzc1Rl cm1pbmF0aW9uUmVhc29uOjpSZXF1ZXN0ZWRCeUNsaWVudCk7CisKKyAgICBpZiAoYXV0byogcHJv dmlzaW9uYWxQYWdlUHJveHkgPSBfcGFnZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKSkgeworICAg ICAgICBSZWY8V2ViS2l0OjpXZWJQcm9jZXNzUHJveHk+IHByb3RlY3RlZFByb2Nlc3NQcm94eShw cm92aXNpb25hbFBhZ2VQcm94eS0+cHJvY2VzcygpKTsKKyAgICAgICAgcHJvdGVjdGVkUHJvY2Vz c1Byb3h5LT5yZXF1ZXN0VGVybWluYXRpb24oV2ViS2l0OjpQcm9jZXNzVGVybWluYXRpb25SZWFz b246OlJlcXVlc3RlZEJ5Q2xpZW50KTsKKyAgICB9CiB9CiAKICNpZiBQTEFURk9STShNQUMpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BY2NlbGVyYXRlZERyYXdpbmdBcmVh UHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQWNjZWxlcmF0ZWREcmF3aW5nQXJl YVByb3h5LmNwcAppbmRleCBlYzg0NmIzN2E0YS4uMzlhZjliMzc5OGIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5LmNw cApAQCAtNDUsOCArNDUsOCBAQAogbmFtZXNwYWNlIFdlYktpdCB7CiB1c2luZyBuYW1lc3BhY2Ug V2ViQ29yZTsKIAotQWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5OjpBY2NlbGVyYXRlZERyYXdp bmdBcmVhUHJveHkoV2ViUGFnZVByb3h5JiB3ZWJQYWdlUHJveHkpCi0gICAgOiBEcmF3aW5nQXJl YVByb3h5KERyYXdpbmdBcmVhVHlwZUltcGwsIHdlYlBhZ2VQcm94eSkKK0FjY2VsZXJhdGVkRHJh d2luZ0FyZWFQcm94eTo6QWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5KFdlYlBhZ2VQcm94eSYg d2ViUGFnZVByb3h5LCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MpCisgICAgOiBEcmF3aW5nQXJl YVByb3h5KERyYXdpbmdBcmVhVHlwZUltcGwsIHdlYlBhZ2VQcm94eSwgcHJvY2VzcykKIHsKIH0K IApAQCAtMTA2LDcgKzEwNiw3IEBAIHZvaWQgQWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5Ojpk aWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSh1aW50NjRfdCBiYWNraW5nU3RvCiAgICAgbV9pc1dh aXRpbmdGb3JEaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSA9IGZhbHNlOwogCiAgICAgLy8gU3Rv cCB0aGUgcmVzcG9uc2l2ZW5lc3MgdGltZXIgdGhhdCB3YXMgc3RhcnRlZCBpbiBzZW5kVXBkYXRl QmFja2luZ1N0b3JlU3RhdGUuCi0gICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnJlc3BvbnNp dmVuZXNzVGltZXIoKS5zdG9wKCk7CisgICAgcHJvY2VzcygpLnJlc3BvbnNpdmVuZXNzVGltZXIo KS5zdG9wKCk7CiAKICAgICBpZiAobGF5ZXJUcmVlQ29udGV4dCAhPSBtX2xheWVyVHJlZUNvbnRl eHQpIHsKICAgICAgICAgaWYgKGxheWVyVHJlZUNvbnRleHQuaXNFbXB0eSgpICYmICFtX2xheWVy VHJlZUNvbnRleHQuaXNFbXB0eSgpKSB7CkBAIC0xODMsMTMgKzE4MywxMyBAQCB2b2lkIEFjY2Vs ZXJhdGVkRHJhd2luZ0FyZWFQcm94eTo6c2VuZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKFJlc3Bv bmRJbW1lZGlhdGVseQogCiAgICAgbV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVCYWNraW5nU3RvcmVT dGF0ZSA9IHJlc3BvbmRJbW1lZGlhdGVseU9yTm90ID09IFJlc3BvbmRJbW1lZGlhdGVseTsKIAot ICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6 VXBkYXRlQmFja2luZ1N0b3JlU3RhdGUobV9uZXh0QmFja2luZ1N0b3JlU3RhdGVJRCwgcmVzcG9u ZEltbWVkaWF0ZWx5T3JOb3QgPT0gUmVzcG9uZEltbWVkaWF0ZWx5LCBtX3dlYlBhZ2VQcm94eS5k ZXZpY2VTY2FsZUZhY3RvcigpLCBtX3NpemUsIG1fc2Nyb2xsT2Zmc2V0KSwgbV93ZWJQYWdlUHJv eHkucGFnZUlEKCkpOworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6 VXBkYXRlQmFja2luZ1N0b3JlU3RhdGUobV9uZXh0QmFja2luZ1N0b3JlU3RhdGVJRCwgcmVzcG9u ZEltbWVkaWF0ZWx5T3JOb3QgPT0gUmVzcG9uZEltbWVkaWF0ZWx5LCBtX3dlYlBhZ2VQcm94eS5k ZXZpY2VTY2FsZUZhY3RvcigpLCBtX3NpemUsIG1fc2Nyb2xsT2Zmc2V0KSwgbV93ZWJQYWdlUHJv eHkucGFnZUlEKCkpOwogICAgIG1fc2Nyb2xsT2Zmc2V0ID0gSW50U2l6ZSgpOwogCiAgICAgaWYg KG1faXNXYWl0aW5nRm9yRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUpIHsKICAgICAgICAgLy8g U3RhcnQgdGhlIHJlc3BvbnNpdmVuZXNzIHRpbWVyLiBXZSB3aWxsIHN0b3AgaXQgd2hlbiB3ZSBo ZWFyIGJhY2sgZnJvbSB0aGUgV2ViUHJvY2VzcwogICAgICAgICAvLyBpbiBkaWRVcGRhdGVCYWNr aW5nU3RvcmVTdGF0ZS4KLSAgICAgICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnJlc3BvbnNp dmVuZXNzVGltZXIoKS5zdGFydCgpOworICAgICAgICBwcm9jZXNzKCkucmVzcG9uc2l2ZW5lc3NU aW1lcigpLnN0YXJ0KCk7CiAgICAgfQogCiAgICAgaWYgKG1faXNXYWl0aW5nRm9yRGlkVXBkYXRl QmFja2luZ1N0b3JlU3RhdGUgJiYgIW1fbGF5ZXJUcmVlQ29udGV4dC5pc0VtcHR5KCkpIHsKQEAg LTIwNSw3ICsyMDUsNyBAQCB2b2lkIEFjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eTo6d2FpdEZv ckFuZERpc3BhdGNoRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUoKQogCiAgICAgaWYgKCFtX3dl YlBhZ2VQcm94eS5pc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKLSAgICBpZiAobV93ZWJQYWdl UHJveHkucHJvY2VzcygpLnN0YXRlKCkgPT0gV2ViUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6TGF1bmNo aW5nKQorICAgIGlmIChwcm9jZXNzKCkuc3RhdGUoKSA9PSBXZWJQcm9jZXNzUHJveHk6OlN0YXRl OjpMYXVuY2hpbmcpCiAgICAgICAgIHJldHVybjsKICAgICBpZiAoIW1fd2ViUGFnZVByb3h5Lmlz Vmlld1Zpc2libGUoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMjIyLDcgKzIyMiw3IEBAIHZvaWQg QWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5Ojp3YWl0Rm9yQW5kRGlzcGF0Y2hEaWRVcGRhdGVC YWNraW5nU3RvcmVTdGF0ZSgpCiAgICAgLy8gY2hvb3NlIHRoZSBtb3N0IHJlY2VudCBvbmUsIG9y IHRoZSBvbmUgdGhhdCBpcyBjbG9zZXN0IHRvIG91ciBjdXJyZW50IHNpemUuCiAKICAgICAvLyBU aGUgdGltZW91dCwgaW4gc2Vjb25kcywgd2UgdXNlIHdoZW4gd2FpdGluZyBmb3IgYSBEaWRVcGRh dGVCYWNraW5nU3RvcmVTdGF0ZSBtZXNzYWdlIHdoZW4gd2UncmUgYXNrZWQgdG8gcGFpbnQuCi0g ICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLmNvbm5lY3Rpb24oKS0+d2FpdEZvckFuZERpc3Bh dGNoSW1tZWRpYXRlbHk8TWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJveHk6OkRpZFVwZGF0ZUJhY2tp bmdTdG9yZVN0YXRlPihtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSwgU2Vjb25kczo6ZnJvbU1pbGxp c2Vjb25kcyg1MDApKTsKKyAgICBwcm9jZXNzKCkuY29ubmVjdGlvbigpLT53YWl0Rm9yQW5kRGlz cGF0Y2hJbW1lZGlhdGVseTxNZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94eTo6RGlkVXBkYXRlQmFj a2luZ1N0b3JlU3RhdGU+KG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpLCBTZWNvbmRzOjpmcm9tTWls bGlzZWNvbmRzKDUwMCkpOwogfQogCiB2b2lkIEFjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eTo6 ZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShjb25zdCBMYXllclRyZWVDb250ZXh0JiBs YXllclRyZWVDb250ZXh0KQpAQCAtMjU2LDcgKzI1Niw3IEBAIHZvaWQgQWNjZWxlcmF0ZWREcmF3 aW5nQXJlYVByb3h5OjpzZXROYXRpdmVTdXJmYWNlSGFuZGxlRm9yQ29tcG9zaXRpbmcodWludDY0 X3QKICAgICAgICAgbV9wZW5kaW5nTmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nID0g aGFuZGxlOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIG1fd2ViUGFnZVByb3h5LnByb2Nl c3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6U2V0TmF0aXZlU3VyZmFjZUhhbmRsZUZv ckNvbXBvc2l0aW5nKGhhbmRsZSksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpLCBJUEM6OlNlbmRP cHRpb246OkRpc3BhdGNoTWVzc2FnZUV2ZW5XaGVuV2FpdGluZ0ZvclN5bmNSZXBseSk7CisgICAg cHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpTZXROYXRpdmVTdXJmYWNlSGFu ZGxlRm9yQ29tcG9zaXRpbmcoaGFuZGxlKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCksIElQQzo6 U2VuZE9wdGlvbjo6RGlzcGF0Y2hNZXNzYWdlRXZlbldoZW5XYWl0aW5nRm9yU3luY1JlcGx5KTsK IH0KIAogdm9pZCBBY2NlbGVyYXRlZERyYXdpbmdBcmVhUHJveHk6OmRlc3Ryb3lOYXRpdmVTdXJm YWNlSGFuZGxlRm9yQ29tcG9zaXRpbmcoKQpAQCAtMjY2LDcgKzI2Niw3IEBAIHZvaWQgQWNjZWxl cmF0ZWREcmF3aW5nQXJlYVByb3h5OjpkZXN0cm95TmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBv c2l0aW5nKCkKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBib29sIGhhbmRsZWQ7Ci0gICAg bV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnNlbmRTeW5jKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6 RGVzdHJveU5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZygpLCBNZXNzYWdlczo6RHJh d2luZ0FyZWE6OkRlc3Ryb3lOYXRpdmVTdXJmYWNlSGFuZGxlRm9yQ29tcG9zaXRpbmc6OlJlcGx5 KGhhbmRsZWQpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CisgICAgcHJvY2VzcygpLnNlbmRT eW5jKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6RGVzdHJveU5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JD b21wb3NpdGluZygpLCBNZXNzYWdlczo6RHJhd2luZ0FyZWE6OkRlc3Ryb3lOYXRpdmVTdXJmYWNl SGFuZGxlRm9yQ29tcG9zaXRpbmc6OlJlcGx5KGhhbmRsZWQpLCBtX3dlYlBhZ2VQcm94eS5wYWdl SUQoKSk7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B Y2NlbGVyYXRlZERyYXdpbmdBcmVhUHJveHkuaAppbmRleCA3NjgzYzNmMjRhNi4uYzM4YTliYjEy YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FjY2VsZXJhdGVkRHJhd2lu Z0FyZWFQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FjY2VsZXJhdGVkRHJh d2luZ0FyZWFQcm94eS5oCkBAIC0zNCw3ICszNCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBj bGFzcyBBY2NlbGVyYXRlZERyYXdpbmdBcmVhUHJveHkgOiBwdWJsaWMgRHJhd2luZ0FyZWFQcm94 eSB7CiBwdWJsaWM6Ci0gICAgZXhwbGljaXQgQWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5KFdl YlBhZ2VQcm94eSYpOworICAgIEFjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eShXZWJQYWdlUHJv eHkmLCBXZWJQcm9jZXNzUHJveHkmKTsKICAgICB2aXJ0dWFsIH5BY2NlbGVyYXRlZERyYXdpbmdB cmVhUHJveHkoKTsKIAogICAgIGJvb2wgaXNJbkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkg Y29uc3QgeyByZXR1cm4gYWx3YXlzVXNlQ29tcG9zaXRpbmcoKSB8fCAhbV9sYXllclRyZWVDb250 ZXh0LmlzRW1wdHkoKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29j b2EvV2ViUGFnZVByb3h5Q29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9X ZWJQYWdlUHJveHlDb2NvYS5tbQppbmRleCA4M2Y1ZThmZmZkZC4uMzU0ZjVhZjNhMTIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlBhZ2VQcm94eUNvY29hLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlBhZ2VQcm94eUNvY29hLm1t CkBAIC0xMjEsNyArMTIxLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNyZWF0ZVNhbmRib3hFeHRl bnNpb25zSWZOZWVkZWQoY29uc3QgVmVjdG9yPFN0cmluZz4mIGZpbGVzLAogICAgICAgICBCT09M IGlzRGlyZWN0b3J5OwogICAgICAgICBpZiAoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2Vy XSBmaWxlRXhpc3RzQXRQYXRoOmZpbGVzWzBdIGlzRGlyZWN0b3J5OiZpc0RpcmVjdG9yeV0gJiYg IWlzRGlyZWN0b3J5KSB7CiAgICAgICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5k bGUoIi8iLCBTYW5kYm94RXh0ZW5zaW9uOjpUeXBlOjpSZWFkT25seSwgZmlsZVJlYWRIYW5kbGUp OwotICAgICAgICAgICAgd2lsbEFjcXVpcmVVbml2ZXJzYWxGaWxlUmVhZFNhbmRib3hFeHRlbnNp b24oKTsKKyAgICAgICAgICAgIHdpbGxBY3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0 ZW5zaW9uKG1fcHJvY2Vzcyk7CiAgICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCmluZGV4IGM2OGRiY2M3Y2VhLi41YjIxMzhkZjMw NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwu aAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCkBAIC0x OTcsNyArMTk3LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Rml4ZWRMYXlvdXRTaXplKENHU2l6 ZSk7CiAgICAgQ0dTaXplIGZpeGVkTGF5b3V0U2l6ZSgpIGNvbnN0OwogCi0gICAgc3RkOjp1bmlx dWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKKyAgICBz dGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJhd2luZ0FyZWFQcm94eShX ZWJQcm9jZXNzUHJveHkmKTsKICAgICBib29sIGlzVXNpbmdVSVNpZGVDb21wb3NpdGluZygpIGNv bnN0OwogICAgIHZvaWQgc2V0RHJhd2luZ0FyZWFTaXplKENHU2l6ZSk7CiAgICAgdm9pZCB1cGRh dGVMYXllcigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2Vi Vmlld0ltcGwubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5t bQppbmRleCBkNTFlZjVkOWZlMS4uNWRkMTUzNTVjYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCkBAIC0xNzI1LDEyICsxNzI1LDEyIEBAIENHU2l6 ZSBXZWJWaWV3SW1wbDo6Zml4ZWRMYXlvdXRTaXplKCkgY29uc3QKICAgICByZXR1cm4gbV9wYWdl LT5maXhlZExheW91dFNpemUoKTsKIH0KIAotc3RkOjp1bmlxdWVfcHRyPFdlYktpdDo6RHJhd2lu Z0FyZWFQcm94eT4gV2ViVmlld0ltcGw6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKQorc3RkOjp1 bmlxdWVfcHRyPFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eT4gV2ViVmlld0ltcGw6OmNyZWF0ZURy YXdpbmdBcmVhUHJveHkoV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKQogewogICAgIGlmIChbW1tO U1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gb2JqZWN0Rm9yS2V5OkAiV2ViS2l0 MlVzZVJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhIl0gYm9vbFZhbHVlXSkKLSAgICAgICAgcmV0 dXJuIHN0ZDo6bWFrZV91bmlxdWU8UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eT4obV9w YWdlKTsKKyAgICAgICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8UmVtb3RlTGF5ZXJUcmVlRHJh d2luZ0FyZWFQcm94eT4obV9wYWdlLCBwcm9jZXNzKTsKIAotICAgIHJldHVybiBzdGQ6Om1ha2Vf dW5pcXVlPFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk+KG1fcGFnZSk7CisgICAg cmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94 eT4obV9wYWdlLCBwcm9jZXNzKTsKIH0KIAogYm9vbCBXZWJWaWV3SW1wbDo6aXNVc2luZ1VJU2lk ZUNvbXBvc2l0aW5nKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0RyYXdpbmdBcmVhUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvRHJhd2luZ0Fy ZWFQcm94eS5jcHAKaW5kZXggNzk1NjhkZjE2N2UuLmQzNmJjNDZmZTY5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmNwcApAQCAtMzgsMjAgKzM4LDIxIEBA CiBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCi1EcmF3aW5n QXJlYVByb3h5OjpEcmF3aW5nQXJlYVByb3h5KERyYXdpbmdBcmVhVHlwZSB0eXBlLCBXZWJQYWdl UHJveHkmIHdlYlBhZ2VQcm94eSkKK0RyYXdpbmdBcmVhUHJveHk6OkRyYXdpbmdBcmVhUHJveHko RHJhd2luZ0FyZWFUeXBlIHR5cGUsIFdlYlBhZ2VQcm94eSYgd2ViUGFnZVByb3h5LCBXZWJQcm9j ZXNzUHJveHkmIHByb2Nlc3MpCiAgICAgOiBtX3R5cGUodHlwZSkKICAgICAsIG1fd2ViUGFnZVBy b3h5KHdlYlBhZ2VQcm94eSkKKyAgICAsIG1fcHJvY2VzcyhtYWtlUmVmKHByb2Nlc3MpKQogICAg ICwgbV9zaXplKHdlYlBhZ2VQcm94eS52aWV3U2l6ZSgpKQogI2lmIFBMQVRGT1JNKE1BQykKICAg ICAsIG1fdmlld0V4cG9zZWRSZWN0Q2hhbmdlZFRpbWVyKFJ1bkxvb3A6Om1haW4oKSwgdGhpcywg JkRyYXdpbmdBcmVhUHJveHk6OnZpZXdFeHBvc2VkUmVjdENoYW5nZWRUaW1lckZpcmVkKQogI2Vu ZGlmCiB7Ci0gICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLmFkZE1lc3NhZ2VSZWNlaXZlcihN ZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3dlYlBh Z2VQcm94eS5wYWdlSUQoKSwgKnRoaXMpOworICAgIHByb2Nlc3MuYWRkTWVzc2FnZVJlY2VpdmVy KE1lc3NhZ2VzOjpEcmF3aW5nQXJlYVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fd2Vi UGFnZVByb3h5LnBhZ2VJRCgpLCAqdGhpcyk7CiB9CiAKIERyYXdpbmdBcmVhUHJveHk6On5EcmF3 aW5nQXJlYVByb3h5KCkKIHsKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkucmVtb3ZlTWVz c2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYVByb3h5OjptZXNzYWdlUmVjZWl2ZXJO YW1lKCksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKKyAgICBwcm9jZXNzKCkucmVtb3ZlTWVz c2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYVByb3h5OjptZXNzYWdlUmVjZWl2ZXJO YW1lKCksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKIH0KIAogYm9vbCBEcmF3aW5nQXJlYVBy b3h5OjpzZXRTaXplKGNvbnN0IEludFNpemUmIHNpemUsIGNvbnN0IEludFNpemUmIHNjcm9sbERl bHRhKQpAQCAtOTIsNyArOTMsNyBAQCB2b2lkIERyYXdpbmdBcmVhUHJveHk6OnZpZXdFeHBvc2Vk UmVjdENoYW5nZWRUaW1lckZpcmVkKCkKICAgICBpZiAobV92aWV3RXhwb3NlZFJlY3QgPT0gbV9s YXN0U2VudFZpZXdFeHBvc2VkUmVjdCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV93ZWJQYWdl UHJveHkucHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpTZXRWaWV3RXhwb3Nl ZFJlY3QobV92aWV3RXhwb3NlZFJlY3QpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CisgICAg cHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpTZXRWaWV3RXhwb3NlZFJlY3Qo bV92aWV3RXhwb3NlZFJlY3QpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CiAgICAgbV9sYXN0 U2VudFZpZXdFeHBvc2VkUmVjdCA9IG1fdmlld0V4cG9zZWRSZWN0OwogfQogI2VuZGlmIC8vIFBM QVRGT1JNKE1BQykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdpbmdB cmVhUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaApp bmRleCA4NmZiMTNkOTc2NC4uMzQxOWE4OWU4ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9EcmF3aW5nQXJlYVByb3h5LmgKQEAgLTQ4LDYgKzQ4LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7 CiBjbGFzcyBMYXllclRyZWVDb250ZXh0OwogY2xhc3MgVXBkYXRlSW5mbzsKIGNsYXNzIFdlYlBh Z2VQcm94eTsKK2NsYXNzIFdlYlByb2Nlc3NQcm94eTsKIAogY2xhc3MgRHJhd2luZ0FyZWFQcm94 eSA6IHB1YmxpYyBJUEM6Ok1lc3NhZ2VSZWNlaXZlciB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFC TEUoRHJhd2luZ0FyZWFQcm94eSk7CkBAIC0xMDcsMTIgKzEwOCwxNCBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCB2b2lkIGRpc3BhdGNoUHJlc2VudGF0aW9uQ2FsbGJhY2tzQWZ0ZXJGbHVzaGluZ0xh eWVycyhjb25zdCBWZWN0b3I8Q2FsbGJhY2tJRD4mKSB7IH0KIAogICAgIFdlYlBhZ2VQcm94eSYg cGFnZSgpIGNvbnN0IHsgcmV0dXJuIG1fd2ViUGFnZVByb3h5OyB9CisgICAgV2ViUHJvY2Vzc1By b3h5JiBwcm9jZXNzKCkgeyByZXR1cm4gbV9wcm9jZXNzLmdldCgpOyB9CiAKIHByb3RlY3RlZDoK LSAgICBleHBsaWNpdCBEcmF3aW5nQXJlYVByb3h5KERyYXdpbmdBcmVhVHlwZSwgV2ViUGFnZVBy b3h5Jik7CisgICAgRHJhd2luZ0FyZWFQcm94eShEcmF3aW5nQXJlYVR5cGUsIFdlYlBhZ2VQcm94 eSYsIFdlYlByb2Nlc3NQcm94eSYpOwogCiAgICAgRHJhd2luZ0FyZWFUeXBlIG1fdHlwZTsKICAg ICBXZWJQYWdlUHJveHkmIG1fd2ViUGFnZVByb3h5OworICAgIFJlZjxXZWJQcm9jZXNzUHJveHk+ IG1fcHJvY2VzczsKIAogICAgIFdlYkNvcmU6OkludFNpemUgbV9zaXplOwogICAgIFdlYkNvcmU6 OkludFNpemUgbV9zY3JvbGxPZmZzZXQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9E cmF3aW5nQXJlYVByb3h5SW1wbC5jcHAKaW5kZXggOTA3MGI1YWZiNWEuLjhjNmNlOGQ2NTg4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3Bw CkBAIC00Nyw4ICs0Nyw4IEBACiBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBX ZWJDb3JlOwogCi1EcmF3aW5nQXJlYVByb3h5SW1wbDo6RHJhd2luZ0FyZWFQcm94eUltcGwoV2Vi UGFnZVByb3h5JiB3ZWJQYWdlUHJveHkpCi0gICAgOiBBY2NlbGVyYXRlZERyYXdpbmdBcmVhUHJv eHkod2ViUGFnZVByb3h5KQorRHJhd2luZ0FyZWFQcm94eUltcGw6OkRyYXdpbmdBcmVhUHJveHlJ bXBsKFdlYlBhZ2VQcm94eSYgd2ViUGFnZVByb3h5LCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3Mp CisgICAgOiBBY2NlbGVyYXRlZERyYXdpbmdBcmVhUHJveHkod2ViUGFnZVByb3h5LCBwcm9jZXNz KQogICAgICwgbV9kaXNjYXJkQmFja2luZ1N0b3JlVGltZXIoUnVuTG9vcDo6Y3VycmVudCgpLCB0 aGlzLCAmRHJhd2luZ0FyZWFQcm94eUltcGw6OmRpc2NhcmRCYWNraW5nU3RvcmUpCiB7CiAjaWYg VVNFKEdMSUJfRVZFTlRfTE9PUCkKQEAgLTEyNCw3ICsxMjQsNyBAQCB2b2lkIERyYXdpbmdBcmVh UHJveHlJbXBsOjp1cGRhdGUodWludDY0X3QgYmFja2luZ1N0b3JlU3RhdGVJRCwgY29uc3QgVXBk YXRlSW5mbwogICAgIC8vIEZJWE1FOiBIYW5kbGUgdGhlIGNhc2Ugd2hlcmUgdGhlIHZpZXcgaXMg aGlkZGVuLgogCiAgICAgaW5jb3Jwb3JhdGVVcGRhdGUodXBkYXRlSW5mbyk7Ci0gICAgbV93ZWJQ YWdlUHJveHkucHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpEaWRVcGRhdGUo KSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2Vz OjpEcmF3aW5nQXJlYTo6RGlkVXBkYXRlKCksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKIH0K IAogdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUo dWludDY0X3QgYmFja2luZ1N0b3JlU3RhdGVJRCwgY29uc3QgVXBkYXRlSW5mbyYgdXBkYXRlSW5m bywgY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYgbGF5ZXJUcmVlQ29udGV4dCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmggYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5oCmluZGV4IDBhZjc3N2ZjZTQ0 Li4zMWE5Y2M3OTg2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvRHJhd2lu Z0FyZWFQcm94eUltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9EcmF3aW5nQXJl YVByb3h5SW1wbC5oCkBAIC0zOSw3ICszOSw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFz cyBEcmF3aW5nQXJlYVByb3h5SW1wbCBmaW5hbCA6IHB1YmxpYyBBY2NlbGVyYXRlZERyYXdpbmdB cmVhUHJveHkgewogcHVibGljOgotICAgIGV4cGxpY2l0IERyYXdpbmdBcmVhUHJveHlJbXBsKFdl YlBhZ2VQcm94eSYpOworICAgIERyYXdpbmdBcmVhUHJveHlJbXBsKFdlYlBhZ2VQcm94eSYsIFdl YlByb2Nlc3NQcm94eSYpOwogICAgIHZpcnR1YWwgfkRyYXdpbmdBcmVhUHJveHlJbXBsKCk7CiAK ICAgICB2b2lkIHBhaW50KEJhY2tpbmdTdG9yZTo6UGxhdGZvcm1HcmFwaGljc0NvbnRleHQsIGNv bnN0IFdlYkNvcmU6OkludFJlY3QmLCBXZWJDb3JlOjpSZWdpb24mIHVucGFpbnRlZFJlZ2lvbik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmggYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKaW5kZXggMDA3YjI4MTg0ZjMuLmJmNGVi MmRmNDk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCkBAIC00OSw2ICs0OSw3 IEBACiAKIE9CSkNfQ0xBU1MgQ0FMYXllcjsKIE9CSkNfQ0xBU1MgTlNGaWxlV3JhcHBlcjsKK09C SkNfQ0xBU1MgTlNNZW51OwogT0JKQ19DTEFTUyBOU1NldDsKIE9CSkNfQ0xBU1MgV0tEcmF3aW5n VmlldzsKIE9CSkNfQ0xBU1MgX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnk7CkBAIC0xMjIsNiArMTIz LDcgQEAgY2xhc3MgV2ViRnJhbWVQcm94eTsKIGNsYXNzIFdlYk9wZW5QYW5lbFJlc3VsdExpc3Rl bmVyUHJveHk7CiBjbGFzcyBXZWJQYWdlUHJveHk7CiBjbGFzcyBXZWJQb3B1cE1lbnVQcm94eTsK K2NsYXNzIFdlYlByb2Nlc3NQcm94eTsKIAogZW51bSBjbGFzcyBDb250aW51ZVVuc2FmZUxvYWQg OiBib29sIHsgTm8sIFllcyB9OwogCkBAIC0xNTgsNyArMTYwLDcgQEAgcHVibGljOgogICAgIHZp cnR1YWwgflBhZ2VDbGllbnQoKSB7IH0KIAogICAgIC8vIENyZWF0ZSBhIG5ldyBkcmF3aW5nIGFy ZWEgcHJveHkgZm9yIHRoZSBnaXZlbiBwYWdlLgotICAgIHZpcnR1YWwgc3RkOjp1bmlxdWVfcHRy PERyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKSA9IDA7CisgICAgdmly dHVhbCBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJhd2luZ0FyZWFQ cm94eShXZWJQcm9jZXNzUHJveHkmKSA9IDA7CiAKICAgICAvLyBUZWxsIHRoZSB2aWV3IHRvIGlu dmFsaWRhdGUgdGhlIGdpdmVuIHJlZ2lvbi4gVGhlIHJlZ2lvbiBpcyBpbiB2aWV3IGNvb3JkaW5h dGVzLgogICAgIHZpcnR1YWwgdm9pZCBzZXRWaWV3TmVlZHNEaXNwbGF5KGNvbnN0IFdlYkNvcmU6 OlJlZ2lvbiYpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zp c2lvbmFsUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFs UGFnZVByb3h5LmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uMTRm YmFjOGQwODAKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92 aXNpb25hbFBhZ2VQcm94eS5jcHAKQEAgLTAsMCArMSwzNjcgQEAKKy8qCisgKiBDb3B5cmlnaHQg KEMpIDIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJp YnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91 dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv d2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNv dXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAq IDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJv dmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9v ciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAq IFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJV VE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMs IElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElF UyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVS UE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMg Q09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJ REVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMg KElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJ VFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9S IEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhF T1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJ VFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJ TkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFE VklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5j bHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKKworI2lu Y2x1ZGUgIkFQSU5hdmlnYXRpb24uaCIKKyNpbmNsdWRlICJEcmF3aW5nQXJlYVByb3h5LmgiCisj aW5jbHVkZSAiRm9ybURhdGFSZWZlcmVuY2UuaCIKKyNpbmNsdWRlICJMb2dnaW5nLmgiCisjaW5j bHVkZSAiUGFnZUNsaWVudC5oIgorI2luY2x1ZGUgIlVSTFNjaGVtZVRhc2tQYXJhbWV0ZXJzLmgi CisjaW5jbHVkZSAiV2ViQmFja0ZvcndhcmRMaXN0LmgiCisjaW5jbHVkZSAiV2ViQmFja0Zvcndh cmRMaXN0SXRlbS5oIgorI2luY2x1ZGUgIldlYkVycm9ycy5oIgorI2luY2x1ZGUgIldlYk5hdmln YXRpb25EYXRhU3RvcmUuaCIKKyNpbmNsdWRlICJXZWJOYXZpZ2F0aW9uU3RhdGUuaCIKKyNpbmNs dWRlICJXZWJQYWdlTWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJQYWdlUHJveHkuaCIKKyNpbmNs dWRlICJXZWJQYWdlUHJveHlNZXNzYWdlcy5oIgorI2luY2x1ZGUgIldlYlByb2Nlc3NNZXNzYWdl cy5oIgorI2luY2x1ZGUgIldlYlByb2Nlc3NQcm94eS5oIgorI2luY2x1ZGUgPFdlYkNvcmUvU2hv dWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLmg+CisKK25hbWVzcGFjZSBXZWJLaXQgeworCisjZGVm aW5lIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoY2hhbm5lbCwgZm10LCAuLi4pIFJFTEVBU0VfTE9H X0lGKG1fcGFnZS5pc0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQoKSwgY2hhbm5lbCwgIiVwIC0gUHJv dmlzaW9uYWxQYWdlUHJveHk6OiIgZm10LCB0aGlzLCAjI19fVkFfQVJHU19fKQorI2RlZmluZSBS RUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKGNoYW5uZWwsIGZtdCwgLi4uKSBSRUxFQVNFX0xP R19FUlJPUl9JRihtX3BhZ2UuaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCksIGNoYW5uZWwsICIl cCAtIFByb3Zpc2lvbmFsUGFnZVByb3h5OjoiIGZtdCwgdGhpcywgIyNfX1ZBX0FSR1NfXykKKwor UHJvdmlzaW9uYWxQYWdlUHJveHk6OlByb3Zpc2lvbmFsUGFnZVByb3h5KFdlYlBhZ2VQcm94eSYg cGFnZSwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVuaXF1ZV9wdHI8U3Vz cGVuZGVkUGFnZVByb3h5PiBzdXNwZW5kZWRQYWdlLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGJv b2wgaXNTZXJ2ZXJSZWRpcmVjdCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1 ZXN0LCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlD bGllbnQpCisgICAgOiBtX3BhZ2UocGFnZSkKKyAgICAsIG1fcHJvY2VzcyhXVEZNb3ZlKHByb2Nl c3MpKQorICAgICwgbV9uYXZpZ2F0aW9uSUQobmF2aWdhdGlvbklEKQorICAgICwgbV9pc1NlcnZl clJlZGlyZWN0KGlzU2VydmVyUmVkaXJlY3QpCisgICAgLCBtX3JlcXVlc3QocmVxdWVzdCkKKyAg ICAsIG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudChwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5 Q2xpZW50KQorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgLCBtX3N1c3BlbnNpb25Ub2tl bihtX3Byb2Nlc3MtPnRocm90dGxlcigpLmZvcmVncm91bmRBY3Rpdml0eVRva2VuKCkpCisjZW5k aWYKK3sKKyAgICBtX3Byb2Nlc3MtPmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSwgKnRoaXMpOwor ICAgIG1fcHJvY2Vzcy0+YWRkUHJvdmlzaW9uYWxQYWdlUHJveHkoKnRoaXMpOworCisgICAgLy8g SWYgd2UgYXJlIHJlYXR0YWNoaW5nIHRvIGEgU3VzcGVuZGVkUGFnZSwgdGhlbiB0aGUgV2ViUHJv Y2VzcycgV2ViUGFnZSBhbHJlYWR5IGV4aXN0cyBhbmQKKyAgICAvLyBXZWJQYWdlUHJveHk6OmRp ZENyZWF0ZU1haW5GcmFtZSgpIHdpbGwgbm90IGJlIGNhbGxlZCB0byBpbml0aWFsaXplIG1fbWFp bkZyYW1lLiBJbiBzdWNoCisgICAgLy8gY2FzZSwgd2UgbmVlZCB0byBpbml0aWFsaXplIG1fbWFp bkZyYW1lIHRvIHJlZmxlY3QgdGhlIGZhY3QgdGhlIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdlCisg ICAgLy8gYWxyZWFkeSBleGlzdHMgYW5kIGFscmVhZHkgaGFzIGEgbWFpbiBmcmFtZS4KKyAgICBp ZiAoc3VzcGVuZGVkUGFnZSkgeworICAgICAgICBBU1NFUlQoJnN1c3BlbmRlZFBhZ2UtPnByb2Nl c3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpOworICAgICAgICBzdXNwZW5kZWRQYWdlLT51bnN1c3Bl bmQoKTsKKyAgICAgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5OjpjcmVhdGUobV9wYWdl LCBzdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpKTsKKyAgICAgICAgbV9wcm9jZXNzLT5mcmFt ZUNyZWF0ZWQoc3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSwgKm1fbWFpbkZyYW1lKTsKKyAg ICB9CisKKyAgICBpbml0aWFsaXplV2ViUGFnZSgpOworfQorCitQcm92aXNpb25hbFBhZ2VQcm94 eTo6flByb3Zpc2lvbmFsUGFnZVByb3h5KCkKK3sKKyAgICBtX3Byb2Nlc3MtPnJlbW92ZVByb3Zp c2lvbmFsUGFnZVByb3h5KCp0aGlzKTsKKworICAgIGlmIChtX3dhc0NvbW1pdHRlZCkKKyAgICAg ICAgcmV0dXJuOworCisgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkp OworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9wYWdl LnBhZ2VJRCgpKTsKKworICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbcHJvY2VzcyA9IG1f cHJvY2Vzcy5jb3B5UmVmKCldIHsKKyAgICAgICAgcHJvY2Vzcy0+bWF5YmVTaHV0RG93bigpOwor ICAgIH0pOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpwcm9jZXNzRGlkVGVybWlu YXRlKCkKK3sKKyAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGlu ZywgInByb2Nlc3NEaWRUZXJtaW5hdGU6IHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wYWdlLnBhZ2VJ RCgpKTsKKyAgICBtX3BhZ2UucHJvdmlzaW9uYWxQcm9jZXNzRGlkVGVybWluYXRlKCk7Cit9CisK K3N0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBQcm92aXNpb25hbFBhZ2VQcm94eTo6 dGFrZURyYXdpbmdBcmVhKCkKK3sKKyAgICByZXR1cm4gV1RGTW92ZShtX2RyYXdpbmdBcmVhKTsK K30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6Y2FuY2VsKCkKK3sKKyAgICAvLyBJZiB0 aGUgcHJvdmlzaW9uYWwgbG9hZCBzdGFydGVkLCB0aGVuIGluZGljYXRlIHRoYXQgaXQgZmFpbGVk IGR1ZSB0byBjYW5jZWxsYXRpb24gYnkgY2FsbGluZyBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUoKS4KKyAgICBpZiAobV9wcm92aXNpb25hbExvYWRVUkwuaXNFbXB0eSgpKQorICAgICAg ICByZXR1cm47CisKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywg ImNhbmNlbDogU2ltdWxhdGluZyBhIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSBmb3Ig cGFnZUlEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCkpOworICAgIEFTU0VSVChtX21haW5G cmFtZSk7CisgICAgYXV0byBlcnJvciA9IFdlYktpdDo6Y2FuY2VsbGVkRXJyb3IobV9yZXF1ZXN0 KTsKKyAgICBlcnJvci5zZXRUeXBlKFdlYkNvcmU6OlJlc291cmNlRXJyb3I6OlR5cGU6OkNhbmNl bGxhdGlvbik7CisgICAgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKG1fbWFpbkZyYW1l LT5mcmFtZUlEKCksIHsgfSwgbV9uYXZpZ2F0aW9uSUQsIG1fcHJvdmlzaW9uYWxMb2FkVVJMLCBl cnJvciwgVXNlckRhdGEgeyB9KTsgLy8gV2lsbCBkZWxldGUgfHRoaXN8LgorfQorCit2b2lkIFBy b3Zpc2lvbmFsUGFnZVByb3h5Ojpwcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5nKCkKK3sKKyAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgInByb2Nlc3NEaWRGaW5pc2hM YXVuY2hpbmc6IHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wYWdlLnBhZ2VJRCgpKTsKKyAgICBmaW5p c2hJbml0aWFsaXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNoKCk7Cit9CisKK3ZvaWQgUHJv dmlzaW9uYWxQYWdlUHJveHk6OmZpbmlzaEluaXRpYWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NM YXVuY2goKQoreworICAgIEFTU0VSVChtX3Byb2Nlc3MtPnN0YXRlKCkgPT0gV2ViUHJvY2Vzc1By b3h5OjpTdGF0ZTo6UnVubmluZyk7CisKKyAgICAvLyBGSVhNRTogVGhlIFdlYlBhZ2VQcm94eSBk ZWxheXMgYWRkaW5nIHRoZSB2aXNpdGVkIGxpbmsgc3RvcmUgdW50aWwgYWZ0ZXIgdGhlIHByb2Nl c3MgaGFzIGxhdW5jaGVkCisgICAgLy8gc28gdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IGRvZXMg dGhlIHNhbWUuIEhvd2V2ZXIsIGRvIHdlIHJlYWxseSBuZWVkIHRvPworICAgIG1fcHJvY2Vzcy0+ YWRkVmlzaXRlZExpbmtTdG9yZShtX3BhZ2UudmlzaXRlZExpbmtTdG9yZSgpKTsKK30KKwordm9p ZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoKQoreworICAgIG1fZHJh d2luZ0FyZWEgPSBtX3BhZ2UucGFnZUNsaWVudCgpLmNyZWF0ZURyYXdpbmdBcmVhUHJveHkobV9w cm9jZXNzKTsKKworICAgIGF1dG8gcGFyYW1ldGVycyA9IG1fcGFnZS5jcmVhdGlvblBhcmFtZXRl cnMobV9wcm9jZXNzKTsKKyAgICBwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXAgPSB0cnVlOworICAg IG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6Q3JlYXRlV2ViUGFnZShtX3Bh Z2UucGFnZUlEKCksIHBhcmFtZXRlcnMpLCAwKTsKKworICAgIGlmIChtX3Byb2Nlc3MtPnN0YXRl KCkgPT0gV2ViUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6UnVubmluZykKKyAgICAgICAgZmluaXNoSW5p dGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCgpOworfQorCit2b2lkIFByb3Zpc2lv bmFsUGFnZVByb3h5Ojpsb2FkRGF0YShBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIGNvbnN0 IElQQzo6RGF0YVJlZmVyZW5jZSYgZGF0YSwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3Qg U3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNl ckRhdGEsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQor eworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAibG9hZERhdGE6 IHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wYWdlLnBhZ2VJRCgpKTsKKworICAgIG1fcGFnZS5sb2Fk RGF0YVdpdGhOYXZpZ2F0aW9uU2hhcmVkKG1fcHJvY2VzcywgbmF2aWdhdGlvbiwgZGF0YSwgTUlN RVR5cGUsIGVuY29kaW5nLCBiYXNlVVJMLCB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRB c0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Cit9CisKK3Zv aWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmxvYWRSZXF1ZXN0KEFQSTo6TmF2aWdhdGlvbiYgbmF2 aWdhdGlvbiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgV2ViQ29yZTo6U2hv dWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBB UEk6Ok9iamVjdCogdXNlckRhdGEsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vi c2l0ZVBvbGljaWVzKQoreworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBw aW5nLCAibG9hZFJlcXVlc3Q6IHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wYWdlLnBhZ2VJRCgpKTsK KworICAgIG1fcGFnZS5sb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uU2hhcmVkKG1fcHJvY2Vzcywg bmF2aWdhdGlvbiwgV1RGTW92ZShyZXF1ZXN0KSwgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGlj eSwgdXNlckRhdGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBX VEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5 Ojpnb1RvQmFja0ZvcndhcmRJdGVtKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgV2ViQmFj a0ZvcndhcmRMaXN0SXRlbSYgaXRlbSwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3 ZWJzaXRlUG9saWNpZXMpCit7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dh cHBpbmcsICJnb1RvQmFja0ZvcndhcmRJdGVtOiBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5w YWdlSUQoKSk7CisKKyAgICBhdXRvIGl0ZW1TdGF0ZXMgPSBtX3BhZ2UuYmFja0ZvcndhcmRMaXN0 KCkuZmlsdGVyZWRJdGVtU3RhdGVzKFt0aGlzLCB0YXJnZXRJdGVtID0gJml0ZW1dKGF1dG8mIGl0 ZW0pIHsKKyAgICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBpdGVtLnN1c3BlbmRlZFBhZ2UoKSkgewor ICAgICAgICAgICAgaWYgKCZwYWdlLT5wcm9jZXNzKCkgPT0gbV9wcm9jZXNzLnB0cigpKQorICAg ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gJml0 ZW0gIT0gdGFyZ2V0SXRlbTsKKyAgICB9KTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6 OldlYlBhZ2U6OlVwZGF0ZUJhY2tGb3J3YXJkTGlzdEZvclJlYXR0YWNoKFdURk1vdmUoaXRlbVN0 YXRlcykpLCBtX3BhZ2UucGFnZUlEKCkpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBp dGVtLml0ZW1JRCgpLCAqbmF2aWdhdGlvbi5iYWNrRm9yd2FyZEZyYW1lTG9hZFR5cGUoKSwgV2Vi Q29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBv bGljaWVzKSksIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVz c1RpbWVyKCkuc3RhcnQoKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3Jl YXRlTWFpbkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCit7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxM T1dFRChQcm9jZXNzU3dhcHBpbmcsICJkaWRDcmVhdGVNYWluRnJhbWU6IHBhZ2VJRCA9ICUiIFBS SXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQpOwor ICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOworCisgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVBy b3h5OjpjcmVhdGUobV9wYWdlLCBmcmFtZUlEKTsKKworICAgIC8vIEFkZCB0aGUgZnJhbWUgdG8g dGhlIHByb2Nlc3Mgd2lkZSBtYXAuCisgICAgbV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoZnJhbWVJ RCwgKm1fbWFpbkZyYW1lKTsKKworICAgIC8vIFRoaXMgbmF2aWdhdGlvbiB3YXMgZGVzdHJveWVk IHNvIG5vIG5lZWQgdG8gbm90aWZ5IG9mIHJlZGlyZWN0LgorICAgIGlmICghbV9wYWdlLm5hdmln YXRpb25TdGF0ZSgpLmhhc05hdmlnYXRpb24obV9uYXZpZ2F0aW9uSUQpKQorICAgICAgICByZXR1 cm47CisKKyAgICAvLyBSZXN0b3JlIHRoZSBtYWluIGZyYW1lJ3MgY29tbWl0dGVkIFVSTCBhcyBz b21lIGNsaWVudHMgbWF5IHJlbHkgb24gaXQgdW50aWwgdGhlIG5leHQgbG9hZCBpcyBjb21taXR0 ZWQuCisgICAgaWYgKGF1dG8qIG1haW5GcmFtZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAg ICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkuc2V0VVJMKG1haW5GcmFtZS0+ZnJhbWVM b2FkU3RhdGUoKS51cmwoKSk7CisKKyAgICAvLyBOb3JtYWxseSwgbm90aWZpY2F0aW9uIG9mIGEg c2VydmVyIHJlZGlyZWN0IGNvbWVzIGZyb20gdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KKyAgICAv LyBJZiB3ZSBhcmUgcHJvY2VzcyBzd2FwcGluZyBpbiByZXNwb25zZSB0byBhIHNlcnZlciByZWRp cmVjdCB0aGVuIHRoYXQgbm90aWZpY2F0aW9uIHdpbGwgbm90IGNvbWUgZnJvbSB0aGUgbmV3IFdl YkNvbnRlbnQgcHJvY2Vzcy4KKyAgICAvLyBJbiB0aGlzIGNhc2Ugd2UgaGF2ZSB0aGUgVUlQcm9j ZXNzIHN5bnRoZXNpemUgdGhlIHJlZGlyZWN0IG5vdGlmaWNhdGlvbiBhdCB0aGUgYXBwcm9wcmlh dGUgdGltZS4KKyAgICBpZiAobV9pc1NlcnZlclJlZGlyZWN0KSB7CisgICAgICAgIG1fbWFpbkZy YW1lLT5mcmFtZUxvYWRTdGF0ZSgpLmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKG1fcmVxdWVzdC51 cmwoKSk7CisgICAgICAgIG1fcGFnZS5kaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNp b25hbExvYWRGb3JGcmFtZVNoYXJlZChtX3Byb2Nlc3MsIG1fbWFpbkZyYW1lLT5mcmFtZUlEKCks IG1fbmF2aWdhdGlvbklELCBXVEZNb3ZlKG1fcmVxdWVzdCksIHsgfSk7CisgICAgfQorfQorCit2 b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3QoY29uc3Qg U3RyaW5nJiBzb3VyY2VVUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgZGVzdGluYXRpb25VUkxTdHJp bmcsIHVpbnQ2NF90IGZyYW1lSUQpCit7CisgICAgbV9wYWdlLmRpZFBlcmZvcm1DbGllbnRSZWRp cmVjdFNoYXJlZChtX3Byb2Nlc3MsIHNvdXJjZVVSTFN0cmluZywgZGVzdGluYXRpb25VUkxTdHJp bmcsIGZyYW1lSUQpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRTdGFydFBy b3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRp b25JRCwgVVJMJiYgdXJsLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEmIHVz ZXJEYXRhKQoreworICAgIC8vIElmIHRoZSBwcmV2aW91cyBwcm92aXNpb25hbCBsb2FkIHVzZWQg dGhlIHNhbWUgcHJvY2Vzcywgd2UgbWF5IHJlY2VpdmUgSVBDIGZvciB0aGlzIHByZXZpb3VzIHBy b3Zpc2lvbmFsJ3MgbWFpbiBmcmFtZSB0aGF0IHdlIG5lZWQgdG8gaWdub3JlLgorICAgIGlmICgh bV9tYWluRnJhbWUgfHwgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSAhPSBmcmFtZUlEKQorICAgICAg ICByZXR1cm47CisKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywg ImRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBm cmFtZUlEID0gJSIgUFJJdTY0ICIsIG5hdmlnYXRpb25JRCA9ICUiIFBSSXU2NCwgbV9wYWdlLnBh Z2VJRCgpLCBmcmFtZUlELCBuYXZpZ2F0aW9uSUQpOworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFs TG9hZFVSTC5pc051bGwoKSk7CisgICAgbV9wcm92aXNpb25hbExvYWRVUkwgPSB1cmw7CisKKyAg ICAvLyBNZXJlbHkgZm9sbG93aW5nIGEgc2VydmVyIHNpZGUgcmVkaXJlY3Qgc28gdGhlcmUgaXMg bm8gbmVlZCB0byBzZW5kIGEgZGlkU3RhcnRQcm92aXNpb25hbExvYWQgYWdhaW4uCisgICAgaWYg KG1faXNTZXJ2ZXJSZWRpcmVjdCkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gQ2xpZW50cyBl eHBlY3QgdGhlIFBhZ2UncyBtYWluIGZyYW1lJ3MgZXhwZWN0ZWRVUkwgdG8gYmUgdGhlIHByb3Zp c2lvbmFsIG9uZSB3aGVuIGEgcHJvdmlzaW9uYWwgbG9hZCBpcyBzdGFydGVkLgorICAgIGlmIChh dXRvKiBwYWdlTWFpbkZyYW1lID0gbV9wYWdlLm1haW5GcmFtZSgpKQorICAgICAgICBwYWdlTWFp bkZyYW1lLT5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZCh1cmwpOworCisgICAgbV9wYWdlLmRpZFN0 YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWVTaGFyZWQobV9wcm9jZXNzLCBmcmFtZUlELCBuYXZp Z2F0aW9uSUQsIFdURk1vdmUodXJsKSwgV1RGTW92ZSh1bnJlYWNoYWJsZVVSTCksIHVzZXJEYXRh KTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9h ZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2lu RGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBT dHJpbmcmIHByb3Zpc2lvbmFsVVJMLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiBlcnJv ciwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lG X0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1l OiBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCBuYXZpZ2F0aW9u SUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSwgZnJhbWVJRCwgbmF2aWdhdGlvbklEKTsK KyAgICBtX3Byb3Zpc2lvbmFsTG9hZFVSTCA9IHsgfTsKKworICAgIC8vIE1ha2Ugc3VyZSB0aGUg UGFnZSdzIG1haW4gZnJhbWUncyBleHBlY3RlZFVSTCBnZXRzIGNsZWFyZWQgc2luY2Ugd2UgdXBk YXRlZCBpdCBpbiBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZC4KKyAgICBpZiAoYXV0byogcGFnZU1h aW5GcmFtZSA9IG1fcGFnZS5tYWluRnJhbWUoKSkKKyAgICAgICAgcGFnZU1haW5GcmFtZS0+ZGlk RmFpbFByb3Zpc2lvbmFsTG9hZCgpOworCisgICAgbV9wYWdlLmRpZEZhaWxQcm92aXNpb25hbExv YWRGb3JGcmFtZVNoYXJlZChtX3Byb2Nlc3MsIGZyYW1lSUQsIGZyYW1lU2VjdXJpdHlPcmlnaW4s IG5hdmlnYXRpb25JRCwgcHJvdmlzaW9uYWxVUkwsIGVycm9yLCB1c2VyRGF0YSk7IC8vIFdpbGwg ZGVsZXRlIHx0aGlzfC4KK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ29tbWl0 TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29u c3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwg dWludDMyX3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiBj ZXJ0aWZpY2F0ZUluZm8sIGJvb2wgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9uYWw8V2Vi Q29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIGNvbnN0 IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICAvLyBJZiB0aGUgcHJldmlvdXMgcHJvdmlzaW9u YWwgbG9hZCB1c2VkIHRoZSBzYW1lIHByb2Nlc3MsIHdlIG1heSByZWNlaXZlIElQQyBmb3IgdGhp cyBwcmV2aW91cyBwcm92aXNpb25hbCdzIG1haW4gZnJhbWUgdGhhdCB3ZSBuZWVkIHRvIGlnbm9y ZS4KKyAgICBpZiAoIW1fbWFpbkZyYW1lIHx8IG1fbWFpbkZyYW1lLT5mcmFtZUlEKCkgIT0gZnJh bWVJRCkKKyAgICAgICAgcmV0dXJuOworCisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9j ZXNzU3dhcHBpbmcsICJkaWRDb21taXRMb2FkRm9yRnJhbWU6IHBhZ2VJRCA9ICUiIFBSSXU2NCAi LCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIG5hdmlnYXRpb25JRCA9ICUiIFBSSXU2NCwgbV9wYWdl LnBhZ2VJRCgpLCBmcmFtZUlELCBuYXZpZ2F0aW9uSUQpOworICAgIG1fcHJvdmlzaW9uYWxMb2Fk VVJMID0geyB9OworICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsK KworICAgIG1fd2FzQ29tbWl0dGVkID0gdHJ1ZTsKKyAgICBtX3BhZ2UuY29tbWl0UHJvdmlzaW9u YWxQYWdlKGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgbWltZVR5cGUsIGZyYW1lSGFzQ3VzdG9tQ29u dGVudFByb3ZpZGVyLCBmcmFtZUxvYWRUeXBlLCBjZXJ0aWZpY2F0ZUluZm8sIGNvbnRhaW5zUGx1 Z2luRG9jdW1lbnQsIGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgdXNlckRhdGEpOyAvLyBXaWxs IGRlbGV0ZSB8dGhpc3wuCit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZE5hdmln YXRlV2l0aE5hdmlnYXRpb25EYXRhKGNvbnN0IFdlYk5hdmlnYXRpb25EYXRhU3RvcmUmIHN0b3Jl LCB1aW50NjRfdCBmcmFtZUlEKQoreworICAgIG1fcGFnZS5kaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0 aW9uRGF0YVNoYXJlZChtX3Byb2Nlc3MsIHN0b3JlLCBmcmFtZUlEKTsKK30KKwordm9pZCBQcm92 aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZSh1aW50NjRf dCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmIHVybCkKK3sKKyAgICBtX3Bh Z2UuZGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZVNoYXJlZChtX3Byb2Nlc3MsIGZyYW1l SUQsIG5hdmlnYXRpb25JRCwgV1RGTW92ZSh1cmwpKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBh Z2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jKHVpbnQ2NF90IGZy YW1lSUQsIFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYmIGZyYW1lU2VjdXJpdHlPcmlnaW4s IHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgTmF2aWdhdGlvbkFjdGlvbkRhdGEmJiBuYXZpZ2F0aW9u QWN0aW9uRGF0YSwgRnJhbWVJbmZvRGF0YSYmIGZyYW1lSW5mb0RhdGEsIHVpbnQ2NF90IG9yaWdp bmF0aW5nUGFnZUlELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVx dWVzdCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgSVBDOjpGb3JtRGF0YVJl ZmVyZW5jZSYmIHJlcXVlc3RCb2R5LCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYgcmVkaXJl Y3RSZXNwb25zZSwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhLCB1aW50NjRfdCBsaXN0ZW5lcklE KQoreworICAgIG1fcGFnZS5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmNTaGFy ZWQobV9wcm9jZXNzLCBmcmFtZUlELCBXVEZNb3ZlKGZyYW1lU2VjdXJpdHlPcmlnaW4pLCBuYXZp Z2F0aW9uSUQsIFdURk1vdmUobmF2aWdhdGlvbkFjdGlvbkRhdGEpLCBXVEZNb3ZlKGZyYW1lSW5m b0RhdGEpLCBvcmlnaW5hdGluZ1BhZ2VJRCwgb3JpZ2luYWxSZXF1ZXN0LCBXVEZNb3ZlKHJlcXVl c3QpLCBXVEZNb3ZlKHJlcXVlc3RCb2R5KSwgV1RGTW92ZShyZWRpcmVjdFJlc3BvbnNlKSwgdXNl ckRhdGEsIGxpc3RlbmVySUQpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkZWNp ZGVQb2xpY3lGb3JSZXNwb25zZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1 cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25J RCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgYm9vbCBjYW5TaG93TUlNRVR5cGUsIHVpbnQ2 NF90IGxpc3RlbmVySUQsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICBtX3BhZ2Uu ZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2VTaGFyZWQobV9wcm9jZXNzLCBmcmFtZUlELCBmcmFtZVNl Y3VyaXR5T3JpZ2luLCBuYXZpZ2F0aW9uSUQsIHJlc3BvbnNlLCByZXF1ZXN0LCBjYW5TaG93TUlN RVR5cGUsIGxpc3RlbmVySUQsIHVzZXJEYXRhKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQ cm94eTo6c3RhcnRVUkxTY2hlbWVUYXNrKFVSTFNjaGVtZVRhc2tQYXJhbWV0ZXJzJiYgcGFyYW1l dGVycykKK3sKKyAgICBtX3BhZ2Uuc3RhcnRVUkxTY2hlbWVUYXNrU2hhcmVkKG1fcHJvY2Vzcywg V1RGTW92ZShwYXJhbWV0ZXJzKSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmJh Y2tGb3J3YXJkR29Ub0l0ZW0oY29uc3QgV2ViQ29yZTo6QmFja0ZvcndhcmRJdGVtSWRlbnRpZmll ciYgaWRlbnRpZmllciwgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJiBoYW5kbGUpCit7CisgICAg bV9wYWdlLmJhY2tGb3J3YXJkR29Ub0l0ZW1TaGFyZWQobV9wcm9jZXNzLCBpZGVudGlmaWVyLCBo YW5kbGUpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2Fn ZShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIElQQzo6RGVjb2RlciYgZGVjb2RlcikKK3sK KyAgICBBU1NFUlQoZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkgPT0gTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpKTsKKworICAgIGlmIChkZWNvZGVyLm1l c3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU3RhcnRQcm9ncmVzczo6 bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjpEaWRDaGFuZ2VQcm9ncmVzczo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIu bWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpCYWNrRm9yd2FyZEFkZEl0 ZW06Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6TG9nRGlhZ25vc3RpY01lc3NhZ2U6Om5hbWUoKQorICAgICAgICB8fCBk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6TG9nRGlhZ25v c3RpY01lc3NhZ2VXaXRoRW5oYW5jZWRQcml2YWN5OjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rl ci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNldE5ldHdvcmtSZXF1 ZXN0c0luUHJvZ3Jlc3M6Om5hbWUoKQorI2lmIFBMQVRGT1JNKENPQ09BKQorICAgICAgICB8fCBk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UmVnaXN0ZXJX ZWJQcm9jZXNzQWNjZXNzaWJpbGl0eVRva2VuOjpuYW1lKCkKKyNlbmRpZgorICAgICAgICApCisg ICAgeworICAgICAgICBtX3BhZ2UuZGlkUmVjZWl2ZU1lc3NhZ2UoY29ubmVjdGlvbiwgZGVjb2Rl cik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFt ZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlN0YXJ0VVJMU2NoZW1lVGFzazo6bmFtZSgp KSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpT dGFydFVSTFNjaGVtZVRhc2s+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6 c3RhcnRVUkxTY2hlbWVUYXNrKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jOjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5k bGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb25Bc3luYz4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkZWNp ZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmMpOworICAgICAgICByZXR1cm47CisgICAg fQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpEZWNpZGVQb2xpY3lGb3JSZXNwb25zZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFu ZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEZWNpZGVQb2xpY3lGb3JSZXNwb25z ZT4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JS ZXNwb25zZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNz YWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENoYW5nZVByb3Zpc2lvbmFs VVJMRm9yRnJhbWU6Om5hbWUoKSkgeworICAgICAgICBJUEM6OmhhbmRsZU1lc3NhZ2U8TWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6RGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZT4oZGVjb2Rl ciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDaGFuZ2VQcm92aXNpb25hbFVSTEZv ckZyYW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3Nh Z2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkTmF2aWdhdGVXaXRoTmF2aWdh dGlvbkRhdGE6Om5hbWUoKSkgeworICAgICAgICBJUEM6OmhhbmRsZU1lc3NhZ2U8TWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6RGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGE+KGRlY29kZXIsIHRo aXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGEp OworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUo KSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3Q6Om5h bWUoKSkgeworICAgICAgICBJUEM6OmhhbmRsZU1lc3NhZ2U8TWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6RGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0PihkZWNvZGVyLCB0aGlzLCAmUHJvdmlzaW9uYWxQ YWdlUHJveHk6OmRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdCk7CisgICAgICAgIHJldHVybjsKKyAg ICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OkRpZENyZWF0ZU1haW5GcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxl TWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDcmVhdGVNYWluRnJhbWU+KGRlY29k ZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKTsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0g TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTo6 bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lPihkZWNvZGVyLCB0aGlzLCAmUHJv dmlzaW9uYWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOworICAg ICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBN ZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6Om5h bWUoKSkgeworICAgICAgICBJUEM6OmhhbmRsZU1lc3NhZ2U8TWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6RGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lPihkZWNvZGVyLCB0aGlzLCAmUHJvdmlz aW9uYWxQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSk7CisgICAgICAg IHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3Nh Z2VzOjpXZWJQYWdlUHJveHk6OkRpZENvbW1pdExvYWRGb3JGcmFtZTo6bmFtZSgpKSB7CisgICAg ICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDb21taXRM b2FkRm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ29t bWl0TG9hZEZvckZyYW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIExPRyhQcm9j ZXNzU3dhcHBpbmcsICJVbmhhbmRsZWQgbWVzc2FnZSAlczo6JXMgZnJvbSBwcm92aXNpb25hbCBw cm9jZXNzIiwgZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkudG9TdHJpbmcoKS5kYXRhKCks IGRlY29kZXIubWVzc2FnZU5hbWUoKS50b1N0cmluZygpLmRhdGEoKSk7Cit9CisKK3ZvaWQgUHJv dmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVTeW5jTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24m IGNvbm5lY3Rpb24sIElQQzo6RGVjb2RlciYgZGVjb2Rlciwgc3RkOjp1bmlxdWVfcHRyPElQQzo6 RW5jb2Rlcj4mIHJlcGx5RW5jb2RlcikKK3sKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgp ID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkJhY2tGb3J3YXJkR29Ub0l0ZW06Om5hbWUoKSkg eworICAgICAgICBJUEM6OmhhbmRsZU1lc3NhZ2VMZWdhY3lTeW5jPE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OkJhY2tGb3J3YXJkR29Ub0l0ZW0+KGRlY29kZXIsICpyZXBseUVuY29kZXIsIHRoaXMs ICZQcm92aXNpb25hbFBhZ2VQcm94eTo6YmFja0ZvcndhcmRHb1RvSXRlbSk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisKKyAgICBtX3BhZ2UuZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKGNvbm5lY3Rp b24sIGRlY29kZXIsIHJlcGx5RW5jb2Rlcik7Cit9CisKK30gLy8gbmFtZXNwYWNlIFdlYktpdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHku aCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmgKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLmRkMTUxOWUwNWEzCi0tLSAvZGV2L251 bGwKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuaApA QCAtMCwwICsxLDEwMyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxOSBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFy ZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4g dGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGlu IGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92 aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9W SURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5E IEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJ TUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBB TkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJ TiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJ QUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1Q TEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJ TUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VT OyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQ VElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVU SEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5H IE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBU SEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJ QklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNwcmFnbWEgb25jZQorCisjaW5jbHVkZSAi TWVzc2FnZVJlY2VpdmVyLmgiCisjaW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4KKworbmFtZXNwYWNl IFdlYkNvcmUgeworY2xhc3MgUmVzb3VyY2VSZXF1ZXN0OworfQorCituYW1lc3BhY2UgV2ViS2l0 IHsKKworY2xhc3MgRHJhd2luZ0FyZWFQcm94eTsKK2NsYXNzIFN1c3BlbmRlZFBhZ2VQcm94eTsK K2NsYXNzIFdlYkZyYW1lUHJveHk7CitzdHJ1Y3QgV2ViTmF2aWdhdGlvbkRhdGFTdG9yZTsKK2Ns YXNzIFdlYlBhZ2VQcm94eTsKK2NsYXNzIFdlYlByb2Nlc3NQcm94eTsKKworY2xhc3MgUHJvdmlz aW9uYWxQYWdlUHJveHkgOiBwdWJsaWMgSVBDOjpNZXNzYWdlUmVjZWl2ZXIsIHB1YmxpYyBDYW5N YWtlV2Vha1B0cjxQcm92aXNpb25hbFBhZ2VQcm94eT4geworICAgIFdURl9NQUtFX0ZBU1RfQUxM T0NBVEVEOworcHVibGljOgorICAgIFByb3Zpc2lvbmFsUGFnZVByb3h5KFdlYlBhZ2VQcm94eSYs IFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJv eHk+LCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGJvb2wgaXNTZXJ2ZXJSZWRpcmVjdCwgY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCk7 CisgICAgflByb3Zpc2lvbmFsUGFnZVByb3h5KCk7CisKKyAgICBXZWJQYWdlUHJveHkmIHBhZ2Uo KSB7IHJldHVybiBtX3BhZ2U7IH0KKyAgICBXZWJGcmFtZVByb3h5KiBtYWluRnJhbWUoKSBjb25z dCB7IHJldHVybiBtX21haW5GcmFtZS5nZXQoKTsgfQorICAgIFdlYlByb2Nlc3NQcm94eSYgcHJv Y2VzcygpIHsgcmV0dXJuIG1fcHJvY2Vzcy5nZXQoKTsgfQorICAgIFByb2Nlc3NTd2FwUmVxdWVz dGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCgpIGNvbnN0IHsgcmV0dXJu IG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDsgfQorICAgIHVpbnQ2NF90IG5hdmlnYXRp b25JRCgpIGNvbnN0IHsgcmV0dXJuIG1fbmF2aWdhdGlvbklEOyB9CisKKyAgICBEcmF3aW5nQXJl YVByb3h5KiBkcmF3aW5nQXJlYSgpIGNvbnN0IHsgcmV0dXJuIG1fZHJhd2luZ0FyZWEuZ2V0KCk7 IH0KKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gdGFrZURyYXdpbmdBcmVh KCk7CisKKyAgICB2b2lkIGxvYWREYXRhKEFQSTo6TmF2aWdhdGlvbiYsIGNvbnN0IElQQzo6RGF0 YVJlZmVyZW5jZSYsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2Rp bmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25h bDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKKyAgICB2b2lkIGxvYWRS ZXF1ZXN0KEFQSTo6TmF2aWdhdGlvbiYsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBXZWJD b3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRhdGEs IE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6Om51bGxvcHQpOworICAgIHZv aWQgZ29Ub0JhY2tGb3J3YXJkSXRlbShBUEk6Ok5hdmlnYXRpb24mLCBXZWJCYWNrRm9yd2FyZExp c3RJdGVtJiwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJik7CisgICAgdm9pZCBjYW5j ZWwoKTsKKworICAgIHZvaWQgcHJvY2Vzc0RpZEZpbmlzaExhdW5jaGluZygpOworICAgIHZvaWQg cHJvY2Vzc0RpZFRlcm1pbmF0ZSgpOworCitwcml2YXRlOgorICAgIC8vIElQQzo6TWVzc2FnZVJl Y2VpdmVyCisgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6 OkRlY29kZXImKSBmaW5hbDsKKyAgICB2b2lkIGRpZFJlY2VpdmVTeW5jTWVzc2FnZShJUEM6OkNv bm5lY3Rpb24mLCBJUEM6OkRlY29kZXImLCBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVyPiYp IGZpbmFsOworCisgICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmMo dWludDY0X3QgZnJhbWVJRCwgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiYgZnJhbWVTZWN1 cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBOYXZpZ2F0aW9uQWN0aW9uRGF0YSYm LCBGcmFtZUluZm9EYXRhJiYsIHVpbnQ2NF90IG9yaWdpbmF0aW5nUGFnZUlELCBjb25zdCBXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVxdWVzdCwgV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0JiYsIElQQzo6Rm9ybURhdGFSZWZlcmVuY2UmJiByZXF1ZXN0Qm9keSwgV2ViQ29yZTo6 UmVzb3VyY2VSZXNwb25zZSYmIHJlZGlyZWN0UmVzcG9uc2UsIGNvbnN0IFVzZXJEYXRhJiwgdWlu dDY0X3QgbGlzdGVuZXJJRCk7CisgICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JSZXNwb25zZSh1aW50 NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2Vj dXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgV2ViQ29yZTo6UmVzb3Vy Y2VSZXNwb25zZSYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGJvb2wgY2FuU2hv d01JTUVUeXBlLCB1aW50NjRfdCBsaXN0ZW5lcklELCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZv aWQgZGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50 NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmKTsKKyAgICB2b2lkIGRpZE5hdmlnYXRlV2l0aE5hdmln YXRpb25EYXRhKGNvbnN0IFdlYk5hdmlnYXRpb25EYXRhU3RvcmUmLCB1aW50NjRfdCBmcmFtZUlE KTsKKyAgICB2b2lkIGRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdChjb25zdCBTdHJpbmcmIHNvdXJj ZVVSTFN0cmluZywgY29uc3QgU3RyaW5nJiBkZXN0aW5hdGlvblVSTFN0cmluZywgdWludDY0X3Qg ZnJhbWVJRCk7CisgICAgdm9pZCBkaWRDcmVhdGVNYWluRnJhbWUodWludDY0X3QgZnJhbWVJRCk7 CisgICAgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1l SUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYsIFVSTCYmIHVucmVhY2hhYmxlVVJMLCBj b25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90 IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwg Ym9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVMb2FkVHlw ZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiwgYm9vbCBjb250YWluc1BsdWdpbkRv Y3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0lu c2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2b2lkIGRpZEZhaWxQcm92aXNp b25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0 eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwg Y29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJv ciYsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBzdGFydFVSTFNjaGVtZVRhc2soVVJMU2No ZW1lVGFza1BhcmFtZXRlcnMmJik7CisgICAgdm9pZCBiYWNrRm9yd2FyZEdvVG9JdGVtKGNvbnN0 IFdlYkNvcmU6OkJhY2tGb3J3YXJkSXRlbUlkZW50aWZpZXImLCBTYW5kYm94RXh0ZW5zaW9uOjpI YW5kbGUmKTsKKworICAgIHZvaWQgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsKKyAgICB2b2lkIGZpbmlz aEluaXRpYWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2goKTsKKworICAgIFdlYlBhZ2VQ cm94eSYgbV9wYWdlOworICAgIFJlZjxXZWJQcm9jZXNzUHJveHk+IG1fcHJvY2VzczsKKyAgICBz dGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gbV9kcmF3aW5nQXJlYTsKKyAgICBSZWZQ dHI8V2ViRnJhbWVQcm94eT4gbV9tYWluRnJhbWU7CisgICAgdWludDY0X3QgbV9uYXZpZ2F0aW9u SUQ7CisgICAgYm9vbCBtX2lzU2VydmVyUmVkaXJlY3Q7CisgICAgV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0IG1fcmVxdWVzdDsKKyAgICBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IG1fcHJv Y2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDsKKyAgICBib29sIG1fd2FzQ29tbWl0dGVkIHsgZmFs c2UgfTsKKyAgICBVUkwgbV9wcm92aXNpb25hbExvYWRVUkw7CisKKyNpZiBQTEFURk9STShJT1Nf RkFNSUxZKQorICAgIFByb2Nlc3NUaHJvdHRsZXI6OkZvcmVncm91bmRBY3Rpdml0eVRva2VuIG1f c3VzcGVuc2lvblRva2VuOworI2VuZGlmCit9OworCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVM YXllclRyZWVEcmF3aW5nQXJlYVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1v dGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5oCmluZGV4IDMyZjI4 ODY0ZmNhLi5mOTRhZDNmODZhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv UmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHkuaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJh d2luZ0FyZWFQcm94eS5oCkBAIC00MCw3ICs0MCw3IEBAIGNsYXNzIFJlbW90ZVNjcm9sbGluZ0Nv b3JkaW5hdG9yVHJhbnNhY3Rpb247CiAKIGNsYXNzIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVh UHJveHkgZmluYWwgOiBwdWJsaWMgRHJhd2luZ0FyZWFQcm94eSB7CiBwdWJsaWM6Ci0gICAgZXhw bGljaXQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eShXZWJQYWdlUHJveHkmKTsKKyAg ICBSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5KFdlYlBhZ2VQcm94eSYsIFdlYlByb2Nl c3NQcm94eSYpOwogICAgIHZpcnR1YWwgflJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHko KTsKIAogICAgIGNvbnN0IFJlbW90ZUxheWVyVHJlZUhvc3QmIHJlbW90ZUxheWVyVHJlZUhvc3Qo KSBjb25zdCB7IHJldHVybiAqbV9yZW1vdGVMYXllclRyZWVIb3N0OyB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJh d2luZ0FyZWFQcm94eS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJl ZS9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5Lm1tCmluZGV4IDM1OTQ2YmIzZGM3Li5h MzgwYTUwM2FlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5 ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHkubW0KKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVh UHJveHkubW0KQEAgLTEwNSw4ICsxMDUsOCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5h bWVzcGFjZSBJUEM7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAotUmVtb3RlTGF5ZXJUcmVl RHJhd2luZ0FyZWFQcm94eTo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eShXZWJQYWdl UHJveHkmIHdlYlBhZ2VQcm94eSkKLSAgICA6IERyYXdpbmdBcmVhUHJveHkoRHJhd2luZ0FyZWFU eXBlUmVtb3RlTGF5ZXJUcmVlLCB3ZWJQYWdlUHJveHkpCitSZW1vdGVMYXllclRyZWVEcmF3aW5n QXJlYVByb3h5OjpSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5KFdlYlBhZ2VQcm94eSYg d2ViUGFnZVByb3h5LCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MpCisgICAgOiBEcmF3aW5nQXJl YVByb3h5KERyYXdpbmdBcmVhVHlwZVJlbW90ZUxheWVyVHJlZSwgd2ViUGFnZVByb3h5LCBwcm9j ZXNzKQogICAgICwgbV9yZW1vdGVMYXllclRyZWVIb3N0KHN0ZDo6bWFrZV91bmlxdWU8UmVtb3Rl TGF5ZXJUcmVlSG9zdD4oKnRoaXMpKQogewogI2lmIEhBVkUoSU9TVVJGQUNFKQpAQCAtMTE1LDcg KzExNSw3IEBAIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6OlJlbW90ZUxheWVyVHJl ZURyYXdpbmdBcmVhUHJveHkoV2ViUGFnZVByb3h5JiB3CiAgICAgSU9TdXJmYWNlUG9vbDo6c2hh cmVkUG9vbCgpLnNldFBvb2xTaXplKDApOwogI2VuZGlmCiAKLSAgICBtX3dlYlBhZ2VQcm94eS5w cm9jZXNzKCkuYWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpSZW1vdGVMYXllclRyZWVEcmF3 aW5nQXJlYVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fd2ViUGFnZVByb3h5LnBhZ2VJ RCgpLCAqdGhpcyk7CisgICAgcHJvY2Vzcy5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OlJl bW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV93 ZWJQYWdlUHJveHkucGFnZUlEKCksICp0aGlzKTsKIAogICAgIGlmIChtX3dlYlBhZ2VQcm94eS5w cmVmZXJlbmNlcygpLnRpbGVkU2Nyb2xsaW5nSW5kaWNhdG9yVmlzaWJsZSgpKQogICAgICAgICBp bml0aWFsaXplRGVidWdJbmRpY2F0b3IoKTsKQEAgLTEyNCw3ICsxMjQsNyBAQCBSZW1vdGVMYXll clRyZWVEcmF3aW5nQXJlYVByb3h5OjpSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5KFdl YlBhZ2VQcm94eSYgdwogUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6flJlbW90ZUxh eWVyVHJlZURyYXdpbmdBcmVhUHJveHkoKQogewogICAgIG1fY2FsbGJhY2tzLmludmFsaWRhdGUo Q2FsbGJhY2tCYXNlOjpFcnJvcjo6T3duZXJXYXNJbnZhbGlkYXRlZCk7Ci0gICAgbV93ZWJQYWdl UHJveHkucHJvY2VzcygpLnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6UmVtb3RlTGF5 ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3dlYlBhZ2VQ cm94eS5wYWdlSUQoKSk7CisgICAgcHJvY2VzcygpLnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNz YWdlczo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFt ZSgpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZ KQogICAgIFttX2Rpc3BsYXlMaW5rSGFuZGxlciBpbnZhbGlkYXRlXTsKQEAgLTE2MSw3ICsxNjEs NyBAQCB2b2lkIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6OnNpemVEaWRDaGFuZ2Uo KQogCiB2b2lkIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6OmRldmljZVNjYWxlRmFj dG9yRGlkQ2hhbmdlKCkKIHsKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc2VuZChNZXNz YWdlczo6RHJhd2luZ0FyZWE6OlNldERldmljZVNjYWxlRmFjdG9yKG1fd2ViUGFnZVByb3h5LmRl dmljZVNjYWxlRmFjdG9yKCkpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CisgICAgcHJvY2Vz cygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpTZXREZXZpY2VTY2FsZUZhY3RvcihtX3dl YlBhZ2VQcm94eS5kZXZpY2VTY2FsZUZhY3RvcigpKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkp OwogfQogCiB2b2lkIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6OmRpZFVwZGF0ZUdl b21ldHJ5KCkKQEAgLTE3OSw3ICsxNzksNyBAQCB2b2lkIFJlbW90ZUxheWVyVHJlZURyYXdpbmdB cmVhUHJveHk6OmRpZFVwZGF0ZUdlb21ldHJ5KCkKIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2lu Z0FyZWFQcm94eTo6c2VuZFVwZGF0ZUdlb21ldHJ5KCkKIHsKICAgICBtX2xhc3RTZW50U2l6ZSA9 IG1fc2l6ZTsKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJh d2luZ0FyZWE6OlVwZGF0ZUdlb21ldHJ5KG1fc2l6ZSwgZmFsc2UgLyogZmx1c2hTeW5jaHJvbm91 c2x5ICovLCBNYWNoU2VuZFJpZ2h0KCkpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CisgICAg cHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpVcGRhdGVHZW9tZXRyeShtX3Np emUsIGZhbHNlIC8qIGZsdXNoU3luY2hyb25vdXNseSAqLywgTWFjaFNlbmRSaWdodCgpKSwgbV93 ZWJQYWdlUHJveHkucGFnZUlEKCkpOwogICAgIG1faXNXYWl0aW5nRm9yRGlkVXBkYXRlR2VvbWV0 cnkgPSB0cnVlOwogfQogCkBAIC0yNjQsMTIgKzI2NCwxMiBAQCB2b2lkIFJlbW90ZUxheWVyVHJl ZURyYXdpbmdBcmVhUHJveHk6OmNvbW1pdExheWVyVHJlZShjb25zdCBSZW1vdGVMYXllclRyZWVU cmFucwogCiB2b2lkIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6OmFjY2VsZXJhdGVk QW5pbWF0aW9uRGlkU3RhcnQodWludDY0X3QgbGF5ZXJJRCwgY29uc3QgU3RyaW5nJiBrZXksIE1v bm90b25pY1RpbWUgc3RhcnRUaW1lKQogewotICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5z ZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6QWNjZWxlcmF0ZWRBbmltYXRpb25EaWRTdGFydChs YXllcklELCBrZXksIHN0YXJ0VGltZSksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKKyAgICBw cm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6OkFjY2VsZXJhdGVkQW5pbWF0aW9u RGlkU3RhcnQobGF5ZXJJRCwga2V5LCBzdGFydFRpbWUpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQo KSk7CiB9CiAKIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6YWNjZWxlcmF0 ZWRBbmltYXRpb25EaWRFbmQodWludDY0X3QgbGF5ZXJJRCwgY29uc3QgU3RyaW5nJiBrZXkpCiB7 Ci0gICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVh OjpBY2NlbGVyYXRlZEFuaW1hdGlvbkRpZEVuZChsYXllcklELCBrZXkpLCBtX3dlYlBhZ2VQcm94 eS5wYWdlSUQoKSk7CisgICAgcHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpB Y2NlbGVyYXRlZEFuaW1hdGlvbkRpZEVuZChsYXllcklELCBrZXkpLCBtX3dlYlBhZ2VQcm94eS5w YWdlSUQoKSk7CiB9CiAKIHN0YXRpYyBjb25zdCBmbG9hdCBpbmRpY2F0b3JJbnNldCA9IDEwOwpA QCAtNDMwLDcgKzQzMCw3IEBAIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6 ZGlkUmVmcmVzaERpc3BsYXkoKQogICAgIC8vIFdhaXRpbmcgZm9yIENBIHRvIGNvbW1pdCBpcyBp bnN1ZmZpY2llbnQsIGJlY2F1c2UgdGhlIHJlbmRlciBzZXJ2ZXIgY2FuIHN0aWxsIGJlCiAgICAg Ly8gdXNpbmcgb3VyIGJhY2tpbmcgc3RvcmUuIFdlIGNhbiBpbXByb3ZlIHRoaXMgYnkgd2FpdGlu ZyBmb3IgdGhlIHJlbmRlciBzZXJ2ZXIgdG8gY29tbWl0CiAgICAgLy8gaWYgd2UgZmluZCBBUEkg dG8gZG8gc28sIGJ1dCBmb3Igbm93IHdlIHdpbGwgbWFrZSBleHRyYSBidWZmZXJzIGlmIG5lZWQg YmUuCi0gICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdB cmVhOjpEaWRVcGRhdGUoKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOworICAgIHByb2Nlc3Mo KS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6RGlkVXBkYXRlKCksIG1fd2ViUGFnZVByb3h5 LnBhZ2VJRCgpKTsKIAogICAgIG1fbGFzdFZpc2libGVUcmFuc2FjdGlvbklEID0gbV90cmFuc2Fj dGlvbklERm9yUGVuZGluZ0NBQ29tbWl0OwogCkBAIC00NTgsNyArNDU4LDcgQEAgdm9pZCBSZW1v dGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5Ojp3YWl0Rm9yRGlkVXBkYXRlQWN0aXZpdHlTdGF0 ZShBY3Rpdml0eVN0YXQKICAgICB9KCk7CiAKICAgICBhdXRvIHN0YXJ0VGltZSA9IE1vbm90b25p Y1RpbWU6Om5vdygpOwotICAgIHdoaWxlIChtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuY29ubmVj dGlvbigpLT53YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVseTxNZXNzYWdlczo6UmVtb3RlTGF5 ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6Q29tbWl0TGF5ZXJUcmVlPihtX3dlYlBhZ2VQcm94eS5w YWdlSUQoKSwgYWN0aXZpdHlTdGF0ZVVwZGF0ZVRpbWVvdXQgLSAoTW9ub3RvbmljVGltZTo6bm93 KCkgLSBzdGFydFRpbWUpLCBJUEM6OldhaXRGb3JPcHRpb246OkludGVycnVwdFdhaXRpbmdJZlN5 bmNNZXNzYWdlQXJyaXZlcykpIHsKKyAgICB3aGlsZSAocHJvY2VzcygpLmNvbm5lY3Rpb24oKS0+ d2FpdEZvckFuZERpc3BhdGNoSW1tZWRpYXRlbHk8TWVzc2FnZXM6OlJlbW90ZUxheWVyVHJlZURy YXdpbmdBcmVhUHJveHk6OkNvbW1pdExheWVyVHJlZT4obV93ZWJQYWdlUHJveHkucGFnZUlEKCks IGFjdGl2aXR5U3RhdGVVcGRhdGVUaW1lb3V0IC0gKE1vbm90b25pY1RpbWU6Om5vdygpIC0gc3Rh cnRUaW1lKSwgSVBDOjpXYWl0Rm9yT3B0aW9uOjpJbnRlcnJ1cHRXYWl0aW5nSWZTeW5jTWVzc2Fn ZUFycml2ZXMpKSB7CiAgICAgICAgIGlmIChhY3Rpdml0eVN0YXRlQ2hhbmdlSUQgPT0gQWN0aXZp dHlTdGF0ZUNoYW5nZUFzeW5jaHJvbm91cyB8fCBhY3Rpdml0eVN0YXRlQ2hhbmdlSUQgPD0gbV9h Y3Rpdml0eVN0YXRlQ2hhbmdlSUQpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtNDcx LDcgKzQ3MSw3IEBAIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6ZGlzcGF0 Y2hBZnRlckVuc3VyaW5nRHJhd2luZyhXVEY6OkZ1bmN0aW9uCiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2lu Z0FyZWE6OkFkZFRyYW5zYWN0aW9uQ2FsbGJhY2tJRChtX2NhbGxiYWNrcy5wdXQoV1RGTW92ZShj YWxsYmFja0Z1bmN0aW9uKSwgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnRocm90dGxlcigpLmJh Y2tncm91bmRBY3Rpdml0eVRva2VuKCkpKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOworICAg IHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6QWRkVHJhbnNhY3Rpb25DYWxs YmFja0lEKG1fY2FsbGJhY2tzLnB1dChXVEZNb3ZlKGNhbGxiYWNrRnVuY3Rpb24pLCBwcm9jZXNz KCkudGhyb3R0bGVyKCkuYmFja2dyb3VuZEFjdGl2aXR5VG9rZW4oKSkpLCBtX3dlYlBhZ2VQcm94 eS5wYWdlSUQoKSk7CiB9CiAKIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6 aGlkZUNvbnRlbnRVbnRpbFBlbmRpbmdVcGRhdGUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAKaW5kZXggZjE5OGE4MTUzM2YuLmZmNzZkOWY3Zjk3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHku Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAK QEAgLTEwMCw3ICsxMDAsOSBAQCBTdXNwZW5kZWRQYWdlUHJveHk6On5TdXNwZW5kZWRQYWdlUHJv eHkoKQogICAgIC8vIElmIHRoZSBzdXNwZW5kZWQgcGFnZSB3YXMgbm90IGNvbnN1bWVkIGJlZm9y ZSBnZXR0aW5nIGRlc3Ryb3llZCwgdGhlbiBjbG9zZSB0aGUgY29ycmVzcG9uZGluZyBwYWdlCiAg ICAgLy8gb24gdGhlIFdlYlByb2Nlc3Mgc2lkZS4KICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2U6OkNsb3NlKCksIG1fcGFnZS5wYWdlSUQoKSk7Ci0gICAgbV9wcm9jZXNzLT5y ZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2Vp dmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAgaWYgKG1fc3VzcGVuc2lvblN0YXRl ID09IFN1c3BlbnNpb25TdGF0ZTo6U3VzcGVuZGluZykKKyAgICAgICAgbV9wcm9jZXNzLT5yZW1v dmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVy TmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOwogCiAgICAgLy8gV2UgY2FsbCBtYXliZVNodXREb3du KCkgYXN5bmNocm9ub3VzbHkgc2luY2UgdGhlIFN1c3BlbmRlZFBhZ2UgaXMgY3VycmVudGx5IGJl aW5nIHJlbW92ZWQgZnJvbSB0aGUgV2ViUHJvY2Vzc1Bvb2wKICAgICAvLyBhbmQgd2Ugd2FudCB0 byBhdm9pZCByZS1lbnRlcmluZyBXZWJQcm9jZXNzUG9vbCBtZXRob2RzLgpAQCAtMTM0LDcgKzEz Niw2IEBAIHZvaWQgU3VzcGVuZGVkUGFnZVByb3h5Ojp1bnN1c3BlbmQoKQogICAgIEFTU0VSVCht X3N1c3BlbnNpb25TdGF0ZSA9PSBTdXNwZW5zaW9uU3RhdGU6OlN1c3BlbmRlZCk7CiAKICAgICBt X3N1c3BlbnNpb25TdGF0ZSA9IFN1c3BlbnNpb25TdGF0ZTo6UmVzdW1lZDsKLSAgICBtX3Byb2Nl c3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdl UmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CiAgICAgbV9wcm9jZXNzLT5zZW5kKE1l c3NhZ2VzOjpXZWJQYWdlOjpTZXRJc1N1c3BlbmRlZChmYWxzZSksIG1fcGFnZS5wYWdlSUQoKSk7 CiB9CiAKQEAgLTE1MSw2ICsxNTIsOCBAQCB2b2lkIFN1c3BlbmRlZFBhZ2VQcm94eTo6ZGlkUHJv Y2Vzc1JlcXVlc3RUb1N1c3BlbmQoU3VzcGVuc2lvblN0YXRlIG5ld1N1c3BlbnNpbwogICAgIG1f c3VzcGVuc2lvblRva2VuID0gbnVsbHB0cjsKICNlbmRpZgogCisgICAgbV9wcm9jZXNzLT5yZW1v dmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVy TmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCiAgICAgaWYgKG1fcmVhZHlUb1Vuc3VzcGVuZEhh bmRsZXIpCiAgICAgICAgIG1fcmVhZHlUb1Vuc3VzcGVuZEhhbmRsZXIodGhpcyk7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCmluZGV4IGM3N2EyNmI3NDI3Li41 M2M3MTk2YzJhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQ cm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAK QEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJXZWJGcmFtZVByb3h5LmgiCiAKICNpbmNsdWRl ICJBUElOYXZpZ2F0aW9uLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNp bmNsdWRlICJXZWJDZXJ0aWZpY2F0ZUluZm8uaCIKICNpbmNsdWRlICJXZWJGcmFtZVBvbGljeUxp c3RlbmVyUHJveHkuaCIKICNpbmNsdWRlICJXZWJQYWdlTWVzc2FnZXMuaCIKQEAgLTc0LDcgKzc1 LDcgQEAgYm9vbCBXZWJGcmFtZVByb3h5Ojppc01haW5GcmFtZSgpIGNvbnN0CiAgICAgaWYgKCFt X3BhZ2UpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHJldHVybiB0aGlzID09IG1fcGFn ZS0+bWFpbkZyYW1lKCk7CisgICAgcmV0dXJuIHRoaXMgPT0gbV9wYWdlLT5tYWluRnJhbWUoKSB8 fCAobV9wYWdlLT5wcm92aXNpb25hbFBhZ2VQcm94eSgpICYmIHRoaXMgPT0gbV9wYWdlLT5wcm92 aXNpb25hbFBhZ2VQcm94eSgpLT5tYWluRnJhbWUoKSk7CiB9CiAKIHZvaWQgV2ViRnJhbWVQcm94 eTo6bG9hZFVSTChjb25zdCBVUkwmIHVybCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCmluZGV4IDBjOGE2ODc2ZjI1Li5mYTNmMjk2YzRiMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC03Nyw2ICs3Nyw3IEBACiAjaW5jbHVkZSAi UGx1Z2luSW5mb3JtYXRpb24uaCIKICNpbmNsdWRlICJQbHVnaW5Qcm9jZXNzTWFuYWdlci5oIgog I2luY2x1ZGUgIlByaW50SW5mby5oIgorI2luY2x1ZGUgIlByb3Zpc2lvbmFsUGFnZVByb3h5Lmgi CiAjaW5jbHVkZSAiU2FmZUJyb3dzaW5nV2FybmluZy5oIgogI2luY2x1ZGUgIlNoYXJlU2hlZXRD YWxsYmFja0lELmgiCiAjaW5jbHVkZSAiU2hhcmVkQnVmZmVyRGF0YVJlZmVyZW5jZS5oIgpAQCAt MjM3LDcgKzIzOCw5IEBACiAjZGVmaW5lIE1FUkdFX1dIRUVMX0VWRU5UUyAxCiAKICNkZWZpbmUg TUVTU0FHRV9DSEVDSyhhc3NlcnRpb24pIE1FU1NBR0VfQ0hFQ0tfQkFTRShhc3NlcnRpb24sIG1f cHJvY2Vzcy0+Y29ubmVjdGlvbigpKQorI2RlZmluZSBNRVNTQUdFX0NIRUNLX1NIQVJFRChhc3Nl cnRpb24pIE1FU1NBR0VfQ0hFQ0tfQkFTRShhc3NlcnRpb24sIHByb2Nlc3MuY29ubmVjdGlvbigp KQogI2RlZmluZSBNRVNTQUdFX0NIRUNLX1VSTCh1cmwpIE1FU1NBR0VfQ0hFQ0tfQkFTRShjaGVj a1VSTFJlY2VpdmVkRnJvbUN1cnJlbnRPclByZXZpb3VzV2ViUHJvY2Vzcyh1cmwpLCBtX3Byb2Nl c3MtPmNvbm5lY3Rpb24oKSkKKyNkZWZpbmUgTUVTU0FHRV9DSEVDS19VUkxfU0hBUkVEKHVybCkg TUVTU0FHRV9DSEVDS19CQVNFKGNoZWNrVVJMUmVjZWl2ZWRGcm9tQ3VycmVudE9yUHJldmlvdXNX ZWJQcm9jZXNzKHVybCksIHByb2Nlc3MuY29ubmVjdGlvbigpKQogCiAjZGVmaW5lIFJFTEVBU0Vf TE9HX0lGX0FMTE9XRUQoY2hhbm5lbCwgZm10LCAuLi4pIFJFTEVBU0VfTE9HX0lGKGlzQWx3YXlz T25Mb2dnaW5nQWxsb3dlZCgpLCBjaGFubmVsLCAiJXAgLSBXZWJQYWdlUHJveHk6OiIgZm10LCB0 aGlzLCAjI19fVkFfQVJHU19fKQogCkBAIC03NjgsMzggKzc3MSwyNiBAQCBib29sIFdlYlBhZ2VQ cm94eTo6c3VzcGVuZEN1cnJlbnRQYWdlSWZQb3NzaWJsZShBUEk6Ok5hdmlnYXRpb24mIG5hdmln YXRpb24sIE9wdAogICAgIHJldHVybiB0cnVlOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6c3dh cFRvV2ViUHJvY2VzcyhSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIHN0ZDo6dW5pcXVl X3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLCBJc1N3 YXBGcm9tU3VzcGVuZGVkIGlzU3dhcEZyb21TdXNwZW5kZWQpCit2b2lkIFdlYlBhZ2VQcm94eTo6 c3dhcFRvV2ViUHJvY2VzcyhSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIHN0ZDo6dW5p cXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmIGRyYXdpbmdBcmVhLCBSZWZQdHI8V2ViRnJhbWVQ cm94eT4mJiBtYWluRnJhbWUpCiB7CiAgICAgQVNTRVJUKCFtX2lzQ2xvc2VkKTsKICAgICBSRUxF QVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJzd2FwVG9XZWJQcm9jZXNzOiB3ZWJQSUQgPSAl aSwgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1f cGFnZUlEKTsKIAogICAgIG1fcHJvY2VzcyA9IFdURk1vdmUocHJvY2Vzcyk7CisgICAgQVNTRVJU KCFtX2RyYXdpbmdBcmVhKTsKKyAgICBzZXREcmF3aW5nQXJlYShXVEZNb3ZlKGRyYXdpbmdBcmVh KSk7CisgICAgQVNTRVJUKCFtX21haW5GcmFtZSk7CisgICAgbV9tYWluRnJhbWUgPSBXVEZNb3Zl KG1haW5GcmFtZSk7CiAgICAgbV9pc1ZhbGlkID0gdHJ1ZTsKIAotICAgIC8vIElmIHdlIGFyZSBy ZWF0dGFjaGluZyB0byBhIFN1c3BlbmRlZFBhZ2UsIHRoZW4gdGhlIFdlYlByb2Nlc3MnIFdlYlBh Z2UgYWxyZWFkeSBleGlzdHMgYW5kCi0gICAgLy8gV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVNYWlu RnJhbWUoKSB3aWxsIG5vdCBiZSBjYWxsZWQgdG8gaW5pdGlhbGl6ZSBtX21haW5GcmFtZS4gSW4g c3VjaAotICAgIC8vIGNhc2UsIHdlIG5lZWQgdG8gaW5pdGlhbGl6ZSBtX21haW5GcmFtZSB0byBy ZWZsZWN0IHRoZSBmYWN0IHRoZSB0aGUgV2ViUHJvY2VzcycgV2ViUGFnZQotICAgIC8vIGFscmVh ZHkgZXhpc3RzIGFuZCBhbHJlYWR5IGhhcyBhIG1haW4gZnJhbWUuCi0gICAgaWYgKGRlc3RpbmF0 aW9uU3VzcGVuZGVkUGFnZSkgewotICAgICAgICBpZiAoIWRlc3RpbmF0aW9uU3VzcGVuZGVkUGFn ZS0+ZmFpbGVkVG9TdXNwZW5kKCkpIHsKLSAgICAgICAgICAgIEFTU0VSVCghbV9tYWluRnJhbWUp OwotICAgICAgICAgICAgQVNTRVJUKCZkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPnByb2Nlc3Mo KSA9PSBtX3Byb2Nlc3MucHRyKCkpOwotICAgICAgICAgICAgZGVzdGluYXRpb25TdXNwZW5kZWRQ YWdlLT51bnN1c3BlbmQoKTsKLSAgICAgICAgICAgIG1fbWFpbkZyYW1lID0gV2ViRnJhbWVQcm94 eTo6Y3JlYXRlKCp0aGlzLCBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPm1haW5GcmFtZUlEKCkp OwotICAgICAgICAgICAgbV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQoZGVzdGluYXRpb25TdXNwZW5k ZWRQYWdlLT5tYWluRnJhbWVJRCgpLCAqbV9tYWluRnJhbWUpOwotICAgICAgICB9IGVsc2Ugewot ICAgICAgICAgICAgLy8gV2UgZmFpbGVkIHRvIHN1c3BlbmQgdGhlIHBhZ2Ugc28gZGVzdHJveSBp dCBub3cgYW5kIG1lcmVseSByZXVzZSBpdHMgV2ViQ29udGVudCBwcm9jZXNzLgotICAgICAgICAg ICAgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlID0gbnVsbHB0cjsKLSAgICAgICAgfQotICAgIH0K LQogICAgIG1fcHJvY2Vzcy0+YWRkRXhpc3RpbmdXZWJQYWdlKCp0aGlzLCBtX3BhZ2VJRCwgV2Vi UHJvY2Vzc1Byb3h5OjpCZWdpbnNVc2luZ0RhdGFTdG9yZTo6Tm8pOwogICAgIG1fcHJvY2Vzcy0+ YWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZl ck5hbWUoKSwgbV9wYWdlSUQsICp0aGlzKTsKIAotICAgIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJv Y2Vzcyhpc1N3YXBGcm9tU3VzcGVuZGVkKTsKKyAgICAvLyBObyBuZWVkIHRvIGluaXRpYWxpemUg dGhlIFdlYlBhZ2Ugc2luY2UgaXQgd2FzIGNyZWF0ZWQgd2hlbiB3ZSBjcmVhdGVkIHRoZSBQcm92 aXNpb25hbFBhZ2VQcm94eS4KKyAgICBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoU2hvdWxk SW5pdGlhbGl6ZVdlYlBhZ2U6Ok5vKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmZpbmlzaEF0 dGFjaGluZ1RvV2ViUHJvY2VzcyhJc1N3YXBGcm9tU3VzcGVuZGVkIGlzU3dhcEZyb21TdXNwZW5k ZWQpCit2b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKFNob3Vs ZEluaXRpYWxpemVXZWJQYWdlIHNob3VsZEluaXRpYWxpemVQYWdlKQogewogICAgIEFTU0VSVCht X3Byb2Nlc3MtPnN0YXRlKCkgIT0gQ2hpbGRQcm9jZXNzUHJveHk6OlN0YXRlOjpUZXJtaW5hdGVk KTsKIApAQCAtODM1LDcgKzgyNiw4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hp bmdUb1dlYlByb2Nlc3MoSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzCiAgICAgbV9l ZGl0YWJsZUltYWdlQ29udHJvbGxlciA9IHN0ZDo6bWFrZV91bmlxdWU8RWRpdGFibGVJbWFnZUNv bnRyb2xsZXI+KCp0aGlzKTsKICNlbmRpZgogCi0gICAgaW5pdGlhbGl6ZVdlYlBhZ2UoaXNTd2Fw RnJvbVN1c3BlbmRlZCk7CisgICAgaWYgKHNob3VsZEluaXRpYWxpemVQYWdlID09IFNob3VsZElu aXRpYWxpemVXZWJQYWdlOjpZZXMpCisgICAgICAgIGluaXRpYWxpemVXZWJQYWdlKCk7CiAKICAg ICBtX2luc3BlY3Rvci0+dXBkYXRlRm9yTmV3UGFnZVByb2Nlc3ModGhpcyk7CiAKQEAgLTkwMCwx MiArODkyLDExIEBAIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6cmVhdHRh Y2hUb1dlYlByb2Nlc3NXaXRoSXRlbShXZWJCYWNrRm9yd2FyCiAgICAgcmV0dXJuIFdURk1vdmUo bmF2aWdhdGlvbik7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZShJ c1N3YXBGcm9tU3VzcGVuZGVkIGlzU3dhcEZyb21TdXNwZW5kZWQpCit2b2lkIFdlYlBhZ2VQcm94 eTo6c2V0RHJhd2luZ0FyZWEoc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+JiYgZHJh d2luZ0FyZWEpCiB7Ci0gICAgQVNTRVJUKGlzVmFsaWQoKSk7Ci0KLSAgICBtX2RyYXdpbmdBcmVh ID0gcGFnZUNsaWVudCgpLmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKLSAgICBBU1NFUlQobV9k cmF3aW5nQXJlYSk7CisgICAgbV9kcmF3aW5nQXJlYSA9IFdURk1vdmUoZHJhd2luZ0FyZWEpOwor ICAgIGlmICghbV9kcmF3aW5nQXJlYSkKKyAgICAgICAgcmV0dXJuOwogCiAjaWYgRU5BQkxFKEFT WU5DX1NDUk9MTElORykgJiYgUExBVEZPUk0oQ09DT0EpCiAgICAgaWYgKG1fZHJhd2luZ0FyZWEt PnR5cGUoKSA9PSBEcmF3aW5nQXJlYVR5cGVSZW1vdGVMYXllclRyZWUpIHsKQEAgLTkxNiwxNSAr OTA3LDE2IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZShJc1N3YXBGcm9t U3VzcGVuZGVkIGlzU3dhcEZyb21TdXNwZW5kZWQpCiAjZW5kaWYKICAgICB9CiAjZW5kaWYKK30K IAotICAgIGF1dG8gcGFyYW1ldGVycyA9IGNyZWF0aW9uUGFyYW1ldGVycygpOwotICAgIHBhcmFt ZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCA9IGlzU3dhcEZyb21TdXNwZW5kZWQgPT0gSXNTd2Fw RnJvbVN1c3BlbmRlZDo6WWVzOwordm9pZCBXZWJQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdl KCkKK3sKKyAgICBBU1NFUlQoaXNWYWxpZCgpKTsKIAotI2lmIEVOQUJMRShTRVJWSUNFX1dPUktF UikKLSAgICBwYXJhbWV0ZXJzLmhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyA9IHByb2Nlc3Mo KS5wcm9jZXNzUG9vbCgpLm1heUhhdmVSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMobV93ZWJzaXRl RGF0YVN0b3JlKTsKLSNlbmRpZgorICAgIHNldERyYXdpbmdBcmVhKHBhZ2VDbGllbnQoKS5jcmVh dGVEcmF3aW5nQXJlYVByb3h5KG1fcHJvY2VzcykpOworICAgIEFTU0VSVChtX2RyYXdpbmdBcmVh KTsKIAotICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpDcmVhdGVXZWJQ YWdlKG1fcGFnZUlELCBwYXJhbWV0ZXJzKSwgMCk7CisgICAgcHJvY2VzcygpLnNlbmQoTWVzc2Fn ZXM6OldlYlByb2Nlc3M6OkNyZWF0ZVdlYlBhZ2UobV9wYWdlSUQsIGNyZWF0aW9uUGFyYW1ldGVy cyhtX3Byb2Nlc3MpKSwgMCk7CiAKICAgICBtX25lZWRzVG9GaW5pc2hJbml0aWFsaXppbmdXZWJQ YWdlQWZ0ZXJQcm9jZXNzTGF1bmNoID0gdHJ1ZTsKICAgICBmaW5pc2hJbml0aWFsaXppbmdXZWJQ YWdlQWZ0ZXJQcm9jZXNzTGF1bmNoKCk7CkBAIC0xMDM0LDEyICsxMDI2LDEyIEBAIGJvb2wgV2Vi UGFnZVByb3h5Ojp0cnlDbG9zZSgpCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIFdlYlBh Z2VQcm94eTo6bWF5YmVJbml0aWFsaXplU2FuZGJveEV4dGVuc2lvbkhhbmRsZShjb25zdCBVUkwm IHVybCwgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJiBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKQor Ym9vbCBXZWJQYWdlUHJveHk6Om1heWJlSW5pdGlhbGl6ZVNhbmRib3hFeHRlbnNpb25IYW5kbGUo V2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzLCBjb25zdCBVUkwmIHVybCwgU2FuZGJveEV4dGVuc2lv bjo6SGFuZGxlJiBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKQogewogICAgIGlmICghdXJsLmlzTG9j YWxGaWxlKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmIChtX3Byb2Nlc3MtPmhh c0Fzc3VtZWRSZWFkQWNjZXNzVG9VUkwodXJsKSkKKyAgICBpZiAocHJvY2Vzcy5oYXNBc3N1bWVk UmVhZEFjY2Vzc1RvVVJMKHVybCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIElu c3BlY3RvciByZXNvdXJjZXMgYXJlIGluIGEgZGlyZWN0b3J5IHdpdGggYXNzdW1lZCBhY2Nlc3Mu CkBAIC0xMDYzLDIwICsxMDU1LDIxIEBAIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQ cm94eTo6bG9hZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgU2hvCiAgICAgUkVM RUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAibG9hZFJlcXVlc3Q6IHdlYlBJRCA9ICVpLCBw YWdlSUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdl SUQpOwogCiAgICAgYXV0byBuYXZpZ2F0aW9uID0gbV9uYXZpZ2F0aW9uU3RhdGUtPmNyZWF0ZUxv YWRSZXF1ZXN0TmF2aWdhdGlvbihSZXNvdXJjZVJlcXVlc3QocmVxdWVzdCksIG1fYmFja0Zvcndh cmRMaXN0LT5jdXJyZW50SXRlbSgpKTsKLSAgICBsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKG5h dmlnYXRpb24uZ2V0KCksIFdURk1vdmUocmVxdWVzdCksIHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQ b2xpY3ksIHVzZXJEYXRhLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6Ok5vKTsKKyAgICBs b2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uU2hhcmVkKG1fcHJvY2VzcywgbmF2aWdhdGlvbi5nZXQo KSwgV1RGTW92ZShyZXF1ZXN0KSwgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgdXNlckRh dGEsIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6Tm8pOwogICAgIHJldHVybiBXVEZNb3Zl KG5hdmlnYXRpb24pOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3RXaXRoTmF2 aWdhdGlvbihBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIFJlc291cmNlUmVxdWVzdCYmIHJl cXVlc3QsIFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3kgc2hvdWxkT3BlbkV4dGVybmFsVVJM c1BvbGljeSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xv YWQgc2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNE YXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3ZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdp dGhOYXZpZ2F0aW9uU2hhcmVkKFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcywgQVBJOjpOYXZpZ2F0 aW9uJiBuYXZpZ2F0aW9uLCBSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBTaG91bGRPcGVuRXh0 ZXJuYWxVUkxzUG9saWN5IHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0 KiB1c2VyRGF0YSwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkIHNob3VsZFRyZWF0QXNDb250 aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNp ZXMpCiB7CiAgICAgQVNTRVJUKCFtX2lzQ2xvc2VkKTsKIAotICAgIFJFTEVBU0VfTE9HX0lGX0FM TE9XRUQoTG9hZGluZywgImxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb246IHdlYlBJRCA9ICVpLCBw YWdlSUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdl SUQpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImxvYWRSZXF1ZXN0V2l0 aE5hdmlnYXRpb246IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQsIHByb2Nlc3MucHJv Y2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQpOwogCiAgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1f cGFnZUxvYWRTdGF0ZS50cmFuc2FjdGlvbigpOwogCiAgICAgYXV0byB1cmwgPSByZXF1ZXN0LnVy bCgpOwotICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFuc2Fj dGlvbiwgdXJsKTsKKyAgICBpZiAoc2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkICE9IFNob3Vs ZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzKQorICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0 UGVuZGluZ0FQSVJlcXVlc3RVUkwodHJhbnNhY3Rpb24sIHVybCk7CiAKICAgICBpZiAoIWlzVmFs aWQoKSkKICAgICAgICAgcmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsKQEAgLTEwODUsMTkgKzEwNzgs MTkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb24oQVBJOjpO YXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBSZXNvdXIKICAgICBsb2FkUGFyYW1ldGVycy5uYXZpZ2F0 aW9uSUQgPSBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpOwogICAgIGxvYWRQYXJhbWV0ZXJzLnJl cXVlc3QgPSBXVEZNb3ZlKHJlcXVlc3QpOwogICAgIGxvYWRQYXJhbWV0ZXJzLnNob3VsZE9wZW5F eHRlcm5hbFVSTHNQb2xpY3kgPSAodWludDY0X3Qpc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGlj eTsKLSAgICBsb2FkUGFyYW1ldGVycy51c2VyRGF0YSA9IFVzZXJEYXRhKHByb2Nlc3MoKS50cmFu c2Zvcm1PYmplY3RzVG9IYW5kbGVzKHVzZXJEYXRhKS5nZXQoKSk7CisgICAgbG9hZFBhcmFtZXRl cnMudXNlckRhdGEgPSBVc2VyRGF0YShwcm9jZXNzLnRyYW5zZm9ybU9iamVjdHNUb0hhbmRsZXMo dXNlckRhdGEpLmdldCgpKTsKICAgICBsb2FkUGFyYW1ldGVycy5zaG91bGRUcmVhdEFzQ29udGlu dWluZ0xvYWQgPSBzaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQgPT0gU2hvdWxkVHJlYXRBc0Nv bnRpbnVpbmdMb2FkOjpZZXM7CiAgICAgbG9hZFBhcmFtZXRlcnMud2Vic2l0ZVBvbGljaWVzID0g V1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpOwogICAgIGxvYWRQYXJhbWV0ZXJzLmxvY2tIaXN0b3J5 ID0gbmF2aWdhdGlvbi5sb2NrSGlzdG9yeSgpOwogICAgIGxvYWRQYXJhbWV0ZXJzLmxvY2tCYWNr Rm9yd2FyZExpc3QgPSBuYXZpZ2F0aW9uLmxvY2tCYWNrRm9yd2FyZExpc3QoKTsKICAgICBsb2Fk UGFyYW1ldGVycy5jbGllbnRSZWRpcmVjdFNvdXJjZUZvckhpc3RvcnkgPSBuYXZpZ2F0aW9uLmNs aWVudFJlZGlyZWN0U291cmNlRm9ySGlzdG9yeSgpOwotICAgIGJvb2wgY3JlYXRlZEV4dGVuc2lv biA9IG1heWJlSW5pdGlhbGl6ZVNhbmRib3hFeHRlbnNpb25IYW5kbGUodXJsLCBsb2FkUGFyYW1l dGVycy5zYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsKKyAgICBib29sIGNyZWF0ZWRFeHRlbnNpb24g PSBtYXliZUluaXRpYWxpemVTYW5kYm94RXh0ZW5zaW9uSGFuZGxlKHByb2Nlc3MsIHVybCwgbG9h ZFBhcmFtZXRlcnMuc2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7CiAgICAgaWYgKGNyZWF0ZWRFeHRl bnNpb24pCi0gICAgICAgIHdpbGxBY3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5z aW9uKCk7CisgICAgICAgIHdpbGxBY3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5z aW9uKHByb2Nlc3MpOwogICAgIGFkZFBsYXRmb3JtTG9hZFBhcmFtZXRlcnMobG9hZFBhcmFtZXRl cnMpOwogCi0gICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpMb2FkUmVxdWVz dChsb2FkUGFyYW1ldGVycyksIG1fcGFnZUlEKTsKLSAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVu ZXNzVGltZXIoKS5zdGFydCgpOworICAgIHByb2Nlc3Muc2VuZChNZXNzYWdlczo6V2ViUGFnZTo6 TG9hZFJlcXVlc3QobG9hZFBhcmFtZXRlcnMpLCBtX3BhZ2VJRCk7CisgICAgcHJvY2Vzcy5yZXNw b25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKIH0KIAogUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4g V2ViUGFnZVByb3h5Ojpsb2FkRmlsZShjb25zdCBTdHJpbmcmIGZpbGVVUkxTdHJpbmcsIGNvbnN0 IFN0cmluZyYgcmVzb3VyY2VEaXJlY3RvcnlVUkxTdHJpbmcsIEFQSTo6T2JqZWN0KiB1c2VyRGF0 YSkKQEAgLTExNjIsMTMgKzExNTUsMTMgQEAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gV2ViUGFn ZVByb3h5Ojpsb2FkRGF0YShjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEsIGMKICAgICB9 CiAKICAgICBhdXRvIG5hdmlnYXRpb24gPSBtX25hdmlnYXRpb25TdGF0ZS0+Y3JlYXRlTG9hZERh dGFOYXZpZ2F0aW9uKHN0ZDo6bWFrZV91bmlxdWU8QVBJOjpTdWJzdGl0dXRlRGF0YT4oZGF0YS52 ZWN0b3IoKSwgTUlNRVR5cGUsIGVuY29kaW5nLCBiYXNlVVJMLCB1c2VyRGF0YSkpOwotICAgIGxv YWREYXRhV2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgZGF0YSwgTUlNRVR5cGUsIGVuY29kaW5n LCBiYXNlVVJMLCB1c2VyRGF0YSwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpObyk7Cisg ICAgbG9hZERhdGFXaXRoTmF2aWdhdGlvblNoYXJlZChtX3Byb2Nlc3MsIG5hdmlnYXRpb24sIGRh dGEsIE1JTUVUeXBlLCBlbmNvZGluZywgYmFzZVVSTCwgdXNlckRhdGEsIFNob3VsZFRyZWF0QXND b250aW51aW5nTG9hZDo6Tm8pOwogICAgIHJldHVybiBXVEZNb3ZlKG5hdmlnYXRpb24pOwogfQog Ci12b2lkIFdlYlBhZ2VQcm94eTo6bG9hZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRp b24mIG5hdmlnYXRpb24sIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgZGF0YSwgY29uc3QgU3Ry aW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNl VVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCBz aG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+ JiYgd2Vic2l0ZVBvbGljaWVzKQordm9pZCBXZWJQYWdlUHJveHk6OmxvYWREYXRhV2l0aE5hdmln YXRpb25TaGFyZWQoV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzLCBBUEk6Ok5hdmlnYXRpb24mIG5h dmlnYXRpb24sIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgZGF0YSwgY29uc3QgU3RyaW5nJiBN SU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBB UEk6Ok9iamVjdCogdXNlckRhdGEsIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCBzaG91bGRU cmVhdEFzQ29udGludWluZ0xvYWQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vi c2l0ZVBvbGljaWVzKQogewotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImxv YWREYXRhV2l0aE5hdmlnYXRpb246IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQsIG1f cHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQpOworICAgIFJFTEVBU0VfTE9H X0lGX0FMTE9XRUQoTG9hZGluZywgImxvYWREYXRhV2l0aE5hdmlnYXRpb246IHdlYlBJRCA9ICVp LCBwYWdlSUQgPSAlIiBQUkl1NjQsIHByb2Nlc3MucHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdl SUQpOwogCiAgICAgQVNTRVJUKCFtX2lzQ2xvc2VkKTsKIApAQCAtMTE4NiwxMyArMTE3OSwxMyBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6bG9hZERhdGFXaXRoTmF2aWdhdGlvbihBUEk6Ok5hdmlnYXRp b24mIG5hdmlnYXRpb24sIGNvbnN0IElQQwogICAgIGxvYWRQYXJhbWV0ZXJzLmVuY29kaW5nTmFt ZSA9IGVuY29kaW5nOwogICAgIGxvYWRQYXJhbWV0ZXJzLmJhc2VVUkxTdHJpbmcgPSBiYXNlVVJM OwogICAgIGxvYWRQYXJhbWV0ZXJzLnNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCA9IHNob3Vs ZFRyZWF0QXNDb250aW51aW5nTG9hZCA9PSBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6Olll czsKLSAgICBsb2FkUGFyYW1ldGVycy51c2VyRGF0YSA9IFVzZXJEYXRhKHByb2Nlc3MoKS50cmFu c2Zvcm1PYmplY3RzVG9IYW5kbGVzKHVzZXJEYXRhKS5nZXQoKSk7CisgICAgbG9hZFBhcmFtZXRl cnMudXNlckRhdGEgPSBVc2VyRGF0YShwcm9jZXNzLnRyYW5zZm9ybU9iamVjdHNUb0hhbmRsZXMo dXNlckRhdGEpLmdldCgpKTsKICAgICBsb2FkUGFyYW1ldGVycy53ZWJzaXRlUG9saWNpZXMgPSBX VEZNb3ZlKHdlYnNpdGVQb2xpY2llcyk7CiAgICAgYWRkUGxhdGZvcm1Mb2FkUGFyYW1ldGVycyhs b2FkUGFyYW1ldGVycyk7CiAKLSAgICBtX3Byb2Nlc3MtPmFzc3VtZVJlYWRBY2Nlc3NUb0Jhc2VV UkwoKnRoaXMsIGJhc2VVUkwpOwotICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6TG9hZERhdGEobG9hZFBhcmFtZXRlcnMpLCBtX3BhZ2VJRCk7Ci0gICAgbV9wcm9jZXNzLT5y ZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKKyAgICBwcm9jZXNzLmFzc3VtZVJlYWRBY2Nl c3NUb0Jhc2VVUkwoKnRoaXMsIGJhc2VVUkwpOworICAgIHByb2Nlc3Muc2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6TG9hZERhdGEobG9hZFBhcmFtZXRlcnMpLCBtX3BhZ2VJRCk7CisgICAgcHJvY2Vz cy5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6 OmxvYWRBbHRlcm5hdGVIVE1MKGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgaHRtbERhdGEsIGNv bnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFVSTCYgYmFzZVVSTCwgY29uc3QgVVJMJiB1bnJl YWNoYWJsZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKQpAQCAtMTI5NCw2ICsxMjg3LDEwIEBA IHZvaWQgV2ViUGFnZVByb3h5OjpzdG9wTG9hZGluZygpCiAgICAgfQogCiAgICAgbV9wcm9jZXNz LT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTdG9wTG9hZGluZygpLCBtX3BhZ2VJRCk7CisgICAg aWYgKG1fcHJvdmlzaW9uYWxQYWdlKSB7CisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5jYW5j ZWwoKTsKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBudWxscHRyOworICAgIH0KICAgICBt X3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS5zdGFydCgpOwogfQogCkBAIC0xMzA5LDkg KzEzMDYsOSBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OnJlbG9hZChP cHRpb25TZXQ8V2ViQ29yZTo6UmVsb2FkT3B0aW9uPiBvcAogICAgICAgICBtX3BhZ2VMb2FkU3Rh dGUuc2V0UGVuZGluZ0FQSVJlcXVlc3RVUkwodHJhbnNhY3Rpb24sIHVybCk7CiAKICAgICAgICAg Ly8gV2UgbWF5IG5vdCBoYXZlIGFuIGV4dGVuc2lvbiB5ZXQgaWYgYmFjay9mb3J3YXJkIGxpc3Qg d2FzIHJlaW5zdGF0ZWQgYWZ0ZXIgYSBXZWJQcm9jZXNzIGNyYXNoIG9yIGEgYnJvd3NlciByZWxh dW5jaAotICAgICAgICBib29sIGNyZWF0ZWRFeHRlbnNpb24gPSBtYXliZUluaXRpYWxpemVTYW5k Ym94RXh0ZW5zaW9uSGFuZGxlKFVSTChVUkwoKSwgdXJsKSwgc2FuZGJveEV4dGVuc2lvbkhhbmRs ZSk7CisgICAgICAgIGJvb2wgY3JlYXRlZEV4dGVuc2lvbiA9IG1heWJlSW5pdGlhbGl6ZVNhbmRi b3hFeHRlbnNpb25IYW5kbGUobV9wcm9jZXNzLCBVUkwoVVJMKCksIHVybCksIHNhbmRib3hFeHRl bnNpb25IYW5kbGUpOwogICAgICAgICBpZiAoY3JlYXRlZEV4dGVuc2lvbikKLSAgICAgICAgICAg IHdpbGxBY3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5zaW9uKCk7CisgICAgICAg ICAgICB3aWxsQWNxdWlyZVVuaXZlcnNhbEZpbGVSZWFkU2FuZGJveEV4dGVuc2lvbihtX3Byb2Nl c3MpOwogICAgIH0KIAogICAgIGlmICghaXNWYWxpZCgpKQpAQCAtMjY5OCw3ICsyNjk1LDcgQEAg dm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uKFdlYlBv bGljeUFjdGlvbiBwb2xpY3lBY3Rpb24KICAgICAgICAgfQogCiAgICAgICAgIGlmIChwcm9jZXNz Rm9yTmF2aWdhdGlvbi5wdHIoKSAhPSAmcHJvY2VzcygpKSB7Ci0gICAgICAgICAgICBwb2xpY3lB Y3Rpb24gPSBpc1BhZ2VPcGVuZWRCeURPTVNob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpID8g V2ViUG9saWN5QWN0aW9uOjpJZ25vcmUgOiBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQ7CisgICAg ICAgICAgICBwb2xpY3lBY3Rpb24gPSBXZWJQb2xpY3lBY3Rpb246Oklnbm9yZTsKICAgICAgICAg ICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiZGVjaWRlUG9saWN5 Rm9yTmF2aWdhdGlvbkFjdGlvbiwgc3dhcHBpbmcgcHJvY2VzcyAlaSB3aXRoIHByb2Nlc3MgJWkg Zm9yIG5hdmlnYXRpb24sIHJlYXNvbjogJXtwdWJsaWN9cyIsIHByb2Nlc3NJZGVudGlmaWVyKCks IHByb2Nlc3NGb3JOYXZpZ2F0aW9uLT5wcm9jZXNzSWRlbnRpZmllcigpLCByZWFzb24udXRmOCgp LmRhdGEoKSk7CiAgICAgICAgICAgICBMT0coUHJvY2Vzc1N3YXBwaW5nLCAiKFByb2Nlc3NTd2Fw cGluZykgU3dpdGNoaW5nIGZyb20gcHJvY2VzcyAlaSB0byBuZXcgcHJvY2VzcyAoJWkpIGZvciBu YXZpZ2F0aW9uICUiIFBSSXU2NCAiICclcyciLCBwcm9jZXNzSWRlbnRpZmllcigpLCBwcm9jZXNz Rm9yTmF2aWdhdGlvbi0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbmF2aWdhdGlvbi0+bmF2aWdhdGlv bklEKCksIG5hdmlnYXRpb24tPmxvZ2dpbmdTdHJpbmcoKSk7CiAgICAgICAgIH0gZWxzZQpAQCAt MjcwNyw4ICsyNzA0LDE0IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZE5hdmlnYXRpb25Q b2xpY3lEZWNpc2lvbihXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uCiAgICAgICAgIGJvb2wg c2hvdWxkUHJvY2Vzc1N3YXAgPSBwcm9jZXNzRm9yTmF2aWdhdGlvbi5wdHIoKSAhPSAmcHJvY2Vz cygpOwogICAgICAgICByZWNlaXZlZFBvbGljeURlY2lzaW9uKHBvbGljeUFjdGlvbiwgbmF2aWdh dGlvbi5wdHIoKSwgc2hvdWxkUHJvY2Vzc1N3YXAgPyBXVEY6Om51bGxvcHQgOiBXVEZNb3ZlKGRh dGEpLCBXVEZNb3ZlKHNlbmRlcikpOwogCi0gICAgICAgIGlmIChzaG91bGRQcm9jZXNzU3dhcCkK LSAgICAgICAgICAgIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhuYXZpZ2F0aW9uLCBk ZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UgPyBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS50YWtlU3Vz cGVuZGVkUGFnZSgqZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlKSA6IG51bGxwdHIsIFdURk1vdmUo cHJvY2Vzc0Zvck5hdmlnYXRpb24pLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBXVEZN b3ZlKGRhdGEpKTsKKyAgICAgICAgaWYgKCFzaG91bGRQcm9jZXNzU3dhcCkKKyAgICAgICAgICAg IHJldHVybjsKKworICAgICAgICBhdXRvIHN1c3BlbmRlZFBhZ2UgPSBkZXN0aW5hdGlvblN1c3Bl bmRlZFBhZ2UgPyBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS50YWtlU3VzcGVuZGVkUGFnZSgqZGVz dGluYXRpb25TdXNwZW5kZWRQYWdlKSA6IG51bGxwdHI7CisgICAgICAgIGlmIChzdXNwZW5kZWRQ YWdlICYmIHN1c3BlbmRlZFBhZ2UtPmZhaWxlZFRvU3VzcGVuZCgpKQorICAgICAgICAgICAgc3Vz cGVuZGVkUGFnZSA9IG51bGxwdHI7CisKKyAgICAgICAgY29udGludWVOYXZpZ2F0aW9uSW5OZXdQ cm9jZXNzKG5hdmlnYXRpb24sIFdURk1vdmUoc3VzcGVuZGVkUGFnZSksIFdURk1vdmUocHJvY2Vz c0Zvck5hdmlnYXRpb24pLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBXVEZNb3ZlKGRh dGEpKTsKICAgICB9KTsKIH0KIApAQCAtMjc0NCwyNCArMjc0Nyw0NSBAQCB2b2lkIFdlYlBhZ2VQ cm94eTo6cmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihXZWJQb2xpY3lBY3Rpb24gYWN0aW9uLCBBUEk6 Ok5hdmlnYXRpbwogICAgIHNlbmRlci0+c2VuZChhY3Rpb24sIG5hdmlnYXRpb24gPyBuYXZpZ2F0 aW9uLT5uYXZpZ2F0aW9uSUQoKSA6IDAsIGRvd25sb2FkSUQsIFdURk1vdmUod2Vic2l0ZVBvbGlj aWVzKSk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojpjb250aW51ZU5hdmlnYXRpb25Jbk5ld1By b2Nlc3MoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVu ZGVkUGFnZVByb3h5PiYmIHN1c3BlbmRlZFBhZ2VQcm94eSwgUmVmPFdlYlByb2Nlc3NQcm94eT4m JiBwcm9jZXNzLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVz dGVkQnlDbGllbnQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGlj aWVzKQordm9pZCBXZWJQYWdlUHJveHk6OmNvbW1pdFByb3Zpc2lvbmFsUGFnZSh1aW50NjRfdCBm cmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJv b2wgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHVpbnQzMl90IGZyYW1lTG9hZFR5cGUs IGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYgY2VydGlmaWNhdGVJbmZvLCBib29sIGNv bnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVu dD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCiB7 Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiY29udGludWVOYXZpZ2F0aW9u SW5OZXdQcm9jZXNzOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3Mt PnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKLSAgICBMT0coTG9hZGluZywgIkNvbnRp bnVpbmcgbmF2aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMnIGluIGEgbmV3IHdlYiBwcm9jZXNzIiwg bmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi5sb2dnaW5nU3RyaW5nKCkpOwor ICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFnZSk7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RChMb2FkaW5nLCAiY29tbWl0UHJvdmlzaW9uYWxQYWdlOiBwcmV2aW91c1BJRCA9ICVpLCBuZXdQ SUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVy KCksIG1fcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCkucHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9w YWdlSUQpOwogCi0gICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gcHJldmlvdXNQcm9jZXNzID0gbV9w cm9jZXNzLmNvcHlSZWYoKTsKICAgICBPcHRpb25hbDx1aW50NjRfdD4gbWFpbkZyYW1lSURJblBy ZXZpb3VzUHJvY2VzcyA9IG1fbWFpbkZyYW1lID8gbWFrZU9wdGlvbmFsKG1fbWFpbkZyYW1lLT5m cmFtZUlEKCkpIDogV1RGOjpudWxsb3B0OwotICAgIGF1dG8gbWFpbkZyYW1lVVJMID0gbV9tYWlu RnJhbWUgPyBtX21haW5GcmFtZS0+dXJsKCkgOiBVUkwoKTsKIAotICAgIEFTU0VSVChtX3Byb2Nl c3MucHRyKCkgIT0gcHJvY2Vzcy5wdHIoKSk7CisgICAgQVNTRVJUKG1fcHJvY2Vzcy5wdHIoKSAh PSAmbV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3MoKSk7CiAKICAgICBwcm9jZXNzRGlkVGVybWlu YXRlKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbjo6TmF2aWdhdGlvblN3YXApOwogCiAgICAgbV9w cm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVz c2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2VJRCk7Ci0gICAgYm9vbCBkaWRTdXNwZW5kUHJldmlv dXNQYWdlID0gc3VzcGVuZEN1cnJlbnRQYWdlSWZQb3NzaWJsZShuYXZpZ2F0aW9uLCBtYWluRnJh bWVJREluUHJldmlvdXNQcm9jZXNzLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KTsKKyAg ICBhdXRvKiBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlvbihtX3Byb3Zp c2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkpOworICAgIGJvb2wgZGlkU3VzcGVuZFByZXZpb3Vz UGFnZSA9IG5hdmlnYXRpb24gPyBzdXNwZW5kQ3VycmVudFBhZ2VJZlBvc3NpYmxlKCpuYXZpZ2F0 aW9uLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzLCBtX3Byb3Zpc2lvbmFsUGFnZS0+cHJv Y2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCgpKSA6IGZhbHNlOwogICAgIG1fcHJvY2Vzcy0+cmVt b3ZlV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQsIFdlYlByb2Nlc3NQcm94eTo6RW5kc1VzaW5nRGF0 YVN0b3JlOjpObyk7CiAKLSAgICBzd2FwVG9XZWJQcm9jZXNzKFdURk1vdmUocHJvY2VzcyksIFdU Rk1vdmUoc3VzcGVuZGVkUGFnZVByb3h5KSwgZGlkU3VzcGVuZFByZXZpb3VzUGFnZSA/IElzU3dh cEZyb21TdXNwZW5kZWQ6OlllcyA6IElzU3dhcEZyb21TdXNwZW5kZWQ6Ok5vKTsKKyAgICAvLyBU aGVyZSBpcyBubyB3YXkgd2UnbGwgYmUgYWJsZSB0byByZXR1cm4gdG8gdGhlIHBhZ2UgaW4gdGhl IHByZXZpb3VzIHBhZ2Ugc28gY2xvc2UgaXQuCisgICAgaWYgKCFkaWRTdXNwZW5kUHJldmlvdXNQ YWdlKQorICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNsb3NlKCks IHBhZ2VJRCgpKTsKKworICAgIHN3YXBUb1dlYlByb2Nlc3MobV9wcm92aXNpb25hbFBhZ2UtPnBy b2Nlc3MoKSwgbV9wcm92aXNpb25hbFBhZ2UtPnRha2VEcmF3aW5nQXJlYSgpLCBtX3Byb3Zpc2lv bmFsUGFnZS0+bWFpbkZyYW1lKCkpOworCisgICAgZGlkQ29tbWl0TG9hZEZvckZyYW1lKGZyYW1l SUQsIG5hdmlnYXRpb25JRCwgbWltZVR5cGUsIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVy LCBmcmFtZUxvYWRUeXBlLCBjZXJ0aWZpY2F0ZUluZm8sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQs IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgdXNlckRhdGEpOworCisgICAgbV9wcm92aXNpb25h bFBhZ2UgPSBudWxscHRyOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6Y29udGludWVOYXZpZ2F0 aW9uSW5OZXdQcm9jZXNzKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgc3RkOjp1bmlxdWVf cHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiBzdXNwZW5kZWRQYWdlUHJveHksIFJlZjxXZWJQcm9j ZXNzUHJveHk+JiYgbmV3UHJvY2VzcywgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9j ZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYm IHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcs ICJjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3M6IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAl IiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQpOworICAg IExPRyhMb2FkaW5nLCAiQ29udGludWluZyBuYXZpZ2F0aW9uICUiIFBSSXU2NCAiICclcycgaW4g YSBuZXcgd2ViIHByb2Nlc3MiLCBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBuYXZpZ2F0aW9u LmxvZ2dpbmdTdHJpbmcoKSk7CisKKyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UpIHsKKyAgICAg ICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSAhPSBuYXZpZ2F0aW9uLm5h dmlnYXRpb25JRCgpKQorICAgICAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UtPmNhbmNlbCgpOwor ICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7CisgICAgfQorCisgICAgbV9wcm92 aXNpb25hbFBhZ2UgPSBzdGQ6Om1ha2VfdW5pcXVlPFByb3Zpc2lvbmFsUGFnZVByb3h5PigqdGhp cywgbmV3UHJvY2Vzcy5jb3B5UmVmKCksIFdURk1vdmUoc3VzcGVuZGVkUGFnZVByb3h5KSwgbmF2 aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdElzUmVkaXJl Y3QoKSwgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5 Q2xpZW50KTsKIAogICAgIGlmIChhdXRvKiBpdGVtID0gbmF2aWdhdGlvbi50YXJnZXRJdGVtKCkp IHsKICAgICAgICAgTE9HKExvYWRpbmcsICJXZWJQYWdlUHJveHkgJXAgY29udGludWVOYXZpZ2F0 aW9uSW5OZXdQcm9jZXNzIHRvIGJhY2sgaXRlbSBVUkwgJXMiLCB0aGlzLCBpdGVtLT51cmwoKS51 dGY4KCkuZGF0YSgpKTsKQEAgLTI3NjksNjcgKzI3OTMsMjIgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OmNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRp b24sIHMKICAgICAgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFnZUxvYWRTdGF0ZS50cmFuc2Fj dGlvbigpOwogICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0UGVuZGluZ0FQSVJlcXVlc3RVUkwo dHJhbnNhY3Rpb24sIGl0ZW0tPnVybCgpKTsKIAotICAgICAgICBhdXRvIGl0ZW1TdGF0ZXMgPSBt X2JhY2tGb3J3YXJkTGlzdC0+ZmlsdGVyZWRJdGVtU3RhdGVzKFt0aGlzLCB0YXJnZXRJdGVtID0g aXRlbV0oV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYgaXRlbSkgewotICAgICAgICAgICAgaWYgKGF1 dG8qIHBhZ2UgPSBpdGVtLnN1c3BlbmRlZFBhZ2UoKSkgewotICAgICAgICAgICAgICAgIGlmICgm cGFnZS0+cHJvY2VzcygpID09IG1fcHJvY2Vzcy5wdHIoKSkKLSAgICAgICAgICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgcmV0dXJuICZpdGVtICE9 IHRhcmdldEl0ZW07Ci0gICAgICAgIH0pOwotICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2U6OlVwZGF0ZUJhY2tGb3J3YXJkTGlzdEZvclJlYXR0YWNoKFdURk1vdmUoaXRl bVN0YXRlcykpLCBtX3BhZ2VJRCk7Ci0gICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBp dGVtLT5pdGVtSUQoKSwgKm5hdmlnYXRpb24uYmFja0ZvcndhcmRGcmFtZUxvYWRUeXBlKCksIFNo b3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykp LCBtX3BhZ2VJRCk7Ci0gICAgICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0 YXJ0KCk7Ci0KKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UtPmdvVG9CYWNrRm9yd2FyZEl0ZW0o bmF2aWdhdGlvbiwgKml0ZW0sIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKICAgICBpZiAobV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkg JiYgKG5hdmlnYXRpb24ubG9ja0JhY2tGb3J3YXJkTGlzdCgpID09IExvY2tCYWNrRm9yd2FyZExp c3Q6OlllcyB8fCBuYXZpZ2F0aW9uLmxvY2tIaXN0b3J5KCkgPT0gTG9ja0hpc3Rvcnk6Olllcykp IHsKICAgICAgICAgLy8gSWYgV2ViQ29yZSBpcyBzdXBwb3NlZCB0byBsb2NrIHRoZSBoaXN0b3J5 IGZvciB0aGlzIGxvYWQsIHRoZW4gdGhlIG5ldyBwcm9jZXNzIG5lZWRzIHRvIGtub3cgYWJvdXQg dGhlIGN1cnJlbnQgaGlzdG9yeSBpdGVtIHNvIGl0IGNhbiB1cGRhdGUKICAgICAgICAgLy8gaXQg aW5zdGVhZCBvZiBjcmVhdGluZyBhIG5ldyBvbmUuCi0gICAgICAgIG1fcHJvY2Vzcy0+c2VuZChN ZXNzYWdlczo6V2ViUGFnZTo6U2V0Q3VycmVudEhpc3RvcnlJdGVtRm9yUmVhdHRhY2gobV9iYWNr Rm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCktPml0ZW1TdGF0ZSgpKSwgbV9wYWdlSUQpOworICAg ICAgICBuZXdQcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRDdXJyZW50SGlzdG9y eUl0ZW1Gb3JSZWF0dGFjaChtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKS0+aXRlbVN0 YXRlKCkpLCBtX3BhZ2VJRCk7CiAgICAgfQogCiAgICAgLy8gRklYTUU6IFdvcmsgb3V0IHRpbWlu ZyBvZiByZXNwb25kaW5nIHdpdGggdGhlIGxhc3QgcG9saWN5IGRlbGVnYXRlLCBldGMKICAgICBB U1NFUlQoIW5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKS5pc0VtcHR5KCkpOwogICAgIGlmIChh dXRvJiBzdWJzdGl0dXRlRGF0YSA9IG5hdmlnYXRpb24uc3Vic3RpdHV0ZURhdGEoKSkKLSAgICAg ICAgbG9hZERhdGFXaXRoTmF2aWdhdGlvbihuYXZpZ2F0aW9uLCB7IHN1YnN0aXR1dGVEYXRhLT5j b250ZW50LmRhdGEoKSwgc3Vic3RpdHV0ZURhdGEtPmNvbnRlbnQuc2l6ZSgpIH0sIHN1YnN0aXR1 dGVEYXRhLT5NSU1FVHlwZSwgc3Vic3RpdHV0ZURhdGEtPmVuY29kaW5nLCBzdWJzdGl0dXRlRGF0 YS0+YmFzZVVSTCwgc3Vic3RpdHV0ZURhdGEtPnVzZXJEYXRhLmdldCgpLCBTaG91bGRUcmVhdEFz Q29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKKyAgICAgICAg bV9wcm92aXNpb25hbFBhZ2UtPmxvYWREYXRhKG5hdmlnYXRpb24sIHsgc3Vic3RpdHV0ZURhdGEt PmNvbnRlbnQuZGF0YSgpLCBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5zaXplKCkgfSwgc3Vic3Rp dHV0ZURhdGEtPk1JTUVUeXBlLCBzdWJzdGl0dXRlRGF0YS0+ZW5jb2RpbmcsIHN1YnN0aXR1dGVE YXRhLT5iYXNlVVJMLCBzdWJzdGl0dXRlRGF0YS0+dXNlckRhdGEuZ2V0KCksIFdURk1vdmUod2Vi c2l0ZVBvbGljaWVzKSk7CiAgICAgZWxzZQotICAgICAgICBsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0 aW9uKG5hdmlnYXRpb24sIFJlc291cmNlUmVxdWVzdCB7IG5hdmlnYXRpb24uY3VycmVudFJlcXVl c3QoKSB9LCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGRBbGxv d0V4dGVybmFsU2NoZW1lcywgbnVsbHB0ciwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZ ZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Ci0KLSAgICBBU1NFUlQoIW1fbWFpbkZyYW1l KTsKLSAgICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlciA9IFt0aGlzLCB3ZWFrVGhpcyA9IG1h a2VXZWFrUHRyKCp0aGlzKSwgbmF2aWdhdGlvbklEID0gbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQo KSwgcmVxdWVzdCA9ICBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCksIG1haW5GcmFtZVVSTCwg aXNTZXJ2ZXJSZWRpcmVjdCA9IG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3RJc1JlZGlyZWN0KCld KCkgbXV0YWJsZSB7Ci0gICAgICAgIGlmICghd2Vha1RoaXMpCi0gICAgICAgICAgICByZXR1cm47 Ci0KLSAgICAgICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKLSAgICAgICAgLy8gVGhpcyBuYXZpZ2F0 aW9uIHdhcyBkZXN0cm95ZWQgc28gbm8gbmVlZCB0byBub3RpZnkgb2YgcmVkaXJlY3QuCi0gICAg ICAgIGlmICghbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpKQotICAg ICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIC8vIFJlc3RvcmUgdGhlIG1haW4gZnJhbWUncyBj b21taXR0ZWQgVVJMIGFzIHNvbWUgY2xpZW50cyBtYXkgcmVseSBvbiBpdCB1bnRpbCB0aGUgbmV4 dCBsb2FkIGlzIGNvbW1pdHRlZC4KLSAgICAgICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0YXRl KCkuc2V0VVJMKG1haW5GcmFtZVVSTCk7Ci0KLSAgICAgICAgLy8gTm9ybWFsbHksIG5vdGlmaWNh dGlvbiBvZiBhIHNlcnZlciByZWRpcmVjdCBjb21lcyBmcm9tIHRoZSBXZWJDb250ZW50IHByb2Nl c3MuCi0gICAgICAgIC8vIElmIHdlIGFyZSBwcm9jZXNzIHN3YXBwaW5nIGluIHJlc3BvbnNlIHRv IGEgc2VydmVyIHJlZGlyZWN0IHRoZW4gdGhhdCBub3RpZmljYXRpb24gd2lsbCBub3QgY29tZSBm cm9tIHRoZSBuZXcgV2ViQ29udGVudCBwcm9jZXNzLgotICAgICAgICAvLyBJbiB0aGlzIGNhc2Ug d2UgaGF2ZSB0aGUgVUlQcm9jZXNzIHN5bnRoZXNpemUgdGhlIHJlZGlyZWN0IG5vdGlmaWNhdGlv biBhdCB0aGUgYXBwcm9wcmlhdGUgdGltZS4KLSAgICAgICAgaWYgKGlzU2VydmVyUmVkaXJlY3Qp IHsKLSAgICAgICAgICAgIG1fbWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLmRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkKHJlcXVlc3QudXJsKCkpOwotICAgICAgICAgICAgZGlkUmVjZWl2ZVNlcnZl clJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUobV9tYWluRnJhbWUtPmZyYW1lSUQo KSwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKHJlcXVlc3QpLCB7IH0pOwotICAgICAgICB9Ci0gICAg fTsKLQotICAgIGlmICghbV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgpLmNvbmZpZ3VyYXRpb24oKS5w cm9jZXNzU3dhcHNPbldpbmRvd09wZW5XaXRoT3BlbmVyKCkgfHwgIWlzUGFnZU9wZW5lZEJ5RE9N U2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgfHwgIW1haW5GcmFtZUlESW5QcmV2aW91c1By b2Nlc3MpIHsKLSAgICAgICAgLy8gVGhlcmUgaXMgbm8gd2F5IHdlJ2xsIGJlIGFibGUgdG8gcmV0 dXJuIHRvIHRoZSBwYWdlIGluIHRoZSBwcmV2aW91cyBwYWdlIHNvIGNsb3NlIGl0LgotICAgICAg ICBpZiAoIWRpZFN1c3BlbmRQcmV2aW91c1BhZ2UpCi0gICAgICAgICAgICBwcmV2aW91c1Byb2Nl c3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNsb3NlKCksIG1fcGFnZUlEKTsKLSAgICAgICAg cmV0dXJuOwotICAgIH0KLQotICAgIG1fbWFpbkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyID0g W3RoaXMsIHByZXZpb3VzUHJvY2VzcyA9IFdURk1vdmUocHJldmlvdXNQcm9jZXNzKSwgbWFpbkZy YW1lSURJblByZXZpb3VzUHJvY2VzcyA9ICptYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzXShj b25zdCBHbG9iYWxXaW5kb3dJZGVudGlmaWVyJiB3aW5kb3dJZGVudGlmaWVyKSB7Ci0gICAgICAg IEFTU0VSVChtX21haW5GcmFtZSk7Ci0gICAgICAgIEdsb2JhbEZyYW1lSWRlbnRpZmllciBuYXZp Z2F0ZWRGcmFtZUlkZW50aWZpZXJJbk5ld1Byb2Nlc3MgeyBwYWdlSUQoKSwgbV9tYWluRnJhbWUt PmZyYW1lSUQoKSB9OwotICAgICAgICBwcmV2aW91c1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6Oldl YlBhZ2U6OkZyYW1lQmVjYW1lUmVtb3RlKG1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MsIG5h dmlnYXRlZEZyYW1lSWRlbnRpZmllckluTmV3UHJvY2Vzcywgd2luZG93SWRlbnRpZmllciksIHBh Z2VJRCgpKTsKLSAgICB9OworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZS0+bG9hZFJlcXVlc3Qo bmF2aWdhdGlvbiwgUmVzb3VyY2VSZXF1ZXN0IHsgbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgp IH0sIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZEFsbG93RXh0 ZXJuYWxTY2hlbWVzLCBudWxscHRyLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOwogfQogCiBi b29sIFdlYlBhZ2VQcm94eTo6aXNQYWdlT3BlbmVkQnlET01TaG93aW5nSW5pdGlhbEVtcHR5RG9j dW1lbnQoKSBjb25zdApAQCAtMzY5NCwxMSArMzY3Myw2IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpk aWRDcmVhdGVNYWluRnJhbWUodWludDY0X3QgZnJhbWVJRCkKIAogICAgIC8vIEFkZCB0aGUgZnJh bWUgdG8gdGhlIHByb2Nlc3Mgd2lkZSBtYXAuCiAgICAgbV9wcm9jZXNzLT5mcmFtZUNyZWF0ZWQo ZnJhbWVJRCwgKm1fbWFpbkZyYW1lKTsKLQotICAgIGlmIChtX21haW5GcmFtZUNyZWF0aW9uSGFu ZGxlcikgewotICAgICAgICBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlcigpOwotICAgICAgICBt X21haW5GcmFtZUNyZWF0aW9uSGFuZGxlciA9IG51bGxwdHI7Ci0gICAgfQogfQogCiB2b2lkIFdl YlBhZ2VQcm94eTo6ZGlkQ3JlYXRlU3ViZnJhbWUodWludDY0X3QgZnJhbWVJRCkKQEAgLTM3MjMs MTAgKzM2OTcsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlU3ViZnJhbWUodWludDY0 X3QgZnJhbWVJRCkKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVdpbmRvdyh1aW50NjRf dCBmcmFtZUlELCBHbG9iYWxXaW5kb3dJZGVudGlmaWVyJiYgd2luZG93SWRlbnRpZmllcikKIHsK LSAgICBpZiAobV9tYWluRnJhbWUgJiYgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSA9PSBmcmFtZUlE KSB7Ci0gICAgICAgIGlmIChhdXRvIG1haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlciA9IFdU Rk1vdmUobV9tYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIpKQotICAgICAgICAgICAgbWFp bkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyKHdpbmRvd0lkZW50aWZpZXIpOwotICAgIH0KIH0K IAogZG91YmxlIFdlYlBhZ2VQcm94eTo6ZXN0aW1hdGVkUHJvZ3Jlc3MoKSBjb25zdApAQCAtMzc3 OSwzMyArMzc0OSwzNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRGVzdHJveU5hdmlnYXRpb24o dWludDY0X3QgbmF2aWdhdGlvbklEKQogewogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVj dG9yKHBhZ2VDbGllbnQoKSk7CiAKKyAgICAvLyBPbiBwcm9jZXNzLXN3YXAsIHRoZSBwcmV2aW91 cyBwcm9jZXNzIHRyaWVzIHRvIGRlc3Ryb3kgdGhlIG5hdmlnYXRpb24gYnV0IHRoZSBwcm92aXNp b25hbCBwcm9jZXNzIGlzIGFjdHVhbGx5IHRha2luZyBvdmVyIHRoZSBuYXZpZ2F0aW9uLgorICAg IGlmIChtX3Byb3Zpc2lvbmFsUGFnZSAmJiBtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklE KCkgPT0gbmF2aWdhdGlvbklEKQorICAgICAgICByZXR1cm47CisKICAgICAvLyBGSVhNRTogTWVz c2FnZSBjaGVjayB0aGUgbmF2aWdhdGlvbklELgogICAgIG1fbmF2aWdhdGlvblN0YXRlLT5kaWRE ZXN0cm95TmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6 ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRf dCBuYXZpZ2F0aW9uSUQsIFVSTCYmIHVybCwgVVJMJiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0IFVz ZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1l U2hhcmVkKG1fcHJvY2VzcywgZnJhbWVJRCwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKHVybCksIFdU Rk1vdmUodW5yZWFjaGFibGVVUkwpLCB1c2VyRGF0YSk7Cit9CisKK3ZvaWQgV2ViUGFnZVByb3h5 OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKFdlYlByb2Nlc3NQcm94eSYg cHJvY2VzcywgdWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiB1 cmwsIFVSTCYmIHVucmVhY2hhYmxlVVJMLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCiB7CiAg ICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAotICAgIFdl YkZyYW1lUHJveHkqIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBN RVNTQUdFX0NIRUNLKGZyYW1lKTsKLSAgICBNRVNTQUdFX0NIRUNLX1VSTCh1cmwpOworICAgIFdl YkZyYW1lUHJveHkqIGZyYW1lID0gcHJvY2Vzcy53ZWJGcmFtZShmcmFtZUlEKTsKKyAgICBNRVNT QUdFX0NIRUNLX1NIQVJFRChmcmFtZSk7CisgICAgTUVTU0FHRV9DSEVDS19VUkxfU0hBUkVEKHVy bCk7CiAKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIG1lc3NhZ2UgY2hlY2sgdGhhdCBuYXZpZ2F0 aW9uSUQgaXMgbm90IHplcm8gaGVyZSwgYnV0IGl0J3MgY3VycmVudGx5IHplcm8gZm9yIHNvbWUg bmF2aWdhdGlvbnMgdGhyb3VnaCB0aGUgcGFnZSBjYWNoZS4KICAgICBSZWZQdHI8QVBJOjpOYXZp Z2F0aW9uPiBuYXZpZ2F0aW9uOwogICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSAmJiBuYXZp Z2F0aW9uSUQpCiAgICAgICAgIG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uU3RhdGUoKS5uYXZpZ2F0 aW9uKG5hdmlnYXRpb25JRCk7CiAKLSAgICAvLyBJZiB0aGlzIHNlZW1pbmdseSBuZXcgbG9hZCBp cyBhY3R1YWxseSBjb250aW51aW5nIGEgc2VydmVyIHJlZGlyZWN0IGZvciBhIHByZXZpb3VzIG5h dmlnYXRpb24gaW4gYSBuZXcgcHJvY2VzcywKLSAgICAvLyB0aGVuIHdlIGlnbm9yZSB0aGlzIG5v dGlmaWNhdGlvbi4KLSAgICBpZiAobmF2aWdhdGlvbiAmJiBuYXZpZ2F0aW9uLT5jdXJyZW50UmVx dWVzdElzUmVkaXJlY3QoKSkgewotICAgICAgICBhdXRvIG5hdmlnYXRpb25Qcm9jZXNzSWRlbnRp ZmllciA9IG5hdmlnYXRpb24tPmN1cnJlbnRSZXF1ZXN0UHJvY2Vzc0lkZW50aWZpZXIoKTsKLSAg ICAgICAgaWYgKG5hdmlnYXRpb25Qcm9jZXNzSWRlbnRpZmllciAmJiAqbmF2aWdhdGlvblByb2Nl c3NJZGVudGlmaWVyICE9IG1fcHJvY2Vzcy0+Y29yZVByb2Nlc3NJZGVudGlmaWVyKCkpCi0gICAg ICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgTE9HKExvYWRpbmcsICJXZWJQYWdlUHJveHkg JSIgUFJJdTY0ICIgaW4gcHJvY2VzcyBwaWQgJWkgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JG cmFtZSB0byBmcmFtZUlEICUiIFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgJSIgUFJJdTY0ICIsIHVy bCAlcyIsIG1fcGFnZUlELCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIGZyYW1lSUQs IG5hdmlnYXRpb25JRCwgdXJsLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwotICAgIFJFTEVBU0Vf TE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6 IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCwg bV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCwgZnJhbWVJRCk7CisgICAg TE9HKExvYWRpbmcsICJXZWJQYWdlUHJveHkgJSIgUFJJdTY0ICIgaW4gcHJvY2VzcyBwaWQgJWkg ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSB0byBmcmFtZUlEICUiIFBSSXU2NCAiLCBu YXZpZ2F0aW9uSUQgJSIgUFJJdTY0ICIsIHVybCAlcyIsIG1fcGFnZUlELCBwcm9jZXNzLnByb2Nl c3NJZGVudGlmaWVyKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgdXJsLnN0cmluZygpLnV0Zjgo KS5kYXRhKCkpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImRpZFN0YXJ0 UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQg IiwgZnJhbWVJRCA9ICUiIFBSSXU2NCwgcHJvY2Vzcy5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3Bh Z2VJRCwgZnJhbWVJRCk7CiAKICAgICBhdXRvIHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRl LnRyYW5zYWN0aW9uKCk7CiAKQEAgLTM4MjQsMjEgKzM3OTUsMjYgQEAgdm9pZCBXZWJQYWdlUHJv eHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWlu dDY0X3QgbmEKIAogICAgIG1fcGFnZUxvYWRTdGF0ZS5jb21taXRDaGFuZ2VzKCk7CiAgICAgaWYg KG1fbG9hZGVyQ2xpZW50KQotICAgICAgICBtX2xvYWRlckNsaWVudC0+ZGlkU3RhcnRQcm92aXNp b25hbExvYWRGb3JGcmFtZSgqdGhpcywgKmZyYW1lLCBuYXZpZ2F0aW9uLmdldCgpLCBtX3Byb2Nl c3MtPnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHModXNlckRhdGEub2JqZWN0KCkpLmdldCgpKTsK KyAgICAgICAgbV9sb2FkZXJDbGllbnQtPmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUo KnRoaXMsICpmcmFtZSwgbmF2aWdhdGlvbi5nZXQoKSwgcHJvY2Vzcy50cmFuc2Zvcm1IYW5kbGVz VG9PYmplY3RzKHVzZXJEYXRhLm9iamVjdCgpKS5nZXQoKSk7CiAgICAgZWxzZSBpZiAoZnJhbWUt PmlzTWFpbkZyYW1lKCkpCi0gICAgICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ZGlkU3RhcnRQcm92 aXNpb25hbE5hdmlnYXRpb24oKnRoaXMsIG5hdmlnYXRpb24uZ2V0KCksIG1fcHJvY2Vzcy0+dHJh bnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOworICAgICAg ICBtX25hdmlnYXRpb25DbGllbnQtPmRpZFN0YXJ0UHJvdmlzaW9uYWxOYXZpZ2F0aW9uKCp0aGlz LCBuYXZpZ2F0aW9uLmdldCgpLCBwcm9jZXNzLnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHModXNl ckRhdGEub2JqZWN0KCkpLmdldCgpKTsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2Vp dmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1l SUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgY29u c3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAgIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZv clByb3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKG1fcHJvY2VzcywgZnJhbWVJRCwgbmF2aWdh dGlvbklELCBXVEZNb3ZlKHJlcXVlc3QpLCB1c2VyRGF0YSk7Cit9CisKK3ZvaWQgV2ViUGFnZVBy b3h5OjpkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZVNo YXJlZChXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90 IG5hdmlnYXRpb25JRCwgUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgY29uc3QgVXNlckRhdGEm IHVzZXJEYXRhKQogewogICAgIExPRyhMb2FkaW5nLCAiV2ViUGFnZVByb3h5OjpkaWRSZWNlaXZl U2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSB0byBmcmFtZUlEICUiIFBS SXU2NCAiLCBuYXZpZ2F0aW9uSUQgJSIgUFJJdTY0ICIsIHVybCAlcyIsIGZyYW1lSUQsIG5hdmln YXRpb25JRCwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKLSAgICBSRUxF QVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQ cm92aXNpb25hbExvYWRGb3JGcmFtZTogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCAi LCBmcmFtZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1f cGFnZUlELCBmcmFtZUlEKTsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJk aWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZTogd2ViUElE ID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0LCBwcm9jZXNz LnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlELCBmcmFtZUlEKTsKIAogICAgIFBhZ2VDbGll bnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKLSAgICBXZWJGcmFtZVByb3h5 KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVD SyhmcmFtZSk7Ci0gICAgTUVTU0FHRV9DSEVDS19VUkwocmVxdWVzdC51cmwoKSk7CisgICAgV2Vi RnJhbWVQcm94eSogZnJhbWUgPSBwcm9jZXNzLndlYkZyYW1lKGZyYW1lSUQpOworICAgIE1FU1NB R0VfQ0hFQ0tfU0hBUkVEKGZyYW1lKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTF9TSEFSRUQocmVx dWVzdC51cmwoKSk7CiAKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIG1lc3NhZ2UgY2hlY2sgdGhh dCBuYXZpZ2F0aW9uSUQgaXMgbm90IHplcm8gaGVyZSwgYnV0IGl0J3MgY3VycmVudGx5IHplcm8g Zm9yIHNvbWUgbmF2aWdhdGlvbnMgdGhyb3VnaCB0aGUgcGFnZSBjYWNoZS4KICAgICBSZWZQdHI8 QVBJOjpOYXZpZ2F0aW9uPiBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvbklEID8gbmF2aWdhdGlvblN0 YXRlKCkubmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpIDogbnVsbHB0cjsKQEAgLTM4NTQsOSArMzgz MCw5IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92 aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmCiAKICAgICBtX3BhZ2VMb2FkU3RhdGUuY29t bWl0Q2hhbmdlcygpOwogICAgIGlmIChtX2xvYWRlckNsaWVudCkKLSAgICAgICAgbV9sb2FkZXJD bGllbnQtPmRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1l KCp0aGlzLCAqZnJhbWUsIGZyYW1lLT5pc01haW5GcmFtZSgpID8gbmF2aWdhdGlvbi5nZXQoKSA6 IG51bGxwdHIsIG1fcHJvY2Vzcy0+dHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5v YmplY3QoKSkuZ2V0KCkpOworICAgICAgICBtX2xvYWRlckNsaWVudC0+ZGlkUmVjZWl2ZVNlcnZl clJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoKnRoaXMsICpmcmFtZSwgZnJhbWUt PmlzTWFpbkZyYW1lKCkgPyBuYXZpZ2F0aW9uLmdldCgpIDogbnVsbHB0ciwgcHJvY2Vzcy50cmFu c2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVzZXJEYXRhLm9iamVjdCgpKS5nZXQoKSk7CiAgICAgZWxz ZSBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpCi0gICAgICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxOYXZpZ2F0aW9uKCp0aGlzLCBu YXZpZ2F0aW9uLmdldCgpLCBtX3Byb2Nlc3MtPnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHModXNl ckRhdGEub2JqZWN0KCkpLmdldCgpKTsKKyAgICAgICAgbV9uYXZpZ2F0aW9uQ2xpZW50LT5kaWRS ZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbE5hdmlnYXRpb24oKnRoaXMsIG5hdmln YXRpb24uZ2V0KCksIHByb2Nlc3MudHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5v YmplY3QoKSkuZ2V0KCkpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6d2lsbFBlcmZvcm1DbGll bnRSZWRpcmVjdEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgdXJsLCBk b3VibGUgZGVsYXksIFdlYkNvcmU6OkxvY2tCYWNrRm9yd2FyZExpc3QpCkBAIC0zODg1LDE0ICsz ODYxLDE5IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDYW5jZWxDbGllbnRSZWRpcmVjdEZvckZy YW1lKHVpbnQ2NF90IGZyYW1lSUQpCiAgICAgICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ZGlkQ2Fu Y2VsQ2xpZW50UmVkaXJlY3QoKnRoaXMpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ2hh bmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCwgVVJM JiYgdXJsKQordm9pZCBXZWJQYWdlUHJveHk6OmRpZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJh bWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiB1cmwpCit7 CisgICAgZGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZVNoYXJlZChtX3Byb2Nlc3MsIGZy YW1lSUQsIG5hdmlnYXRpb25JRCwgV1RGTW92ZSh1cmwpKTsKK30KKwordm9pZCBXZWJQYWdlUHJv eHk6OmRpZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWVTaGFyZWQoV2ViUHJvY2Vzc1Byb3h5 JiBwcm9jZXNzLCB1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCwgVVJMJiYgdXJsKQogewogICAg IFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKLSAgICBXZWJG cmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVT U0FHRV9DSEVDSyhmcmFtZSk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZS0+ZnJhbWVMb2FkU3Rh dGUoKS5zdGF0ZSgpID09IEZyYW1lTG9hZFN0YXRlOjpTdGF0ZTo6UHJvdmlzaW9uYWwpOwotICAg IE1FU1NBR0VfQ0hFQ0tfVVJMKHVybCk7CisgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBwcm9j ZXNzLndlYkZyYW1lKGZyYW1lSUQpOworICAgIE1FU1NBR0VfQ0hFQ0tfU0hBUkVEKGZyYW1lKTsK KyAgICBNRVNTQUdFX0NIRUNLX1NIQVJFRChmcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5zdGF0ZSgp ID09IEZyYW1lTG9hZFN0YXRlOjpTdGF0ZTo6UHJvdmlzaW9uYWwpOworICAgIE1FU1NBR0VfQ0hF Q0tfVVJMX1NIQVJFRCh1cmwpOwogCiAgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFnZUxvYWRT dGF0ZS50cmFuc2FjdGlvbigpOwogCkBAIC0zOTA2LDE2ICszODg3LDI2IEBAIHZvaWQgV2ViUGFn ZVByb3h5OjpkaWRDaGFuZ2VQcm92aXNpb25hbFVSTEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQs IHVpbnQ2NF90LCBVCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2Fk Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFt ZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJv dmlzaW9uYWxVUkwsIGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yLCBjb25zdCBVc2VyRGF0YSYg dXNlckRhdGEpCiB7Ci0gICAgTE9HKExvYWRpbmcsICIoTG9hZGluZykgV2ViUGFnZVByb3h5ICUi IFBSSXU2NCAiIGluIHdlYiBwcm9jZXNzIHBpZCAlaSBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUgdG8gcHJvdmlzaW9uYWxVUkwgJXMiLCBtX3BhZ2VJRCwgbV9wcm9jZXNzLT5wcm9jZXNz SWRlbnRpZmllcigpLCBwcm92aXNpb25hbFVSTC51dGY4KCkuZGF0YSgpKTsKLSAgICBSRUxFQVNF X0xPR19JRl9BTExPV0VEKFByb2Nlc3MsICJkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6 IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAi LCBkb21haW4gPSAlcywgY29kZSA9ICVkIiwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigp LCBtX3BhZ2VJRCwgZnJhbWVJRCwgZXJyb3IuZG9tYWluKCkudXRmOCgpLmRhdGEoKSwgZXJyb3Iu ZXJyb3JDb2RlKCkpOworICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZSAmJiBtX3Byb3Zpc2lvbmFs UGFnZS0+bmF2aWdhdGlvbklEKCkgPT0gbmF2aWdhdGlvbklEKSB7CisgICAgICAgIC8vIFRoZSBs b2FkIGRpZCBub3QgZmFpbCwgaXQgaXMgbWVyZWx5IGhhcHBlbmluZyBpbiBhIG5ldyBwcm92aXNp b25hbCBwcm9jZXNzLgorICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgZGlkRmFpbFByb3Zp c2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKG1fcHJvY2VzcywgZnJhbWVJRCwgZnJhbWVTZWN1cml0 eU9yaWdpbiwgbmF2aWdhdGlvbklELCBwcm92aXNpb25hbFVSTCwgZXJyb3IsIHVzZXJEYXRhKTsK K30KKwordm9pZCBXZWJQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZVNo YXJlZChXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNl Y3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlv bklELCBjb25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJMLCBjb25zdCBSZXNvdXJjZUVycm9yJiBl cnJvciwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAgIExPRyhMb2FkaW5nLCAiKExv YWRpbmcpIFdlYlBhZ2VQcm94eSAlIiBQUkl1NjQgIiBpbiB3ZWIgcHJvY2VzcyBwaWQgJWkgZGlk RmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lIHRvIHByb3Zpc2lvbmFsVVJMICVzIiwgbV9wYWdl SUQsIHByb2Nlc3MucHJvY2Vzc0lkZW50aWZpZXIoKSwgcHJvdmlzaW9uYWxVUkwudXRmOCgpLmRh dGEoKSk7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzLCAiZGlkRmFpbFByb3Zp c2lvbmFsTG9hZEZvckZyYW1lOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZy YW1lSUQgPSAlIiBQUkl1NjQgIiwgZG9tYWluID0gJXMsIGNvZGUgPSAlZCIsIHByb2Nlc3MucHJv Y2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQsIGZyYW1lSUQsIGVycm9yLmRvbWFpbigpLnV0Zjgo KS5kYXRhKCksIGVycm9yLmVycm9yQ29kZSgpKTsKIAogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3Ig cHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKLSAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1f cHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7CisgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBw cm9jZXNzLndlYkZyYW1lKGZyYW1lSUQpOwogICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOwogCiAg ICAgaWYgKG1fY29udHJvbGxlZEJ5QXV0b21hdGlvbikgewotICAgICAgICBpZiAoYXV0byogYXV0 b21hdGlvblNlc3Npb24gPSBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS5hdXRvbWF0aW9uU2Vzc2lv bigpKQorICAgICAgICBpZiAoYXV0byogYXV0b21hdGlvblNlc3Npb24gPSBwcm9jZXNzLnByb2Nl c3NQb29sKCkuYXV0b21hdGlvblNlc3Npb24oKSkKICAgICAgICAgICAgIGF1dG9tYXRpb25TZXNz aW9uLT5uYXZpZ2F0aW9uT2NjdXJyZWRGb3JGcmFtZSgqZnJhbWUpOwogICAgIH0KIApAQCAtMzk0 MCwxNSArMzkzMSwxOSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9h ZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaQogICAgIG1fZmFpbGluZ1By b3Zpc2lvbmFsTG9hZFVSTCA9IHByb3Zpc2lvbmFsVVJMOwogCiAgICAgaWYgKG1fbG9hZGVyQ2xp ZW50KQotICAgICAgICBtX2xvYWRlckNsaWVudC0+ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhF cnJvckZvckZyYW1lKCp0aGlzLCAqZnJhbWUsIG5hdmlnYXRpb24uZ2V0KCksIGVycm9yLCBtX3By b2Nlc3MtPnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHModXNlckRhdGEub2JqZWN0KCkpLmdldCgp KTsKKyAgICAgICAgbV9sb2FkZXJDbGllbnQtPmRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJy b3JGb3JGcmFtZSgqdGhpcywgKmZyYW1lLCBuYXZpZ2F0aW9uLmdldCgpLCBlcnJvciwgcHJvY2Vz cy50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVzZXJEYXRhLm9iamVjdCgpKS5nZXQoKSk7CiAg ICAgZWxzZSBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpCi0gICAgICAgIG1fbmF2aWdhdGlvbkNs aWVudC0+ZGlkRmFpbFByb3Zpc2lvbmFsTmF2aWdhdGlvbldpdGhFcnJvcigqdGhpcywgKmZyYW1l LCBuYXZpZ2F0aW9uLmdldCgpLCBlcnJvciwgbV9wcm9jZXNzLT50cmFuc2Zvcm1IYW5kbGVzVG9P YmplY3RzKHVzZXJEYXRhLm9iamVjdCgpKS5nZXQoKSk7CisgICAgICAgIG1fbmF2aWdhdGlvbkNs aWVudC0+ZGlkRmFpbFByb3Zpc2lvbmFsTmF2aWdhdGlvbldpdGhFcnJvcigqdGhpcywgKmZyYW1l LCBuYXZpZ2F0aW9uLmdldCgpLCBlcnJvciwgcHJvY2Vzcy50cmFuc2Zvcm1IYW5kbGVzVG9PYmpl Y3RzKHVzZXJEYXRhLm9iamVjdCgpKS5nZXQoKSk7CiAgICAgZWxzZSB7Ci0gICAgICAgICAgICAv LyBGSVhNRTogR2V0IHRoZSBtYWluIGZyYW1lJ3MgY3VycmVudCBuYXZpZ2F0aW9uLgotICAgICAg ICAgICAgbV9uYXZpZ2F0aW9uQ2xpZW50LT5kaWRGYWlsUHJvdmlzaW9uYWxMb2FkSW5TdWJmcmFt ZVdpdGhFcnJvcigqdGhpcywgKmZyYW1lLCBmcmFtZVNlY3VyaXR5T3JpZ2luLCBudWxscHRyLCBl cnJvciwgbV9wcm9jZXNzLT50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVzZXJEYXRhLm9iamVj dCgpKS5nZXQoKSk7CisgICAgICAgIC8vIEZJWE1FOiBHZXQgdGhlIG1haW4gZnJhbWUncyBjdXJy ZW50IG5hdmlnYXRpb24uCisgICAgICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ZGlkRmFpbFByb3Zp c2lvbmFsTG9hZEluU3ViZnJhbWVXaXRoRXJyb3IoKnRoaXMsICpmcmFtZSwgZnJhbWVTZWN1cml0 eU9yaWdpbiwgbnVsbHB0ciwgZXJyb3IsIHByb2Nlc3MudHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0 cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOwogICAgIH0KIAogICAgIG1fZmFpbGluZ1Byb3Zp c2lvbmFsTG9hZFVSTCA9IHsgfTsKKworICAgIC8vIElmIHRoZSBwcm92aXNpb25hbCBwYWdlJ3Mg bG9hZCBmYWlscyB0aGVuIHdlIGRlc3Ryb3kgdGhlIHByb3Zpc2lvbmFsIHBhZ2UuCisgICAgaWYg KG1fcHJvdmlzaW9uYWxQYWdlICYmIG1fcHJvdmlzaW9uYWxQYWdlLT5tYWluRnJhbWUoKSA9PSBm cmFtZSkKKyAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBudWxscHRyOwogfQogCiB2b2lkIFdl YlBhZ2VQcm94eTo6Y2xlYXJMb2FkRGVwZW5kZW50Q2FsbGJhY2tzKCkKQEAgLTQzMzcsMTUgKzQz MzIsMjAgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmJlZ2luU2FmZUJyb3dzaW5nQ2hlY2soY29uc3Qg VVJMJiwgYm9vbCwgV2ViRnJhbWVQb2xpY3lMaXN0ZW4KIAogdm9pZCBXZWJQYWdlUHJveHk6OmRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYyh1aW50NjRfdCBmcmFtZUlELCBXZWJD b3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBu YXZpZ2F0aW9uSUQsIE5hdmlnYXRpb25BY3Rpb25EYXRhJiYgbmF2aWdhdGlvbkFjdGlvbkRhdGEs IEZyYW1lSW5mb0RhdGEmJiBmcmFtZUluZm9EYXRhLCB1aW50NjRfdCBvcmlnaW5hdGluZ1BhZ2VJ RCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBvcmlnaW5hbFJlcXVlc3QsIFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIElQQzo6Rm9ybURhdGFSZWZlcmVuY2UmJiBy ZXF1ZXN0Qm9keSwgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYmIHJlZGlyZWN0UmVzcG9uc2Us IGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSwgdWludDY0X3QgbGlzdGVuZXJJRCkKIHsKLSAgICBh dXRvKiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9D SEVDSyhmcmFtZSk7CisgICAgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jU2hh cmVkKG1fcHJvY2VzcywgZnJhbWVJRCwgV1RGTW92ZShmcmFtZVNlY3VyaXR5T3JpZ2luKSwgbmF2 aWdhdGlvbklELCBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb25EYXRhKSwgV1RGTW92ZShmcmFtZUlu Zm9EYXRhKSwgb3JpZ2luYXRpbmdQYWdlSUQsIG9yaWdpbmFsUmVxdWVzdCwgV1RGTW92ZShyZXF1 ZXN0KSwgV1RGTW92ZShyZXF1ZXN0Qm9keSksIFdURk1vdmUocmVkaXJlY3RSZXNwb25zZSksIHVz ZXJEYXRhLCBsaXN0ZW5lcklEKTsKK30KIAotICAgIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb24oKmZyYW1lLCBXVEZNb3ZlKGZyYW1lU2VjdXJpdHlPcmlnaW4pLCBuYXZpZ2F0aW9uSUQs IFdURk1vdmUobmF2aWdhdGlvbkFjdGlvbkRhdGEpLCBXVEZNb3ZlKGZyYW1lSW5mb0RhdGEpLCBv cmlnaW5hdGluZ1BhZ2VJRCwgb3JpZ2luYWxSZXF1ZXN0LCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZN b3ZlKHJlcXVlc3RCb2R5KSwgV1RGTW92ZShyZWRpcmVjdFJlc3BvbnNlKSwgdXNlckRhdGEsIFBv bGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVm KCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRF0gKGF1dG8uLi4gYXJncykgewotICAgICAgICBt X3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xpY3lEZWNpc2lv bihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQpOwordm9pZCBXZWJQYWdl UHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luY1NoYXJlZChXZWJQcm9j ZXNzUHJveHkmIHByb2Nlc3MsIHVpbnQ2NF90IGZyYW1lSUQsIFdlYkNvcmU6OlNlY3VyaXR5T3Jp Z2luRGF0YSYmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgTmF2 aWdhdGlvbkFjdGlvbkRhdGEmJiBuYXZpZ2F0aW9uQWN0aW9uRGF0YSwgRnJhbWVJbmZvRGF0YSYm IGZyYW1lSW5mb0RhdGEsIHVpbnQ2NF90IG9yaWdpbmF0aW5nUGFnZUlELCBjb25zdCBXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVxdWVzdCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0JiYgcmVxdWVzdCwgSVBDOjpGb3JtRGF0YVJlZmVyZW5jZSYmIHJlcXVlc3RCb2R5LCBXZWJD b3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYgcmVkaXJlY3RSZXNwb25zZSwgY29uc3QgVXNlckRhdGEm IHVzZXJEYXRhLCB1aW50NjRfdCBsaXN0ZW5lcklEKQoreworICAgIGF1dG8qIGZyYW1lID0gcHJv Y2Vzcy53ZWJGcmFtZShmcmFtZUlEKTsKKyAgICBNRVNTQUdFX0NIRUNLX1NIQVJFRChmcmFtZSk7 CisKKyAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKHByb2Nlc3MsICpmcmFtZSwg V1RGTW92ZShmcmFtZVNlY3VyaXR5T3JpZ2luKSwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKG5hdmln YXRpb25BY3Rpb25EYXRhKSwgV1RGTW92ZShmcmFtZUluZm9EYXRhKSwgb3JpZ2luYXRpbmdQYWdl SUQsIG9yaWdpbmFsUmVxdWVzdCwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShyZXF1ZXN0Qm9k eSksIFdURk1vdmUocmVkaXJlY3RSZXNwb25zZSksIHVzZXJEYXRhLCBQb2xpY3lEZWNpc2lvblNl bmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1l SUQsIGxpc3RlbmVySUQsIHByb2Nlc3MgPSBtYWtlUmVmKHByb2Nlc3MpXSAoYXV0by4uLiBhcmdz KSB7CisgICAgICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQ b2xpY3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQpOwog ICAgIH0pKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb24oV2ViRnJhbWVQcm94eSYgZnJhbWUsIFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0 YSYmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgTmF2aWdhdGlv bkFjdGlvbkRhdGEmJiBuYXZpZ2F0aW9uQWN0aW9uRGF0YSwgRnJhbWVJbmZvRGF0YSYmIG9yaWdp bmF0aW5nRnJhbWVJbmZvRGF0YSwgdWludDY0X3Qgb3JpZ2luYXRpbmdQYWdlSUQsIGNvbnN0IFdl YkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0LCBXZWJDb3JlOjpSZXNvdXJj ZVJlcXVlc3QmJiByZXF1ZXN0LCBJUEM6OkZvcm1EYXRhUmVmZXJlbmNlJiYgcmVxdWVzdEJvZHks IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmJiByZWRpcmVjdFJlc3BvbnNlLCBjb25zdCBVc2Vy RGF0YSYgdXNlckRhdGEsIFJlZjxQb2xpY3lEZWNpc2lvblNlbmRlcj4mJiBzZW5kZXIpCit2b2lk IFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXZWJQcm9jZXNz UHJveHkmIHByb2Nlc3MsIFdlYkZyYW1lUHJveHkmIGZyYW1lLCBXZWJDb3JlOjpTZWN1cml0eU9y aWdpbkRhdGEmJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIE5h dmlnYXRpb25BY3Rpb25EYXRhJiYgbmF2aWdhdGlvbkFjdGlvbkRhdGEsIEZyYW1lSW5mb0RhdGEm JiBvcmlnaW5hdGluZ0ZyYW1lSW5mb0RhdGEsIHVpbnQ2NF90IG9yaWdpbmF0aW5nUGFnZUlELCBj b25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVxdWVzdCwgV2ViQ29yZTo6 UmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgSVBDOjpGb3JtRGF0YVJlZmVyZW5jZSYmIHJlcXVl c3RCb2R5LCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYgcmVkaXJlY3RSZXNwb25zZSwgY29u c3QgVXNlckRhdGEmIHVzZXJEYXRhLCBSZWY8UG9saWN5RGVjaXNpb25TZW5kZXI+JiYgc2VuZGVy KQogewogICAgIExPRyhMb2FkaW5nLCAiV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uIC0gT3JpZ2luYWwgVVJMICVzLCBjdXJyZW50IHRhcmdldCBVUkwgJXMiLCBv cmlnaW5hbFJlcXVlc3QudXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgcmVxdWVzdC51cmwo KS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKIApAQCAtNDM2MCw4ICs0MzYwLDggQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV2ViRnJhbWVQcm94 eSYgZnJhbWUsIFdlYkNvcmUKICAgICBpZiAoIWZyb21BUEkpCiAgICAgICAgIG1fcGFnZUxvYWRT dGF0ZS5jbGVhclBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uKTsKIAotICAgIE1FU1NB R0VfQ0hFQ0tfVVJMKHJlcXVlc3QudXJsKCkpOwotICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKG9yaWdp bmFsUmVxdWVzdC51cmwoKSk7CisgICAgTUVTU0FHRV9DSEVDS19VUkxfU0hBUkVEKHJlcXVlc3Qu dXJsKCkpOworICAgIE1FU1NBR0VfQ0hFQ0tfVVJMX1NIQVJFRChvcmlnaW5hbFJlcXVlc3QudXJs KCkpOwogCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gbmF2aWdhdGlvbjsKICAgICBpZiAo bmF2aWdhdGlvbklEKQpAQCAtNDM4Nyw3ICs0Mzg3LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV2ViRnJhbWVQcm94eSYgZnJhbWUsIFdlYkNv cmUKICAgICB9CiAKICAgICB1aW50NjRfdCBuZXdOYXZpZ2F0aW9uSUQgPSBuYXZpZ2F0aW9uLT5u YXZpZ2F0aW9uSUQoKTsKLSAgICBuYXZpZ2F0aW9uLT5zZXRDdXJyZW50UmVxdWVzdChSZXNvdXJj ZVJlcXVlc3QocmVxdWVzdCksIG1fcHJvY2Vzcy0+Y29yZVByb2Nlc3NJZGVudGlmaWVyKCkpOwor ICAgIG5hdmlnYXRpb24tPnNldEN1cnJlbnRSZXF1ZXN0KFJlc291cmNlUmVxdWVzdChyZXF1ZXN0 KSwgcHJvY2Vzcy5jb3JlUHJvY2Vzc0lkZW50aWZpZXIoKSk7CiAgICAgbmF2aWdhdGlvbi0+c2V0 TGFzdE5hdmlnYXRpb25BY3Rpb24obmF2aWdhdGlvbkFjdGlvbkRhdGEpOwogICAgIG5hdmlnYXRp b24tPnNldE9yaWdpbmF0aW5nRnJhbWVJbmZvKG9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0YSk7CiAg ICAgbmF2aWdhdGlvbi0+c2V0RGVzdGluYXRpb25GcmFtZVNlY3VyaXR5T3JpZ2luKGZyYW1lU2Vj dXJpdHlPcmlnaW4pOwpAQCAtNDQ0Niw3ICs0NDQ2LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV2ViRnJhbWVQcm94eSYgZnJhbWUsIFdlYkNv cmUKICAgICAgICAgYmVnaW5TYWZlQnJvd3NpbmdDaGVjayhyZXF1ZXN0LnVybCgpLCBmcmFtZS5p c01haW5GcmFtZSgpLCBsaXN0ZW5lcik7CiAKICAgICBBUEk6Ok5hdmlnYXRpb24qIG1haW5GcmFt ZU5hdmlnYXRpb24gPSBmcmFtZS5pc01haW5GcmFtZSgpID8gbmF2aWdhdGlvbi5nZXQoKSA6IG51 bGxwdHI7Ci0gICAgV2ViRnJhbWVQcm94eSogb3JpZ2luYXRpbmdGcmFtZSA9IG1fcHJvY2Vzcy0+ d2ViRnJhbWUob3JpZ2luYXRpbmdGcmFtZUluZm9EYXRhLmZyYW1lSUQpOworICAgIFdlYkZyYW1l UHJveHkqIG9yaWdpbmF0aW5nRnJhbWUgPSBwcm9jZXNzLndlYkZyYW1lKG9yaWdpbmF0aW5nRnJh bWVJbmZvRGF0YS5mcmFtZUlEKTsKIAogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJ Q1MpCiAgICAgaWYgKGF1dG8qIHJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZSA9IHdlYnNpdGVE YXRhU3RvcmUoKS5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzKCkpCkBAIC00NDU1LDIxICs0NDU1LDIx IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdl YkZyYW1lUHJveHkmIGZyYW1lLCBXZWJDb3JlCiAjZW5kaWYKIAogICAgIGlmIChtX3BvbGljeUNs aWVudCkKLSAgICAgICAgbV9wb2xpY3lDbGllbnQtPmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb24oKnRoaXMsICZmcmFtZSwgV1RGTW92ZShuYXZpZ2F0aW9uQWN0aW9uRGF0YSksIG9yaWdp bmF0aW5nRnJhbWUsIG9yaWdpbmFsUmVxdWVzdCwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShs aXN0ZW5lciksIG1fcHJvY2Vzcy0+dHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5v YmplY3QoKSkuZ2V0KCkpOworICAgICAgICBtX3BvbGljeUNsaWVudC0+ZGVjaWRlUG9saWN5Rm9y TmF2aWdhdGlvbkFjdGlvbigqdGhpcywgJmZyYW1lLCBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb25E YXRhKSwgb3JpZ2luYXRpbmdGcmFtZSwgb3JpZ2luYWxSZXF1ZXN0LCBXVEZNb3ZlKHJlcXVlc3Qp LCBXVEZNb3ZlKGxpc3RlbmVyKSwgcHJvY2Vzcy50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVz ZXJEYXRhLm9iamVjdCgpKS5nZXQoKSk7CiAgICAgZWxzZSB7CiAgICAgICAgIGF1dG8gZGVzdGlu YXRpb25GcmFtZUluZm8gPSBBUEk6OkZyYW1lSW5mbzo6Y3JlYXRlKGZyYW1lLCBmcmFtZVNlY3Vy aXR5T3JpZ2luLnNlY3VyaXR5T3JpZ2luKCkpOwogICAgICAgICBSZWZQdHI8QVBJOjpGcmFtZUlu Zm8+IHNvdXJjZUZyYW1lSW5mbzsKICAgICAgICAgaWYgKCFmcm9tQVBJICYmIG9yaWdpbmF0aW5n RnJhbWUgPT0gJmZyYW1lKQogICAgICAgICAgICAgc291cmNlRnJhbWVJbmZvID0gZGVzdGluYXRp b25GcmFtZUluZm8uY29weVJlZigpOwogICAgICAgICBlbHNlIGlmICghZnJvbUFQSSkKLSAgICAg ICAgICAgIHNvdXJjZUZyYW1lSW5mbyA9IEFQSTo6RnJhbWVJbmZvOjpjcmVhdGUob3JpZ2luYXRp bmdGcmFtZUluZm9EYXRhLCBvcmlnaW5hdGluZ1BhZ2VJRCA/IG1fcHJvY2Vzcy0+d2ViUGFnZShv cmlnaW5hdGluZ1BhZ2VJRCkgOiBudWxscHRyKTsKKyAgICAgICAgICAgIHNvdXJjZUZyYW1lSW5m byA9IEFQSTo6RnJhbWVJbmZvOjpjcmVhdGUob3JpZ2luYXRpbmdGcmFtZUluZm9EYXRhLCBvcmln aW5hdGluZ1BhZ2VJRCA/IHByb2Nlc3Mud2ViUGFnZShvcmlnaW5hdGluZ1BhZ2VJRCkgOiBudWxs cHRyKTsKIAotICAgICAgICBhdXRvIHVzZXJJbml0aWF0ZWRBY3Rpdml0eSA9IG1fcHJvY2Vzcy0+ dXNlckluaXRpYXRlZEFjdGl2aXR5KG5hdmlnYXRpb25BY3Rpb25EYXRhLnVzZXJHZXN0dXJlVG9r ZW5JZGVudGlmaWVyKTsKKyAgICAgICAgYXV0byB1c2VySW5pdGlhdGVkQWN0aXZpdHkgPSBwcm9j ZXNzLnVzZXJJbml0aWF0ZWRBY3Rpdml0eShuYXZpZ2F0aW9uQWN0aW9uRGF0YS51c2VyR2VzdHVy ZVRva2VuSWRlbnRpZmllcik7CiAgICAgICAgIGJvb2wgc2hvdWxkT3BlbkFwcExpbmtzID0gIW1f c2hvdWxkU3VwcHJlc3NBcHBMaW5rc0luTmV4dE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbiAmJiBk ZXN0aW5hdGlvbkZyYW1lSW5mby0+aXNNYWluRnJhbWUoKSAmJiAhaG9zdHNBcmVFcXVhbChVUkwo eyB9LCBtX21haW5GcmFtZS0+dXJsKCkpLCByZXF1ZXN0LnVybCgpKSAmJiBuYXZpZ2F0aW9uQWN0 aW9uRGF0YS5uYXZpZ2F0aW9uVHlwZSAhPSBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZTo6QmFja0Zv cndhcmQ7CiAKICAgICAgICAgYXV0byBuYXZpZ2F0aW9uQWN0aW9uID0gQVBJOjpOYXZpZ2F0aW9u QWN0aW9uOjpjcmVhdGUoV1RGTW92ZShuYXZpZ2F0aW9uQWN0aW9uRGF0YSksIHNvdXJjZUZyYW1l SW5mby5nZXQoKSwgZGVzdGluYXRpb25GcmFtZUluZm8ucHRyKCksIFdURjo6bnVsbG9wdCwgV1RG TW92ZShyZXF1ZXN0KSwgb3JpZ2luYWxSZXF1ZXN0LnVybCgpLCBzaG91bGRPcGVuQXBwTGlua3Ms IFdURk1vdmUodXNlckluaXRpYXRlZEFjdGl2aXR5KSwgbWFpbkZyYW1lTmF2aWdhdGlvbik7CiAK LSAgICAgICAgbV9uYXZpZ2F0aW9uQ2xpZW50LT5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uKCp0aGlzLCBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb24pLCBXVEZNb3ZlKGxpc3RlbmVyKSwg bV9wcm9jZXNzLT50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVzZXJEYXRhLm9iamVjdCgpKS5n ZXQoKSk7CisgICAgICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ZGVjaWRlUG9saWN5Rm9yTmF2aWdh dGlvbkFjdGlvbigqdGhpcywgV1RGTW92ZShuYXZpZ2F0aW9uQWN0aW9uKSwgV1RGTW92ZShsaXN0 ZW5lciksIHByb2Nlc3MudHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5vYmplY3Qo KSkuZ2V0KCkpOwogICAgIH0KIAogICAgIG1fc2hvdWxkU3VwcHJlc3NBcHBMaW5rc0luTmV4dE5h dmlnYXRpb25Qb2xpY3lEZWNpc2lvbiA9IGZhbHNlOwpAQCAtNDUyMyw3ICs0NTIzLDcgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25TeW5jKHVpbnQ2 NF90IGZyYW1lSUQsIGJvb2wgaXMKICAgICAgICAgUkVMRUFTRV9BU1NFUlQoZnJhbWUpOwogICAg IH0KIAotICAgIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oKmZyYW1lLCBXVEZNb3Zl KGZyYW1lU2VjdXJpdHlPcmlnaW4pLCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUobmF2aWdhdGlvbkFj dGlvbkRhdGEpLCBXVEZNb3ZlKGZyYW1lSW5mb0RhdGEpLCBvcmlnaW5hdGluZ1BhZ2VJRCwgb3Jp Z2luYWxSZXF1ZXN0LCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKHJlcXVlc3RCb2R5KSwgV1RG TW92ZShyZWRpcmVjdFJlc3BvbnNlKSwgdXNlckRhdGEsIHNlbmRlci5jb3B5UmVmKCkpOworICAg IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24obV9wcm9jZXNzLCAqZnJhbWUsIFdURk1v dmUoZnJhbWVTZWN1cml0eU9yaWdpbiksIG5hdmlnYXRpb25JRCwgV1RGTW92ZShuYXZpZ2F0aW9u QWN0aW9uRGF0YSksIFdURk1vdmUoZnJhbWVJbmZvRGF0YSksIG9yaWdpbmF0aW5nUGFnZUlELCBv cmlnaW5hbFJlcXVlc3QsIFdURk1vdmUocmVxdWVzdCksIFdURk1vdmUocmVxdWVzdEJvZHkpLCBX VEZNb3ZlKHJlZGlyZWN0UmVzcG9uc2UpLCB1c2VyRGF0YSwgc2VuZGVyLmNvcHlSZWYoKSk7CiAK ICAgICAvLyBJZiB0aGUgY2xpZW50IGRpZCBub3QgcmVzcG9uZCBzeW5jaHJvbm91c2x5LCBwcm9j ZWVkIHdpdGggdGhlIGxvYWQuCiAgICAgc2VuZGVyLT5zZW5kKFdlYlBvbGljeUFjdGlvbjo6VXNl LCBuYXZpZ2F0aW9uSUQsIERvd25sb2FkSUQoKSwgV1RGOjpudWxsb3B0KTsKQEAgLTQ1NjQsMzEg KzQ1NjQsMzYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5ld1dpbmRvd0Fj dGlvbih1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cmkKIH0KIAogdm9pZCBXZWJQYWdlUHJv eHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3Vy aXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklE LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0 JiByZXF1ZXN0LCBib29sIGNhblNob3dNSU1FVHlwZSwgdWludDY0X3QgbGlzdGVuZXJJRCwgY29u c3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAgIGRlY2lkZVBvbGljeUZvclJlc3BvbnNlU2hh cmVkKG1fcHJvY2VzcywgZnJhbWVJRCwgZnJhbWVTZWN1cml0eU9yaWdpbiwgbmF2aWdhdGlvbklE LCByZXNwb25zZSwgcmVxdWVzdCwgY2FuU2hvd01JTUVUeXBlLCBsaXN0ZW5lcklELCB1c2VyRGF0 YSk7Cit9CisKK3ZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JSZXNwb25zZVNoYXJl ZChXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3Vy aXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklE LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0 JiByZXF1ZXN0LCBib29sIGNhblNob3dNSU1FVHlwZSwgdWludDY0X3QgbGlzdGVuZXJJRCwgY29u c3QgVXNlckRhdGEmIHVzZXJEYXRhKQogewogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVj dG9yKHBhZ2VDbGllbnQoKSk7CiAKICAgICBtX2RlY2lkZVBvbGljeUZvclJlc3BvbnNlUmVxdWVz dCA9IHJlcXVlc3Q7CiAKLSAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2Vi RnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7Ci0gICAgTUVTU0FHRV9D SEVDS19VUkwocmVxdWVzdC51cmwoKSk7Ci0gICAgTUVTU0FHRV9DSEVDS19VUkwocmVzcG9uc2Uu dXJsKCkpOworICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gcHJvY2Vzcy53ZWJGcmFtZShmcmFt ZUlEKTsKKyAgICBNRVNTQUdFX0NIRUNLX1NIQVJFRChmcmFtZSk7CisgICAgTUVTU0FHRV9DSEVD S19VUkxfU0hBUkVEKHJlcXVlc3QudXJsKCkpOworICAgIE1FU1NBR0VfQ0hFQ0tfVVJMX1NIQVJF RChyZXNwb25zZS51cmwoKSk7CiAKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBuYXZpZ2F0 aW9uID0gbmF2aWdhdGlvbklEID8gbV9uYXZpZ2F0aW9uU3RhdGUtPm5hdmlnYXRpb24obmF2aWdh dGlvbklEKSA6IG51bGxwdHI7Ci0gICAgYXV0byBsaXN0ZW5lciA9IG1ha2VSZWYoZnJhbWUtPnNl dFVwUG9saWN5TGlzdGVuZXJQcm94eShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRo aXMpLCBmcmFtZUlELCBsaXN0ZW5lcklELCBuYXZpZ2F0aW9uID0gV1RGTW92ZShuYXZpZ2F0aW9u KV0gKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwg UHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50 LCBSZWZQdHI8U2FmZUJyb3dzaW5nV2FybmluZz4mJiBzYWZlQnJvd3NpbmdXYXJuaW5nKSBtdXRh YmxlIHsKKyAgICBhdXRvIGxpc3RlbmVyID0gbWFrZVJlZihmcmFtZS0+c2V0VXBQb2xpY3lMaXN0 ZW5lclByb3h5KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQs IGxpc3RlbmVySUQsIG5hdmlnYXRpb24gPSBXVEZNb3ZlKG5hdmlnYXRpb24pLCBwcm9jZXNzID0g bWFrZVJlZihwcm9jZXNzKV0gKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24sIEFQSTo6V2Vi c2l0ZVBvbGljaWVzKiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJl cXVlc3RlZEJ5Q2xpZW50LCBSZWZQdHI8U2FmZUJyb3dzaW5nV2FybmluZz4mJiBzYWZlQnJvd3Np bmdXYXJuaW5nKSBtdXRhYmxlIHsKICAgICAgICAgLy8gRklYTUU6IEFzc2VydCB0aGUgQVBJOjpX ZWJzaXRlUG9saWNpZXMqIGlzIG51bGxwdHIgaGVyZSBvbmNlIGNsaWVudHMgb2YgV0tGcmFtZVBv bGljeUxpc3RlbmVyVXNlV2l0aFBvbGljaWVzIGdvIGF3YXkuCiAgICAgICAgIFJFTEVBU0VfQVNT RVJUKHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgPT0gUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRC eUNsaWVudDo6Tm8pOwogICAgICAgICBBU1NFUlRfVU5VU0VEKHNhZmVCcm93c2luZ1dhcm5pbmcs ICFzYWZlQnJvd3NpbmdXYXJuaW5nKTsKLSAgICAgICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihw b2xpY3lBY3Rpb24sIG5hdmlnYXRpb24uZ2V0KCksIFdURjo6bnVsbG9wdCwgUG9saWN5RGVjaXNp b25TZW5kZXI6OmNyZWF0ZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVk VGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySURdIChhdXRvLi4uIGFyZ3MpIHsKLSAgICAgICAgICAg IG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lz aW9uKGZyYW1lSUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CisgICAgICAgIHJl Y2VpdmVkUG9saWN5RGVjaXNpb24ocG9saWN5QWN0aW9uLCBuYXZpZ2F0aW9uLmdldCgpLCBXVEY6 Om51bGxvcHQsIFBvbGljeURlY2lzaW9uU2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRo aXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklELCBwcm9jZXNz ID0gV1RGTW92ZShwcm9jZXNzKV0gKGF1dG8uLi4gYXJncykgeworICAgICAgICAgICAgcHJvY2Vz cy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1l SUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CiAgICAgICAgIH0pKTsKICAgICB9 LCBTaG91bGRFeHBlY3RTYWZlQnJvd3NpbmdSZXN1bHQ6Ok5vKSk7CiAKICAgICBpZiAobV9wb2xp Y3lDbGllbnQpCi0gICAgICAgIG1fcG9saWN5Q2xpZW50LT5kZWNpZGVQb2xpY3lGb3JSZXNwb25z ZSgqdGhpcywgKmZyYW1lLCByZXNwb25zZSwgcmVxdWVzdCwgY2FuU2hvd01JTUVUeXBlLCBXVEZN b3ZlKGxpc3RlbmVyKSwgbV9wcm9jZXNzLT50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVzZXJE YXRhLm9iamVjdCgpKS5nZXQoKSk7CisgICAgICAgIG1fcG9saWN5Q2xpZW50LT5kZWNpZGVQb2xp Y3lGb3JSZXNwb25zZSgqdGhpcywgKmZyYW1lLCByZXNwb25zZSwgcmVxdWVzdCwgY2FuU2hvd01J TUVUeXBlLCBXVEZNb3ZlKGxpc3RlbmVyKSwgcHJvY2Vzcy50cmFuc2Zvcm1IYW5kbGVzVG9PYmpl Y3RzKHVzZXJEYXRhLm9iamVjdCgpKS5nZXQoKSk7CiAgICAgZWxzZSB7CiAgICAgICAgIGF1dG8g bmF2aWdhdGlvblJlc3BvbnNlID0gQVBJOjpOYXZpZ2F0aW9uUmVzcG9uc2U6OmNyZWF0ZShBUEk6 OkZyYW1lSW5mbzo6Y3JlYXRlKCpmcmFtZSwgZnJhbWVTZWN1cml0eU9yaWdpbi5zZWN1cml0eU9y aWdpbigpKS5nZXQoKSwgcmVxdWVzdCwgcmVzcG9uc2UsIGNhblNob3dNSU1FVHlwZSk7Ci0gICAg ICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvblJlc3BvbnNl KCp0aGlzLCBXVEZNb3ZlKG5hdmlnYXRpb25SZXNwb25zZSksIFdURk1vdmUobGlzdGVuZXIpLCBt X3Byb2Nlc3MtPnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHModXNlckRhdGEub2JqZWN0KCkpLmdl dCgpKTsKKyAgICAgICAgbV9uYXZpZ2F0aW9uQ2xpZW50LT5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0 aW9uUmVzcG9uc2UoKnRoaXMsIFdURk1vdmUobmF2aWdhdGlvblJlc3BvbnNlKSwgV1RGTW92ZShs aXN0ZW5lciksIHByb2Nlc3MudHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5vYmpl Y3QoKSkuZ2V0KCkpOwogICAgIH0KIH0KIApAQCAtNDYyNiwzOSArNDYzMSw0OSBAQCB2b2lkIFdl YlBhZ2VQcm94eTo6Y29udGVudFJ1bGVMaXN0Tm90aWZpY2F0aW9uKFVSTCYmIHVybCwgVmVjdG9y PFN0cmluZz4mJiBpZGVudAogICAgIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZE5hdmlnYXRlV2l0 aE5hdmlnYXRpb25EYXRhKGNvbnN0IFdlYk5hdmlnYXRpb25EYXRhU3RvcmUmIHN0b3JlLCB1aW50 NjRfdCBmcmFtZUlEKSAKIHsKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJk aWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YTogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBS SXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCk7CisgICAgZGlk TmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGFTaGFyZWQobV9wcm9jZXNzLCBzdG9yZSwgZnJhbWVJ RCk7Cit9CisKK3ZvaWQgV2ViUGFnZVByb3h5OjpkaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0 YVNoYXJlZChXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIGNvbnN0IFdlYk5hdmlnYXRpb25EYXRh U3RvcmUmIHN0b3JlLCB1aW50NjRfdCBmcmFtZUlEKQoreworICAgIFJFTEVBU0VfTE9HX0lGX0FM TE9XRUQoTG9hZGluZywgImRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhU2hhcmVkOiB3ZWJQ SUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBwcm9jZXNzLnByb2Nlc3NJZGVudGlmaWVyKCks IG1fcGFnZUlEKTsKIAogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGll bnQoKSk7CiAKLSAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUo ZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7Ci0gICAgTUVTU0FHRV9DSEVDSyhm cmFtZS0+cGFnZSgpID09IHRoaXMpOworICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gcHJvY2Vz cy53ZWJGcmFtZShmcmFtZUlEKTsKKyAgICBNRVNTQUdFX0NIRUNLX1NIQVJFRChmcmFtZSk7Cisg ICAgTUVTU0FHRV9DSEVDS19TSEFSRUQoZnJhbWUtPnBhZ2UoKSA9PSB0aGlzKTsKIAogICAgIGlm IChmcmFtZS0+aXNNYWluRnJhbWUoKSkKICAgICAgICAgbV9oaXN0b3J5Q2xpZW50LT5kaWROYXZp Z2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YSgqdGhpcywgc3RvcmUpOwotICAgIHByb2Nlc3MoKS5wcm9j ZXNzUG9vbCgpLmhpc3RvcnlDbGllbnQoKS5kaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YShw cm9jZXNzKCkucHJvY2Vzc1Bvb2woKSwgKnRoaXMsIHN0b3JlLCAqZnJhbWUpOworICAgIHByb2Nl c3MucHJvY2Vzc1Bvb2woKS5oaXN0b3J5Q2xpZW50KCkuZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlv bkRhdGEocHJvY2Vzcy5wcm9jZXNzUG9vbCgpLCAqdGhpcywgc3RvcmUsICpmcmFtZSk7CiB9CiAK IHZvaWQgV2ViUGFnZVByb3h5OjpkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3QoY29uc3QgU3RyaW5n JiBzb3VyY2VVUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgZGVzdGluYXRpb25VUkxTdHJpbmcsIHVp bnQ2NF90IGZyYW1lSUQpCiB7Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAi ZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0OiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0 ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwg bV9wYWdlSUQsIGZyYW1lSUQpOworICAgIGRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdFNoYXJlZCht X3Byb2Nlc3MsIHNvdXJjZVVSTFN0cmluZywgZGVzdGluYXRpb25VUkxTdHJpbmcsIGZyYW1lSUQp OworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0U2hhcmVk KFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcywgY29uc3QgU3RyaW5nJiBzb3VyY2VVUkxTdHJpbmcs IGNvbnN0IFN0cmluZyYgZGVzdGluYXRpb25VUkxTdHJpbmcsIHVpbnQ2NF90IGZyYW1lSUQpCit7 CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiZGlkUGVyZm9ybUNsaWVudFJl ZGlyZWN0U2hhcmVkOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQg PSAlIiBQUkl1NjQsIHByb2Nlc3MucHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQsIGZyYW1l SUQpOwogCiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsK IAogICAgIGlmIChzb3VyY2VVUkxTdHJpbmcuaXNFbXB0eSgpIHx8IGRlc3RpbmF0aW9uVVJMU3Ry aW5nLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogICAgIAotICAgIFdlYkZyYW1lUHJveHkq IGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNL KGZyYW1lKTsKLSAgICBNRVNTQUdFX0NIRUNLKGZyYW1lLT5wYWdlKCkgPT0gdGhpcyk7Ci0gICAg TUVTU0FHRV9DSEVDS19VUkwoc291cmNlVVJMU3RyaW5nKTsKLSAgICBNRVNTQUdFX0NIRUNLX1VS TChkZXN0aW5hdGlvblVSTFN0cmluZyk7CisgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBwcm9j ZXNzLndlYkZyYW1lKGZyYW1lSUQpOworICAgIE1FU1NBR0VfQ0hFQ0tfU0hBUkVEKGZyYW1lKTsK KyAgICBNRVNTQUdFX0NIRUNLX1NIQVJFRChmcmFtZS0+cGFnZSgpID09IHRoaXMpOworICAgIE1F U1NBR0VfQ0hFQ0tfVVJMX1NIQVJFRChzb3VyY2VVUkxTdHJpbmcpOworICAgIE1FU1NBR0VfQ0hF Q0tfVVJMX1NIQVJFRChkZXN0aW5hdGlvblVSTFN0cmluZyk7CiAKICAgICBpZiAoZnJhbWUtPmlz TWFpbkZyYW1lKCkpIHsKICAgICAgICAgbV9oaXN0b3J5Q2xpZW50LT5kaWRQZXJmb3JtQ2xpZW50 UmVkaXJlY3QoKnRoaXMsIHNvdXJjZVVSTFN0cmluZywgZGVzdGluYXRpb25VUkxTdHJpbmcpOwog ICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdCgqdGhp cywgc291cmNlVVJMU3RyaW5nLCBkZXN0aW5hdGlvblVSTFN0cmluZyk7CiAgICAgfQotICAgIHBy b2Nlc3MoKS5wcm9jZXNzUG9vbCgpLmhpc3RvcnlDbGllbnQoKS5kaWRQZXJmb3JtQ2xpZW50UmVk aXJlY3QocHJvY2VzcygpLnByb2Nlc3NQb29sKCksICp0aGlzLCBzb3VyY2VVUkxTdHJpbmcsIGRl c3RpbmF0aW9uVVJMU3RyaW5nLCAqZnJhbWUpOworICAgIHByb2Nlc3MucHJvY2Vzc1Bvb2woKS5o aXN0b3J5Q2xpZW50KCkuZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0KHByb2Nlc3MucHJvY2Vzc1Bv b2woKSwgKnRoaXMsIHNvdXJjZVVSTFN0cmluZywgZGVzdGluYXRpb25VUkxTdHJpbmcsICpmcmFt ZSk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRQZXJmb3JtU2VydmVyUmVkaXJlY3QoY29u c3QgU3RyaW5nJiBzb3VyY2VVUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgZGVzdGluYXRpb25VUkxT dHJpbmcsIHVpbnQ2NF90IGZyYW1lSUQpCkBAIC00NzE0LDcgKzQ3MjksNyBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6Y3JlYXRlTmV3UGFnZShjb25zdCBGcmFtZUluZm9EYXRhJiBvcmlnaW5hdGluZ0Zy YW1lSW5mb0RhdGEsCiAKICAgICAgICAgbmV3UGFnZS0+c2V0T3BlbmVkQnlET00oKTsKIAotICAg ICAgICByZXBseShuZXdQYWdlLT5wYWdlSUQoKSwgbmV3UGFnZS0+Y3JlYXRpb25QYXJhbWV0ZXJz KCkpOworICAgICAgICByZXBseShuZXdQYWdlLT5wYWdlSUQoKSwgbmV3UGFnZS0+Y3JlYXRpb25Q YXJhbWV0ZXJzKG1fcHJvY2VzcykpOwogCiAgICAgICAgIFdlYnNpdGVEYXRhU3RvcmU6OmNsb25l U2Vzc2lvbkRhdGEoKnRoaXMsICpuZXdQYWdlKTsKICAgICAgICAgbmV3UGFnZS0+bV9zaG91bGRT dXBwcmVzc0FwcExpbmtzSW5OZXh0TmF2aWdhdGlvblBvbGljeURlY2lzaW9uID0gaG9zdHNBcmVF cXVhbChVUkwoeyB9LCBtYWluRnJhbWVVUkwpLCByZXF1ZXN0LnVybCgpKTsKQEAgLTUzNTUsMTQg KzUzNzAsMTkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmJhY2tGb3J3YXJkQWRkSXRlbShCYWNrRm9y d2FyZExpc3RJdGVtU3RhdGUmJiBpdGVtU3RhdGUpCiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5Ojpi YWNrRm9yd2FyZEdvVG9JdGVtKGNvbnN0IEJhY2tGb3J3YXJkSXRlbUlkZW50aWZpZXImIGl0ZW1J RCwgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJiBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKQorewor ICAgIGJhY2tGb3J3YXJkR29Ub0l0ZW1TaGFyZWQobV9wcm9jZXNzLCBpdGVtSUQsIHNhbmRib3hF eHRlbnNpb25IYW5kbGUpOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6YmFja0ZvcndhcmRHb1Rv SXRlbVNoYXJlZChXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIGNvbnN0IEJhY2tGb3J3YXJkSXRl bUlkZW50aWZpZXImIGl0ZW1JRCwgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJiBzYW5kYm94RXh0 ZW5zaW9uSGFuZGxlKQogewogICAgIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qIGl0ZW0gPSBtX2Jh Y2tGb3J3YXJkTGlzdC0+aXRlbUZvcklEKGl0ZW1JRCk7CiAgICAgaWYgKCFpdGVtKQogICAgICAg ICByZXR1cm47CiAKLSAgICBib29sIGNyZWF0ZWRFeHRlbnNpb24gPSBtYXliZUluaXRpYWxpemVT YW5kYm94RXh0ZW5zaW9uSGFuZGxlKFVSTChVUkwoKSwgaXRlbS0+dXJsKCkpLCBzYW5kYm94RXh0 ZW5zaW9uSGFuZGxlKTsKKyAgICBib29sIGNyZWF0ZWRFeHRlbnNpb24gPSBtYXliZUluaXRpYWxp emVTYW5kYm94RXh0ZW5zaW9uSGFuZGxlKHByb2Nlc3MsIFVSTChVUkwoKSwgaXRlbS0+dXJsKCkp LCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsKICAgICBpZiAoY3JlYXRlZEV4dGVuc2lvbikKLSAg ICAgICAgd2lsbEFjcXVpcmVVbml2ZXJzYWxGaWxlUmVhZFNhbmRib3hFeHRlbnNpb24oKTsKKyAg ICAgICAgd2lsbEFjcXVpcmVVbml2ZXJzYWxGaWxlUmVhZFNhbmRib3hFeHRlbnNpb24ocHJvY2Vz cyk7CiAgICAgbV9iYWNrRm9yd2FyZExpc3QtPmdvVG9JdGVtKCppdGVtKTsKIH0KIApAQCAtNjQw Myw2ICs2NDIzLDEzIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpwcm9jZXNzRGlkVGVybWluYXRlKFBy b2Nlc3NUZXJtaW5hdGlvblJlYXNvbiByZWFzb24pCiAgICAgc3RvcEFsbFVSTFNjaGVtZVRhc2tz KCk7CiB9CiAKK3ZvaWQgV2ViUGFnZVByb3h5Ojpwcm92aXNpb25hbFByb2Nlc3NEaWRUZXJtaW5h dGUoKQoreworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFnZSk7CisgICAgbV9wcm92aXNpb25h bFBhZ2UtPmNhbmNlbCgpOworICAgIG1fcHJvdmlzaW9uYWxQYWdlID0gbnVsbHB0cjsKK30KKwog c3RhdGljIGJvb2wgc2hvdWxkUmVsb2FkQWZ0ZXJQcm9jZXNzVGVybWluYXRpb24oUHJvY2Vzc1Rl cm1pbmF0aW9uUmVhc29uIHJlYXNvbikKIHsKICAgICBzd2l0Y2ggKHJlYXNvbikgewpAQCAtNjQ5 MCw4ICs2NTE3LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnByb2Nlc3NXaWxsQmVjb21lRm9yZWdy b3VuZCgpCiB2b2lkIFdlYlBhZ2VQcm94eTo6cmVzZXRTdGF0ZShSZXNldFN0YXRlUmVhc29uIHJl c2V0U3RhdGVSZWFzb24pCiB7CiAgICAgbV9tYWluRnJhbWUgPSBudWxscHRyOwotICAgIG1fbWFp bkZyYW1lQ3JlYXRpb25IYW5kbGVyID0gbnVsbHB0cjsKLSAgICBtX21haW5GcmFtZVdpbmRvd0Ny ZWF0aW9uSGFuZGxlciA9IG51bGxwdHI7CiAKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBtX3Nj cm9sbGluZ1BlcmZvcm1hbmNlRGF0YSA9IG51bGxwdHI7CkBAIC02NjgwLDcgKzY3MDUsNyBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6cmVzZXRTdGF0ZUFmdGVyUHJvY2Vzc0V4aXRlZChQcm9jZXNzVGVy bWluYXRpb25SZWFzb24gdGVybWluYQogICAgIG1fcHJvY2Vzcy0+cHJvY2Vzc1Rlcm1pbmF0ZWQo KTsKIH0KIAotV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyBXZWJQYWdlUHJveHk6OmNyZWF0aW9u UGFyYW1ldGVycygpCitXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6Y3Jl YXRpb25QYXJhbWV0ZXJzKFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcykKIHsKICAgICBXZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzIHBhcmFtZXRlcnM7CiAKQEAgLTY3ODIsOSArNjgwNywxMyBAQCBX ZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJz KCkKICAgICBwYXJhbWV0ZXJzLmFwcGxpY2F0aW9uTWFuaWZlc3QgPSBtX2NvbmZpZ3VyYXRpb24t PmFwcGxpY2F0aW9uTWFuaWZlc3QoKSA/IE9wdGlvbmFsPFdlYkNvcmU6OkFwcGxpY2F0aW9uTWFu aWZlc3Q+KG1fY29uZmlndXJhdGlvbi0+YXBwbGljYXRpb25NYW5pZmVzdCgpLT5hcHBsaWNhdGlv bk1hbmlmZXN0KCkpIDogV1RGOjpudWxsb3B0OwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoU0VSVklD RV9XT1JLRVIpCisgICAgcGFyYW1ldGVycy5oYXNSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMgPSBw cm9jZXNzLnByb2Nlc3NQb29sKCkubWF5SGF2ZVJlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyhtX3dl YnNpdGVEYXRhU3RvcmUpOworI2VuZGlmCisKICAgICBwYXJhbWV0ZXJzLm5lZWRzRm9udEF0dHJp YnV0ZXMgPSBtX25lZWRzRm9udEF0dHJpYnV0ZXM7CiAKLSAgICBtX3Byb2Nlc3MtPmFkZFdlYlVz ZXJDb250ZW50Q29udHJvbGxlclByb3h5KG1fdXNlckNvbnRlbnRDb250cm9sbGVyLCBwYXJhbWV0 ZXJzKTsKKyAgICBwcm9jZXNzLmFkZFdlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5KG1fdXNl ckNvbnRlbnRDb250cm9sbGVyLCBwYXJhbWV0ZXJzKTsKIAogICAgIHJldHVybiBwYXJhbWV0ZXJz OwogfQpAQCAtODE0MywxMSArODE3MiwxNiBAQCBXZWJVUkxTY2hlbWVIYW5kbGVyKiBXZWJQYWdl UHJveHk6OnVybFNjaGVtZUhhbmRsZXJGb3JTY2hlbWUoY29uc3QgU3RyaW5nJiBzY2hlbQogfQog CiB2b2lkIFdlYlBhZ2VQcm94eTo6c3RhcnRVUkxTY2hlbWVUYXNrKFVSTFNjaGVtZVRhc2tQYXJh bWV0ZXJzJiYgcGFyYW1ldGVycykKK3sKKyAgICBzdGFydFVSTFNjaGVtZVRhc2tTaGFyZWQobV9w cm9jZXNzLCBXVEZNb3ZlKHBhcmFtZXRlcnMpKTsKK30KKwordm9pZCBXZWJQYWdlUHJveHk6OnN0 YXJ0VVJMU2NoZW1lVGFza1NoYXJlZChXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIFVSTFNjaGVt ZVRhc2tQYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKIHsKICAgICBhdXRvIGl0ZXJhdG9yID0gbV91 cmxTY2hlbWVIYW5kbGVyc0J5SWRlbnRpZmllci5maW5kKHBhcmFtZXRlcnMuaGFuZGxlcklkZW50 aWZpZXIpOwogICAgIE1FU1NBR0VfQ0hFQ0soaXRlcmF0b3IgIT0gbV91cmxTY2hlbWVIYW5kbGVy c0J5SWRlbnRpZmllci5lbmQoKSk7CiAKLSAgICBpdGVyYXRvci0+dmFsdWUtPnN0YXJ0VGFzaygq dGhpcywgcGFyYW1ldGVycy50YXNrSWRlbnRpZmllciwgV1RGTW92ZShwYXJhbWV0ZXJzLnJlcXVl c3QpLCBudWxscHRyKTsKKyAgICBpdGVyYXRvci0+dmFsdWUtPnN0YXJ0VGFzaygqdGhpcywgcHJv Y2VzcywgcGFyYW1ldGVycy50YXNrSWRlbnRpZmllciwgV1RGTW92ZShwYXJhbWV0ZXJzLnJlcXVl c3QpLCBudWxscHRyKTsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OnN0b3BVUkxTY2hlbWVUYXNr KHVpbnQ2NF90IGhhbmRsZXJJZGVudGlmaWVyLCB1aW50NjRfdCB0YXNrSWRlbnRpZmllcikKQEAg LTgxNjMsNyArODE5Nyw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkU3luY2hyb25vdXNVUkxT Y2hlbWVUYXNrKFVSTFNjaGVtZVRhc2tQYXJhbWV0ZXJzJiYgcGFyYW1lCiAgICAgYXV0byBpdGVy YXRvciA9IG1fdXJsU2NoZW1lSGFuZGxlcnNCeUlkZW50aWZpZXIuZmluZChwYXJhbWV0ZXJzLmhh bmRsZXJJZGVudGlmaWVyKTsKICAgICBNRVNTQUdFX0NIRUNLKGl0ZXJhdG9yICE9IG1fdXJsU2No ZW1lSGFuZGxlcnNCeUlkZW50aWZpZXIuZW5kKCkpOwogCi0gICAgaXRlcmF0b3ItPnZhbHVlLT5z dGFydFRhc2soKnRoaXMsIHBhcmFtZXRlcnMudGFza0lkZW50aWZpZXIsIFdURk1vdmUocGFyYW1l dGVycy5yZXF1ZXN0KSwgV1RGTW92ZShyZXBseSkpOworICAgIGl0ZXJhdG9yLT52YWx1ZS0+c3Rh cnRUYXNrKCp0aGlzLCBtX3Byb2Nlc3MsIHBhcmFtZXRlcnMudGFza0lkZW50aWZpZXIsIFdURk1v dmUocGFyYW1ldGVycy5yZXF1ZXN0KSwgV1RGTW92ZShyZXBseSkpOwogfQogCiAjaWYgRU5BQkxF KFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKQEAgLTg1MzIsMTAgKzg1NjYsMTAgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmFkZFByZXZpb3VzbHlWaXNpdGVkUGF0aChjb25zdCBTdHJpbmcmIHBhdGgp CiAgICAgbV9wcmV2aW91c2x5VmlzaXRlZFBhdGhzLmFkZChwYXRoKTsKIH0KIAotdm9pZCBXZWJQ YWdlUHJveHk6OndpbGxBY3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5zaW9uKCkK K3ZvaWQgV2ViUGFnZVByb3h5Ojp3aWxsQWNxdWlyZVVuaXZlcnNhbEZpbGVSZWFkU2FuZGJveEV4 dGVuc2lvbihXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MpCiB7CiAgICAgbV9tYXlIYXZlVW5pdmVy c2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5zaW9uID0gdHJ1ZTsKLSAgICBwcm9jZXNzKCkud2lsbEFj cXVpcmVVbml2ZXJzYWxGaWxlUmVhZFNhbmRib3hFeHRlbnNpb24oKTsKKyAgICBwcm9jZXNzLndp bGxBY3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5zaW9uKCk7CiB9CiAKIHZvaWQg V2ViUGFnZVByb3h5OjpzaW11bGF0ZURldmljZU9yaWVudGF0aW9uQ2hhbmdlKGRvdWJsZSBhbHBo YSwgZG91YmxlIGJldGEsIGRvdWJsZSBnYW1tYSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgKaW5kZXggZGU5ODY5NGFhMzcuLmVhZTI0ZjM2ODRlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMjI1LDYgKzIyNSw3IEBAIGNsYXNzIE5hdGl2ZVdl YktleWJvYXJkRXZlbnQ7CiBjbGFzcyBOYXRpdmVXZWJNb3VzZUV2ZW50OwogY2xhc3MgTmF0aXZl V2ViV2hlZWxFdmVudDsKIGNsYXNzIFBhZ2VDbGllbnQ7CitjbGFzcyBQcm92aXNpb25hbFBhZ2VQ cm94eTsKIGNsYXNzIFJlbW90ZUxheWVyVHJlZUhvc3Q7CiBjbGFzcyBSZW1vdGVMYXllclRyZWVT Y3JvbGxpbmdQZXJmb3JtYW5jZURhdGE7CiBjbGFzcyBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlv bjsKQEAgLTM3OSw2ICszODAsNyBAQCBwdWJsaWM6CiAKICAgICBib29sIGFkZHNWaXNpdGVkTGlu a3MoKSBjb25zdCB7IHJldHVybiBtX2FkZHNWaXNpdGVkTGlua3M7IH0KICAgICB2b2lkIHNldEFk ZHNWaXNpdGVkTGlua3MoYm9vbCBhZGRzVmlzaXRlZExpbmtzKSB7IG1fYWRkc1Zpc2l0ZWRMaW5r cyA9IGFkZHNWaXNpdGVkTGlua3M7IH0KKyAgICBWaXNpdGVkTGlua1N0b3JlJiB2aXNpdGVkTGlu a1N0b3JlKCkgeyByZXR1cm4gbV92aXNpdGVkTGlua1N0b3JlOyB9CiAKICAgICB2b2lkIGV4aXRG dWxsc2NyZWVuSW1tZWRpYXRlbHkoKTsKICAgICB2b2lkIGZ1bGxzY3JlZW5NYXlSZXR1cm5Ub0lu bGluZSgpOwpAQCAtNDU4LDggKzQ2MCw4IEBAIHB1YmxpYzoKICAgICBBUEk6Okljb25Mb2FkaW5n Q2xpZW50JiBpY29uTG9hZGluZ0NsaWVudCgpIHsgcmV0dXJuICptX2ljb25Mb2FkaW5nQ2xpZW50 OyB9CiAgICAgdm9pZCBzZXRJY29uTG9hZGluZ0NsaWVudChzdGQ6OnVuaXF1ZV9wdHI8QVBJOjpJ Y29uTG9hZGluZ0NsaWVudD4mJik7CiAKLSAgICBlbnVtIGNsYXNzIElzU3dhcEZyb21TdXNwZW5k ZWQgeyBObywgWWVzIH07Ci0gICAgdm9pZCBpbml0aWFsaXplV2ViUGFnZShJc1N3YXBGcm9tU3Vz cGVuZGVkID0gSXNTd2FwRnJvbVN1c3BlbmRlZDo6Tm8pOworICAgIHZvaWQgaW5pdGlhbGl6ZVdl YlBhZ2UoKTsKKyAgICB2b2lkIHNldERyYXdpbmdBcmVhKHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5n QXJlYVByb3h5PiYmKTsKIAogICAgIFdlYWtQdHI8U2VjS2V5UHJveHlTdG9yZT4gc2VjS2V5UHJv eHlTdG9yZShjb25zdCBXZWJDb3JlOjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSYpOwogICAgICAg ICAKQEAgLTk5Nyw2ICs5OTksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBwcm9jZXNzRGlkQmVjb21l VW5yZXNwb25zaXZlKCk7CiAgICAgdm9pZCBwcm9jZXNzRGlkQmVjb21lUmVzcG9uc2l2ZSgpOwog ICAgIHZvaWQgcHJvY2Vzc0RpZFRlcm1pbmF0ZShQcm9jZXNzVGVybWluYXRpb25SZWFzb24pOwor ICAgIHZvaWQgcHJvdmlzaW9uYWxQcm9jZXNzRGlkVGVybWluYXRlKCk7CiAgICAgdm9pZCBkaXNw YXRjaFByb2Nlc3NEaWRUZXJtaW5hdGUoUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uKTsKICAgICB2 b2lkIHdpbGxDaGFuZ2VQcm9jZXNzSXNSZXNwb25zaXZlKCk7CiAgICAgdm9pZCBkaWRDaGFuZ2VQ cm9jZXNzSXNSZXNwb25zaXZlKCk7CkBAIC0xMDU4LDcgKzEwNjEsNyBAQCBwdWJsaWM6CiAgICAg dm9pZCBkaWRDaG9vc2VGaWxlc0Zvck9wZW5QYW5lbChjb25zdCBWZWN0b3I8U3RyaW5nPiYpOwog ICAgIHZvaWQgZGlkQ2FuY2VsRm9yT3BlblBhbmVsKCk7CiAKLSAgICBXZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzIGNyZWF0aW9uUGFyYW1ldGVycygpOworICAgIFdlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnMgY3JlYXRpb25QYXJhbWV0ZXJzKFdlYlByb2Nlc3NQcm94eSYpOwogCiAgICAgdm9pZCBo YW5kbGVEb3dubG9hZFJlcXVlc3QoRG93bmxvYWRQcm94eSopOwogCkBAIC0xNDE1LDYgKzE0MTgs MjggQEAgcHVibGljOgogICAgIEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyJiBlZGl0YWJsZUltYWdl Q29udHJvbGxlcigpIHsgcmV0dXJuICptX2VkaXRhYmxlSW1hZ2VDb250cm9sbGVyOyB9CiAjZW5k aWYKIAorICAgIFByb3Zpc2lvbmFsUGFnZVByb3h5KiBwcm92aXNpb25hbFBhZ2VQcm94eSgpIGNv bnN0IHsgcmV0dXJuIG1fcHJvdmlzaW9uYWxQYWdlLmdldCgpOyB9CisgICAgdm9pZCBjb21taXRQ cm92aXNpb25hbFBhZ2UodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBj b25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVy LCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8m LCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2Vj dXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYpOwor CisgICAgLy8gTG9naWMgc2hhcmVkIGJldHdlZW4gdGhlIFdlYlBhZ2VQcm94eSBhbmQgdGhlIFBy b3Zpc2lvbmFsUGFnZVByb3h5LgorICAgIHZvaWQgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JG cmFtZVNoYXJlZChXZWJQcm9jZXNzUHJveHkmLCB1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBu YXZpZ2F0aW9uSUQsIFVSTCYmLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEm KTsKKyAgICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZVNoYXJlZChXZWJQcm9j ZXNzUHJveHkmLCB1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdp bkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3Qg U3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIGNv bnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92 aXNpb25hbExvYWRGb3JGcmFtZVNoYXJlZChXZWJQcm9jZXNzUHJveHkmLCB1aW50NjRfdCBmcmFt ZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBj b25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0U2hhcmVk KFdlYlByb2Nlc3NQcm94eSYsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMU3RyaW5nLCBjb25zdCBT dHJpbmcmIGRlc3RpbmF0aW9uVVJMU3RyaW5nLCB1aW50NjRfdCBmcmFtZUlEKTsKKyAgICB2b2lk IGRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhU2hhcmVkKFdlYlByb2Nlc3NQcm94eSYsIGNv bnN0IFdlYk5hdmlnYXRpb25EYXRhU3RvcmUmLCB1aW50NjRfdCBmcmFtZUlEKTsKKyAgICB2b2lk IGRpZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWVTaGFyZWQoV2ViUHJvY2Vzc1Byb3h5Jiwg dWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJik7CisgICAgdm9p ZCBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmNTaGFyZWQoV2ViUHJvY2Vzc1By b3h5JiwgdWludDY0X3QgZnJhbWVJRCwgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiYgZnJh bWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBOYXZpZ2F0aW9uQWN0aW9u RGF0YSYmLCBGcmFtZUluZm9EYXRhJiYsIHVpbnQ2NF90IG9yaWdpbmF0aW5nUGFnZUlELCBjb25z dCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVxdWVzdCwgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiYsIElQQzo6Rm9ybURhdGFSZWZlcmVuY2UmJiByZXF1ZXN0Qm9keSwgV2Vi Q29yZTo6UmVzb3VyY2VSZXNwb25zZSYmIHJlZGlyZWN0UmVzcG9uc2UsIGNvbnN0IFVzZXJEYXRh JiwgdWludDY0X3QgbGlzdGVuZXJJRCk7CisgICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JSZXNwb25z ZVNoYXJlZChXZWJQcm9jZXNzUHJveHkmLCB1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3Jl OjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmln YXRpb25JRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYsIGNvbnN0IFdlYkNvcmU6 OlJlc291cmNlUmVxdWVzdCYsIGJvb2wgY2FuU2hvd01JTUVUeXBlLCB1aW50NjRfdCBsaXN0ZW5l cklELCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgc3RhcnRVUkxTY2hlbWVUYXNrU2hhcmVk KFdlYlByb2Nlc3NQcm94eSYsIFVSTFNjaGVtZVRhc2tQYXJhbWV0ZXJzJiYpOworICAgIHZvaWQg bG9hZERhdGFXaXRoTmF2aWdhdGlvblNoYXJlZChXZWJQcm9jZXNzUHJveHkmLCBBUEk6Ok5hdmln YXRpb24mLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBl LCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2Jq ZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRp b25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKKyAgICB2b2lkIGxv YWRSZXF1ZXN0V2l0aE5hdmlnYXRpb25TaGFyZWQoV2ViUHJvY2Vzc1Byb3h5JiwgQVBJOjpOYXZp Z2F0aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlNob3VsZE9wZW5F eHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxk VHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0g V1RGOjpudWxsb3B0KTsKKyAgICB2b2lkIGJhY2tGb3J3YXJkR29Ub0l0ZW1TaGFyZWQoV2ViUHJv Y2Vzc1Byb3h5JiwgY29uc3QgV2ViQ29yZTo6QmFja0ZvcndhcmRJdGVtSWRlbnRpZmllciYsIFNh bmRib3hFeHRlbnNpb246OkhhbmRsZSYpOworCisgICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIK KyAgICAvLyBJbXBsZW1lbnRlZCBpbiBnZW5lcmF0ZWQgV2ViUGFnZVByb3h5TWVzc2FnZVJlY2Vp dmVyLmNwcAorICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBD OjpEZWNvZGVyJikgb3ZlcnJpZGU7CisgICAgdm9pZCBkaWRSZWNlaXZlU3luY01lc3NhZ2UoSVBD OjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJiwgc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rl cj4mKSBvdmVycmlkZTsKKwogcHJpdmF0ZToKICAgICBXZWJQYWdlUHJveHkoUGFnZUNsaWVudCYs IFdlYlByb2Nlc3NQcm94eSYsIHVpbnQ2NF90IHBhZ2VJRCwgUmVmPEFQSTo6UGFnZUNvbmZpZ3Vy YXRpb24+JiYpOwogICAgIHZvaWQgcGxhdGZvcm1Jbml0aWFsaXplKCk7CkBAIC0xNDM5LDEyICsx NDY0LDYgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgc2V0VXNlckFnZW50KFN0cmluZyYmKTsKIAot ICAgIC8vIElQQzo6TWVzc2FnZVJlY2VpdmVyCi0gICAgLy8gSW1wbGVtZW50ZWQgaW4gZ2VuZXJh dGVkIFdlYlBhZ2VQcm94eU1lc3NhZ2VSZWNlaXZlci5jcHAKLSAgICB2b2lkIGRpZFJlY2VpdmVN ZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIG92ZXJyaWRlOwotICAgIHZv aWQgZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYs IHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+Jikgb3ZlcnJpZGU7Ci0KLQogICAgIC8vIElQ Qzo6TWVzc2FnZVNlbmRlcgogICAgIGJvb2wgc2VuZE1lc3NhZ2Uoc3RkOjp1bmlxdWVfcHRyPElQ Qzo6RW5jb2Rlcj4sIE9wdGlvblNldDxJUEM6OlNlbmRPcHRpb24+KSBvdmVycmlkZTsKICAgICBJ UEM6OkNvbm5lY3Rpb24qIG1lc3NhZ2VTZW5kZXJDb25uZWN0aW9uKCkgb3ZlcnJpZGU7CkBAIC0x NDk2LDcgKzE1MTUsNyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBkaWREZXN0cm95TmF2aWdhdGlv bih1aW50NjRfdCBuYXZpZ2F0aW9uSUQpOwogCi0gICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uKFdlYkZyYW1lUHJveHkmLCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEm JiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIE5hdmlnYXRpb25B Y3Rpb25EYXRhJiYsIEZyYW1lSW5mb0RhdGEmJiwgdWludDY0X3Qgb3JpZ2luYXRpbmdQYWdlSUQs IGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0LCBXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QmJiwgSVBDOjpGb3JtRGF0YVJlZmVyZW5jZSYmIHJlcXVlc3RCb2R5 LCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYgcmVkaXJlY3RSZXNwb25zZSwgY29uc3QgVXNl ckRhdGEmLCBSZWY8UG9saWN5RGVjaXNpb25TZW5kZXI+JiYpOworICAgIHZvaWQgZGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXZWJQcm9jZXNzUHJveHkmLCBXZWJGcmFtZVByb3h5Jiwg V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0 X3QgbmF2aWdhdGlvbklELCBOYXZpZ2F0aW9uQWN0aW9uRGF0YSYmLCBGcmFtZUluZm9EYXRhJiYs IHVpbnQ2NF90IG9yaWdpbmF0aW5nUGFnZUlELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QmIG9yaWdpbmFsUmVxdWVzdCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIElQQzo6Rm9y bURhdGFSZWZlcmVuY2UmJiByZXF1ZXN0Qm9keSwgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYm IHJlZGlyZWN0UmVzcG9uc2UsIGNvbnN0IFVzZXJEYXRhJiwgUmVmPFBvbGljeURlY2lzaW9uU2Vu ZGVyPiYmKTsKICAgICB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYyh1 aW50NjRfdCBmcmFtZUlELCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmJiBmcmFtZVNlY3Vy aXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIE5hdmlnYXRpb25BY3Rpb25EYXRhJiYs IEZyYW1lSW5mb0RhdGEmJiwgdWludDY0X3Qgb3JpZ2luYXRpbmdQYWdlSUQsIGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0LCBXZWJDb3JlOjpSZXNvdXJjZVJl cXVlc3QmJiwgSVBDOjpGb3JtRGF0YVJlZmVyZW5jZSYmIHJlcXVlc3RCb2R5LCBXZWJDb3JlOjpS ZXNvdXJjZVJlc3BvbnNlJiYgcmVkaXJlY3RSZXNwb25zZSwgY29uc3QgVXNlckRhdGEmLCB1aW50 NjRfdCBsaXN0ZW5lcklEKTsKICAgICB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rp b25TeW5jKHVpbnQ2NF90IGZyYW1lSUQsIGJvb2wgaXNNYWluRnJhbWUsIFdlYkNvcmU6OlNlY3Vy aXR5T3JpZ2luRGF0YSYmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25J RCwgTmF2aWdhdGlvbkFjdGlvbkRhdGEmJiwgRnJhbWVJbmZvRGF0YSYmLCB1aW50NjRfdCBvcmln aW5hdGluZ1BhZ2VJRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBvcmlnaW5hbFJl cXVlc3QsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBJUEM6OkZvcm1EYXRhUmVmZXJlbmNl JiYgcmVxdWVzdEJvZHksIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmJiByZWRpcmVjdFJlc3Bv bnNlLCBjb25zdCBVc2VyRGF0YSYsIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb25TeW5jOjpEZWxheWVkUmVwbHkmJik7CiAgICAgdm9pZCBkZWNp ZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24odWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29y ZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCBOYXZpZ2F0aW9uQWN0 aW9uRGF0YSYmLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgY29uc3QgU3RyaW5nJiBmcmFt ZU5hbWUsIHVpbnQ2NF90IGxpc3RlbmVySUQsIGNvbnN0IFVzZXJEYXRhJik7CkBAIC0xNTc1LDE4 ICsxNTk0LDE2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRDYW5TaG9ydENpcmN1aXRIb3Jpem9u dGFsV2hlZWxFdmVudHMoYm9vbCBjYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMp IHsgbV9jYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMgPSBjYW5TaG9ydENpcmN1 aXRIb3Jpem9udGFsV2hlZWxFdmVudHM7IH0KIAogICAgIHZvaWQgcmVhdHRhY2hUb1dlYlByb2Nl c3MoKTsKLSAgICB2b2lkIHN3YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiwg c3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiwgSXNTd2FwRnJvbVN1c3BlbmRl ZCk7CisgICAgdm9pZCBzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIHN0 ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmLCBSZWZQdHI8V2ViRnJhbWVQcm94eT4m JiBtYWluRnJhbWUpOwogICAgIHZvaWQgZGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAo KTsKICAgICB2b2lkIGRpZFN1c3BlbmRBZnRlclByb2Nlc3NTd2FwKCk7CiAKLSAgICB2b2lkIGZp bmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhJc1N3YXBGcm9tU3VzcGVuZGVkID0gSXNTd2FwRnJv bVN1c3BlbmRlZDo6Tm8pOworICAgIGVudW0gY2xhc3MgU2hvdWxkSW5pdGlhbGl6ZVdlYlBhZ2Ug eyBObywgWWVzIH07CisgICAgdm9pZCBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoU2hvdWxk SW5pdGlhbGl6ZVdlYlBhZ2UgPSBTaG91bGRJbml0aWFsaXplV2ViUGFnZTo6WWVzKTsKIAogICAg IFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IHJlYXR0YWNoVG9XZWJQcm9jZXNzRm9yUmVsb2FkKCk7 CiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRl bShXZWJCYWNrRm9yd2FyZExpc3RJdGVtJik7CiAKLSAgICB2b2lkIGxvYWREYXRhV2l0aE5hdmln YXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiwgY29uc3Qg U3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBi YXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250 aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9w dCk7Ci0gICAgdm9pZCBsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYs IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxV UkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXND b250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVs bG9wdCk7Ci0KICAgICB2b2lkIHJlcXVlc3ROb3RpZmljYXRpb25QZXJtaXNzaW9uKHVpbnQ2NF90 IG5vdGlmaWNhdGlvbklELCBjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZyk7CiAgICAgdm9pZCBz aG93Tm90aWZpY2F0aW9uKGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmluZyYgYm9keSwg Y29uc3QgU3RyaW5nJiBpY29uVVJMLCBjb25zdCBTdHJpbmcmIHRhZywgY29uc3QgU3RyaW5nJiBs YW5nLCBXZWJDb3JlOjpOb3RpZmljYXRpb25EaXJlY3Rpb24sIGNvbnN0IFN0cmluZyYgb3JpZ2lu U3RyaW5nLCB1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CiAgICAgdm9pZCBjYW5jZWxOb3RpZmlj YXRpb24odWludDY0X3Qgbm90aWZpY2F0aW9uSUQpOwpAQCAtMTc0NSw3ICsxNzYyLDcgQEAgcHJp dmF0ZToKICAgICB2b2lkIHNldFBsdWdpbkNvbXBsZXhUZXh0SW5wdXRTdGF0ZSh1aW50NjRfdCBw bHVnaW5Db21wbGV4VGV4dElucHV0SWRlbnRpZmllciwgdWludDY0X3QgY29tcGxleFRleHRJbnB1 dFN0YXRlKTsKICNlbmRpZgogCi0gICAgYm9vbCBtYXliZUluaXRpYWxpemVTYW5kYm94RXh0ZW5z aW9uSGFuZGxlKGNvbnN0IFVSTCYsIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYpOworICAgIGJv b2wgbWF5YmVJbml0aWFsaXplU2FuZGJveEV4dGVuc2lvbkhhbmRsZShXZWJQcm9jZXNzUHJveHkm LCBjb25zdCBVUkwmLCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUmKTsKIAogI2lmIFVTRShBVVRP TUFUSUNfVEVYVF9SRVBMQUNFTUVOVCkKICAgICB2b2lkIHRvZ2dsZVNtYXJ0SW5zZXJ0RGVsZXRl KCk7CkBAIC0xODY2LDcgKzE4ODMsNyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBjaGVja1VSTFJl Y2VpdmVkRnJvbUN1cnJlbnRPclByZXZpb3VzV2ViUHJvY2Vzcyhjb25zdCBTdHJpbmcmKTsKICAg ICBib29sIGNoZWNrVVJMUmVjZWl2ZWRGcm9tQ3VycmVudE9yUHJldmlvdXNXZWJQcm9jZXNzKGNv bnN0IFVSTCYpOwotICAgIHZvaWQgd2lsbEFjcXVpcmVVbml2ZXJzYWxGaWxlUmVhZFNhbmRib3hF eHRlbnNpb24oKTsKKyAgICB2b2lkIHdpbGxBY3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94 RXh0ZW5zaW9uKFdlYlByb2Nlc3NQcm94eSYpOwogCiAgICAgdm9pZCBoYW5kbGVBdXRvRmlsbEJ1 dHRvbkNsaWNrKGNvbnN0IFVzZXJEYXRhJik7CiAKQEAgLTE5NTIsOCArMTk2OSw2IEBAIHByaXZh dGU6CiAgICAgUmVmPFdlYnNpdGVEYXRhU3RvcmU+IG1fd2Vic2l0ZURhdGFTdG9yZTsKIAogICAg IFJlZlB0cjxXZWJGcmFtZVByb3h5PiBtX21haW5GcmFtZTsKLSAgICBGdW5jdGlvbjx2b2lkKCk+ IG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyOwotICAgIEZ1bmN0aW9uPHZvaWQoY29uc3QgV2Vi Q29yZTo6R2xvYmFsV2luZG93SWRlbnRpZmllciYpPiBtX21haW5GcmFtZVdpbmRvd0NyZWF0aW9u SGFuZGxlcjsKIAogICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5PiBtX2ZvY3VzZWRGcmFtZTsKICAg ICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9mcmFtZVNldExhcmdlc3RGcmFtZTsKQEAgLTIzMjQs NiArMjMzOSw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX25lZWRzRm9udEF0dHJpYnV0ZXMgeyBm YWxzZSB9OwogICAgIGJvb2wgbV9tYXlIYXZlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5z aW9uIHsgZmFsc2UgfTsKIAorICAgIHN0ZDo6dW5pcXVlX3B0cjxQcm92aXNpb25hbFBhZ2VQcm94 eT4gbV9wcm92aXNpb25hbFBhZ2U7CisKICNpZiBIQVZFKFBFTkNJTEtJVCkKICAgICBzdGQ6OnVu aXF1ZV9wdHI8RWRpdGFibGVJbWFnZUNvbnRyb2xsZXI+IG1fZWRpdGFibGVJbWFnZUNvbnRyb2xs ZXI7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nl c3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3Bw CmluZGV4IGRiMWZkNThiOTNkLi42YmU5ZGMzOTllMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCkBAIC0zNCw2ICszNCw3IEBACiAjaW5jbHVkZSAiTG9n Z2luZy5oIgogI2luY2x1ZGUgIlBsdWdpbkluZm9TdG9yZS5oIgogI2luY2x1ZGUgIlBsdWdpblBy b2Nlc3NNYW5hZ2VyLmgiCisjaW5jbHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbmNs dWRlICJUZXh0Q2hlY2tlci5oIgogI2luY2x1ZGUgIlRleHRDaGVja2VyU3RhdGUuaCIKICNpbmNs dWRlICJVSU1lc3NhZ2VQb3J0Q2hhbm5lbFByb3ZpZGVyLmgiCkBAIC01ODQsNiArNTg1LDE1IEBA IGJvb2wgV2ViUHJvY2Vzc1Byb3h5OjpmdWxsS2V5Ym9hcmRBY2Nlc3NFbmFibGVkKCkKIH0KICNl bmRpZgogCitib29sIFdlYlByb2Nlc3NQcm94eTo6aGFzUHJvdmlzaW9uYWxQYWdlV2l0aElEKHVp bnQ2NF90IHBhZ2VJRCkgY29uc3QKK3sKKyAgICBmb3IgKGF1dG8qIHByb3Zpc2lvbmFsUGFnZSA6 IG1fcHJvdmlzaW9uYWxQYWdlcykgeworICAgICAgICBpZiAocHJvdmlzaW9uYWxQYWdlLT5wYWdl KCkucGFnZUlEKCkgPT0gcGFnZUlEKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQor ICAgIHJldHVybiBmYWxzZTsKK30KKwogdm9pZCBXZWJQcm9jZXNzUHJveHk6OnVwZGF0ZUJhY2tG b3J3YXJkSXRlbShjb25zdCBCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUmIGl0ZW1TdGF0ZSkKIHsK ICAgICBpZiAoYXV0byogaXRlbSA9IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW06Oml0ZW1Gb3JJRChp dGVtU3RhdGUuaWRlbnRpZmllcikpIHsKQEAgLTU5MSw3ICs2MDEsNyBAQCB2b2lkIFdlYlByb2Nl c3NQcm94eTo6dXBkYXRlQmFja0ZvcndhcmRJdGVtKGNvbnN0IEJhY2tGb3J3YXJkTGlzdEl0ZW1T dGF0ZSYgaXRlbQogICAgICAgICAvLyB0aGUgYmFjay9mb3J3YXJkIGl0ZW1zIHBhZ2UuCiAgICAg ICAgIC8vIGUuZy4gVGhlIG9sZCB3ZWIgcHJvY2VzcyBpcyBuYXZpZ2F0aW5nIHRvIGFib3V0OmJs YW5rIGZvciBzdXNwZW5zaW9uLgogICAgICAgICAvLyBXZSBpZ25vcmUgdGhlc2UgdXBkYXRlcy4K LSAgICAgICAgaWYgKG1fcGFnZU1hcC5jb250YWlucyhpdGVtLT5wYWdlSUQoKSkpCisgICAgICAg IGlmIChtX3BhZ2VNYXAuY29udGFpbnMoaXRlbS0+cGFnZUlEKCkpIHx8IGhhc1Byb3Zpc2lvbmFs UGFnZVdpdGhJRChpdGVtLT5wYWdlSUQoKSkpCiAgICAgICAgICAgICBpdGVtLT5zZXRQYWdlU3Rh dGUoaXRlbVN0YXRlLnBhZ2VTdGF0ZSk7CiAgICAgfQogfQpAQCAtNjk0LDYgKzcwNCw3IEBAIHZv aWQgV2ViUHJvY2Vzc1Byb3h5Ojpwcm9jZXNzRGlkVGVybWluYXRlT3JGYWlsZWRUb0xhdW5jaCgp CiAgICAgICAgIHdlYkNvbm5lY3Rpb24tPmRpZENsb3NlKCk7CiAKICAgICBhdXRvIHBhZ2VzID0g Y29weVRvVmVjdG9yT2Y8UmVmUHRyPFdlYlBhZ2VQcm94eT4+KG1fcGFnZU1hcC52YWx1ZXMoKSk7 CisgICAgYXV0byBwcm92aXNpb25hbFBhZ2VzID0gV1RGOjptYXAobV9wcm92aXNpb25hbFBhZ2Vz LCBbXShhdXRvKiBwcm92aXNpb25hbFBhZ2UpIHsgcmV0dXJuIG1ha2VXZWFrUHRyKHByb3Zpc2lv bmFsUGFnZSk7IH0pOwogCiAgICAgc2h1dERvd24oKTsKIApAQCAtNzA4LDYgKzcxOSwxMSBAQCB2 b2lkIFdlYlByb2Nlc3NQcm94eTo6cHJvY2Vzc0RpZFRlcm1pbmF0ZU9yRmFpbGVkVG9MYXVuY2go KQogCiAgICAgZm9yIChhdXRvJiBwYWdlIDogcGFnZXMpCiAgICAgICAgIHBhZ2UtPnByb2Nlc3NE aWRUZXJtaW5hdGUoUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpDcmFzaCk7CisKKyAgICBmb3Ig KGF1dG8mIHByb3Zpc2lvbmFsUGFnZSA6IHByb3Zpc2lvbmFsUGFnZXMpIHsKKyAgICAgICAgaWYg KHByb3Zpc2lvbmFsUGFnZSkKKyAgICAgICAgICAgIHByb3Zpc2lvbmFsUGFnZS0+cHJvY2Vzc0Rp ZFRlcm1pbmF0ZSgpOworICAgIH0KIH0KIAogdm9pZCBXZWJQcm9jZXNzUHJveHk6OmRpZFJlY2Vp dmVJbnZhbGlkTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIElQQzo6U3RyaW5n UmVmZXJlbmNlIG1lc3NhZ2VSZWNlaXZlck5hbWUsIElQQzo6U3RyaW5nUmVmZXJlbmNlIG1lc3Nh Z2VOYW1lKQpAQCAtNzgwLDYgKzc5NiwxMiBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6ZGlkRmlu aXNoTGF1bmNoaW5nKFByb2Nlc3NMYXVuY2hlciogbGF1bmNoZXIsIElQQzo6Q29ubmVjdAogICAg ICAgICBwYWdlLT5wcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5nKCk7CiAgICAgfQogCisgICAgZm9y IChhdXRvKiBwcm92aXNpb25hbFBhZ2UgOiBtX3Byb3Zpc2lvbmFsUGFnZXMpIHsKKyAgICAgICAg QVNTRVJUKHRoaXMgPT0gJnByb3Zpc2lvbmFsUGFnZS0+cHJvY2VzcygpKTsKKyAgICAgICAgcHJv dmlzaW9uYWxQYWdlLT5wcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5nKCk7CisgICAgfQorCisKICAg ICBSRUxFQVNFX0FTU0VSVCghbV93ZWJDb25uZWN0aW9uKTsKICAgICBtX3dlYkNvbm5lY3Rpb24g PSBXZWJDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpjcmVhdGUodGhpcyk7CiAKQEAgLTg3Myw3ICs4 OTUsNyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6bWF5YmVTaHV0RG93bigpCiAKIGJvb2wgV2Vi UHJvY2Vzc1Byb3h5OjpjYW5UZXJtaW5hdGVDaGlsZFByb2Nlc3MoKQogewotICAgIGlmICghbV9w YWdlTWFwLmlzRW1wdHkoKSB8fCBtX3Byb2Nlc3NQb29sLT5oYXNTdXNwZW5kZWRQYWdlRm9yKCp0 aGlzKSkKKyAgICBpZiAoIW1fcGFnZU1hcC5pc0VtcHR5KCkgfHwgbV9wcm9jZXNzUG9vbC0+aGFz U3VzcGVuZGVkUGFnZUZvcigqdGhpcykgfHwgIW1fcHJvdmlzaW9uYWxQYWdlcy5pc0VtcHR5KCkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmICghbV9wcm9jZXNzUG9vbC0+c2hvdWxk VGVybWluYXRlKHRoaXMpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Byb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku aAppbmRleCA3NWY2NWE3ZjdlYi4uNTA0MjYzMGRlMzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQcm94eS5oCkBAIC03MCw2ICs3MCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQg ewogY2xhc3MgTmV0d29ya1Byb2Nlc3NQcm94eTsKIGNsYXNzIE9iakNPYmplY3RHcmFwaDsKIGNs YXNzIFBhZ2VDbGllbnQ7CitjbGFzcyBQcm92aXNpb25hbFBhZ2VQcm94eTsKIGNsYXNzIFVzZXJN ZWRpYUNhcHR1cmVNYW5hZ2VyUHJveHk7CiBjbGFzcyBWaXNpdGVkTGlua1N0b3JlOwogY2xhc3Mg V2ViQmFja0ZvcndhcmRMaXN0SXRlbTsKQEAgLTEyNCw2ICsxMjUsOSBAQCBwdWJsaWM6CiAgICAg ZW51bSBjbGFzcyBFbmRzVXNpbmdEYXRhU3RvcmUgOiBib29sIHsgTm8sIFllcyB9OwogICAgIHZv aWQgcmVtb3ZlV2ViUGFnZShXZWJQYWdlUHJveHkmLCB1aW50NjRfdCBwYWdlSUQsIEVuZHNVc2lu Z0RhdGFTdG9yZSk7CiAKKyAgICB2b2lkIGFkZFByb3Zpc2lvbmFsUGFnZVByb3h5KFByb3Zpc2lv bmFsUGFnZVByb3h5JiBwcm92aXNpb25hbFBhZ2UpIHsgQVNTRVJUKCFtX3Byb3Zpc2lvbmFsUGFn ZXMuY29udGFpbnMoJnByb3Zpc2lvbmFsUGFnZSkpOyBtX3Byb3Zpc2lvbmFsUGFnZXMuYWRkKCZw cm92aXNpb25hbFBhZ2UpOyB9CisgICAgdm9pZCByZW1vdmVQcm92aXNpb25hbFBhZ2VQcm94eShQ cm92aXNpb25hbFBhZ2VQcm94eSYgcHJvdmlzaW9uYWxQYWdlKSB7IEFTU0VSVChtX3Byb3Zpc2lv bmFsUGFnZXMuY29udGFpbnMoJnByb3Zpc2lvbmFsUGFnZSkpOyBtX3Byb3Zpc2lvbmFsUGFnZXMu cmVtb3ZlKCZwcm92aXNpb25hbFBhZ2UpOyB9CisKICAgICB0eXBlbmFtZSBXZWJQYWdlUHJveHlN YXA6OlZhbHVlc0NvbnN0SXRlcmF0b3JSYW5nZSBwYWdlcygpIGNvbnN0IHsgcmV0dXJuIG1fcGFn ZU1hcC52YWx1ZXMoKTsgfQogICAgIHVuc2lnbmVkIHBhZ2VDb3VudCgpIGNvbnN0IHsgcmV0dXJu IG1fcGFnZU1hcC5zaXplKCk7IH0KICAgICB1bnNpZ25lZCB2aXNpYmxlUGFnZUNvdW50KCkgY29u c3QgeyByZXR1cm4gbV92aXNpYmxlUGFnZUNvdW50ZXIudmFsdWUoKTsgfQpAQCAtMzMwLDYgKzMz NCw4IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGxvZ0RpYWdub3N0aWNNZXNzYWdlRm9yUmVzb3Vy Y2VMaW1pdFRlcm1pbmF0aW9uKGNvbnN0IFN0cmluZyYgbGltaXRLZXkpOwogCisgICAgYm9vbCBo YXNQcm92aXNpb25hbFBhZ2VXaXRoSUQodWludDY0X3QgcGFnZUlEKSBjb25zdDsKKwogICAgIGVu dW0gY2xhc3MgSXNXZWFrIHsgTm8sIFllcyB9OwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGNs YXNzIFdlYWtPclN0cm9uZ1B0ciB7CiAgICAgcHVibGljOgpAQCAtMzczLDYgKzM3OSw3IEBAIHBy aXZhdGU6CiAKICAgICBXZWJQYWdlUHJveHlNYXAgbV9wYWdlTWFwOwogICAgIFdlYkZyYW1lUHJv eHlNYXAgbV9mcmFtZU1hcDsKKyAgICBIYXNoU2V0PFByb3Zpc2lvbmFsUGFnZVByb3h5Kj4gbV9w cm92aXNpb25hbFBhZ2VzOwogICAgIFVzZXJJbml0aWF0ZWRBY3Rpb25NYXAgbV91c2VySW5pdGlh dGVkQWN0aW9uTWFwOwogCiAgICAgSGFzaFNldDxWaXNpdGVkTGlua1N0b3JlKj4gbV92aXNpdGVk TGlua1N0b3JlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlVSTFNj aGVtZUhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViVVJMU2NoZW1lSGFu ZGxlci5jcHAKaW5kZXggYTA5ZWRkOTFhZGIuLjViYTdmY2VmOGU0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJVUkxTY2hlbWVIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJVUkxTY2hlbWVIYW5kbGVyLmNwcApAQCAtNDgsOSArNDgsOSBA QCBXZWJVUkxTY2hlbWVIYW5kbGVyOjp+V2ViVVJMU2NoZW1lSGFuZGxlcigpCiAgICAgQVNTRVJU KG1fdGFza3MuaXNFbXB0eSgpKTsKIH0KIAotdm9pZCBXZWJVUkxTY2hlbWVIYW5kbGVyOjpzdGFy dFRhc2soV2ViUGFnZVByb3h5JiBwYWdlLCB1aW50NjRfdCB0YXNrSWRlbnRpZmllciwgUmVzb3Vy Y2VSZXF1ZXN0JiYgcmVxdWVzdCwgU3luY0xvYWRDb21wbGV0aW9uSGFuZGxlciYmIGNvbXBsZXRp b25IYW5kbGVyKQordm9pZCBXZWJVUkxTY2hlbWVIYW5kbGVyOjpzdGFydFRhc2soV2ViUGFnZVBy b3h5JiBwYWdlLCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIHVpbnQ2NF90IHRhc2tJZGVudGlm aWVyLCBSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBTeW5jTG9hZENvbXBsZXRpb25IYW5kbGVy JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgYXV0byByZXN1bHQgPSBtX3Rhc2tzLmFkZCh0 YXNrSWRlbnRpZmllciwgV2ViVVJMU2NoZW1lVGFzazo6Y3JlYXRlKCp0aGlzLCBwYWdlLCB0YXNr SWRlbnRpZmllciwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikp KTsKKyAgICBhdXRvIHJlc3VsdCA9IG1fdGFza3MuYWRkKHRhc2tJZGVudGlmaWVyLCBXZWJVUkxT Y2hlbWVUYXNrOjpjcmVhdGUoKnRoaXMsIHBhZ2UsIHByb2Nlc3MsIHRhc2tJZGVudGlmaWVyLCBX VEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSkpOwogICAgIEFTU0VS VChyZXN1bHQuaXNOZXdFbnRyeSk7CiAKICAgICBhdXRvIHBhZ2VFbnRyeSA9IG1fdGFza3NCeVBh Z2VJZGVudGlmaWVyLmFkZChwYWdlLnBhZ2VJRCgpLCBIYXNoU2V0PHVpbnQ2NF90PigpKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlVSTFNjaGVtZUhhbmRsZXIuaCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlVSTFNjaGVtZUhhbmRsZXIuaAppbmRleCBiNzg0 YTUzYTRiMS4uYWM4MTJmMjVjMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlVSTFNjaGVtZUhhbmRsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJV UkxTY2hlbWVIYW5kbGVyLmgKQEAgLTQyLDYgKzQyLDcgQEAgY2xhc3MgUmVzb3VyY2VSZXF1ZXN0 OwogbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIFdlYlBhZ2VQcm94eTsKK2NsYXNzIFdlYlBy b2Nlc3NQcm94eTsKIAogdXNpbmcgU3luY0xvYWRDb21wbGV0aW9uSGFuZGxlciA9IENvbXBsZXRp b25IYW5kbGVyPHZvaWQoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYsIGNvbnN0IFdl YkNvcmU6OlJlc291cmNlRXJyb3ImLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmKT47CiAKQEAg LTUyLDcgKzUzLDcgQEAgcHVibGljOgogCiAgICAgdWludDY0X3QgaWRlbnRpZmllcigpIGNvbnN0 IHsgcmV0dXJuIG1faWRlbnRpZmllcjsgfQogCi0gICAgdm9pZCBzdGFydFRhc2soV2ViUGFnZVBy b3h5JiwgdWludDY0X3QgdGFza0lkZW50aWZpZXIsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYm LCBTeW5jTG9hZENvbXBsZXRpb25IYW5kbGVyJiYpOworICAgIHZvaWQgc3RhcnRUYXNrKFdlYlBh Z2VQcm94eSYsIFdlYlByb2Nlc3NQcm94eSYsIHVpbnQ2NF90IHRhc2tJZGVudGlmaWVyLCBXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgU3luY0xvYWRDb21wbGV0aW9uSGFuZGxlciYmKTsKICAg ICB2b2lkIHN0b3BUYXNrKFdlYlBhZ2VQcm94eSYsIHVpbnQ2NF90IHRhc2tJZGVudGlmaWVyKTsK ICAgICB2b2lkIHN0b3BBbGxUYXNrc0ZvclBhZ2UoV2ViUGFnZVByb3h5Jik7CiAgICAgdm9pZCB0 YXNrQ29tcGxldGVkKFdlYlVSTFNjaGVtZVRhc2smKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlVSTFNjaGVtZVRhc2suY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViVVJMU2NoZW1lVGFzay5jcHAKaW5kZXggZTFjZGU4ZGNiNmEuLjE5YTZiYjg0YzNjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJVUkxTY2hlbWVUYXNrLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJVUkxTY2hlbWVUYXNrLmNwcApAQCAtMzYs MTQgKzM2LDE1IEBACiBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3Jl OwogCi1SZWY8V2ViVVJMU2NoZW1lVGFzaz4gV2ViVVJMU2NoZW1lVGFzazo6Y3JlYXRlKFdlYlVS TFNjaGVtZUhhbmRsZXImIGhhbmRsZXIsIFdlYlBhZ2VQcm94eSYgcGFnZSwgdWludDY0X3QgcmVz b3VyY2VJZGVudGlmaWVyLCBSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBTeW5jTG9hZENvbXBs ZXRpb25IYW5kbGVyJiYgc3luY0NvbXBsZXRpb25IYW5kbGVyKQorUmVmPFdlYlVSTFNjaGVtZVRh c2s+IFdlYlVSTFNjaGVtZVRhc2s6OmNyZWF0ZShXZWJVUkxTY2hlbWVIYW5kbGVyJiBoYW5kbGVy LCBXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcywgdWludDY0X3Qg cmVzb3VyY2VJZGVudGlmaWVyLCBSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBTeW5jTG9hZENv bXBsZXRpb25IYW5kbGVyJiYgc3luY0NvbXBsZXRpb25IYW5kbGVyKQogewotICAgIHJldHVybiBh ZG9wdFJlZigqbmV3IFdlYlVSTFNjaGVtZVRhc2soaGFuZGxlciwgcGFnZSwgcmVzb3VyY2VJZGVu dGlmaWVyLCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKHN5bmNDb21wbGV0aW9uSGFuZGxlcikp KTsKKyAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJVUkxTY2hlbWVUYXNrKGhhbmRsZXIsIHBh Z2UsIHByb2Nlc3MsIHJlc291cmNlSWRlbnRpZmllciwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92 ZShzeW5jQ29tcGxldGlvbkhhbmRsZXIpKSk7CiB9CiAKLVdlYlVSTFNjaGVtZVRhc2s6OldlYlVS TFNjaGVtZVRhc2soV2ViVVJMU2NoZW1lSGFuZGxlciYgaGFuZGxlciwgV2ViUGFnZVByb3h5JiBw YWdlLCB1aW50NjRfdCByZXNvdXJjZUlkZW50aWZpZXIsIFJlc291cmNlUmVxdWVzdCYmIHJlcXVl c3QsIFN5bmNMb2FkQ29tcGxldGlvbkhhbmRsZXImJiBzeW5jQ29tcGxldGlvbkhhbmRsZXIpCitX ZWJVUkxTY2hlbWVUYXNrOjpXZWJVUkxTY2hlbWVUYXNrKFdlYlVSTFNjaGVtZUhhbmRsZXImIGhh bmRsZXIsIFdlYlBhZ2VQcm94eSYgcGFnZSwgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzLCB1aW50 NjRfdCByZXNvdXJjZUlkZW50aWZpZXIsIFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFN5bmNM b2FkQ29tcGxldGlvbkhhbmRsZXImJiBzeW5jQ29tcGxldGlvbkhhbmRsZXIpCiAgICAgOiBtX3Vy bFNjaGVtZUhhbmRsZXIoaGFuZGxlcikKICAgICAsIG1fcGFnZSgmcGFnZSkKKyAgICAsIG1fcHJv Y2VzcyhtYWtlUmVmKHByb2Nlc3MpKQogICAgICwgbV9pZGVudGlmaWVyKHJlc291cmNlSWRlbnRp ZmllcikKICAgICAsIG1fcGFnZUlkZW50aWZpZXIocGFnZS5wYWdlSUQoKSkKICAgICAsIG1fcmVx dWVzdChXVEZNb3ZlKHJlcXVlc3QpKQpAQCAtNjksNyArNzAsNyBAQCBhdXRvIFdlYlVSTFNjaGVt ZVRhc2s6OmRpZFBlcmZvcm1SZWRpcmVjdGlvbihXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYg cmVzcG9ucwogICAgICAgICBtX3N5bmNSZXNwb25zZSA9IHJlc3BvbnNlOwogCiAgICAgbV9yZXF1 ZXN0ID0gcmVxdWVzdDsKLSAgICBtX3BhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlVSTFNj aGVtZVRhc2tEaWRQZXJmb3JtUmVkaXJlY3Rpb24obV91cmxTY2hlbWVIYW5kbGVyLT5pZGVudGlm aWVyKCksIG1faWRlbnRpZmllciwgcmVzcG9uc2UsIHJlcXVlc3QpKTsKKyAgICBtX3Byb2Nlc3Mt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlVSTFNjaGVtZVRhc2tEaWRQZXJmb3JtUmVkaXJlY3Rp b24obV91cmxTY2hlbWVIYW5kbGVyLT5pZGVudGlmaWVyKCksIG1faWRlbnRpZmllciwgcmVzcG9u c2UsIHJlcXVlc3QpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKIAogICAgIHJldHVybiBFeGNlcHRpb25U eXBlOjpOb25lOwogfQpAQCAtOTIsNyArOTMsNyBAQCBhdXRvIFdlYlVSTFNjaGVtZVRhc2s6OmRp ZFJlY2VpdmVSZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkgLT4gRQog ICAgIGlmIChpc1N5bmMoKSkKICAgICAgICAgbV9zeW5jUmVzcG9uc2UgPSByZXNwb25zZTsKIAot ICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6VVJMU2NoZW1lVGFza0RpZFJlY2Vp dmVSZXNwb25zZShtX3VybFNjaGVtZUhhbmRsZXItPmlkZW50aWZpZXIoKSwgbV9pZGVudGlmaWVy LCByZXNwb25zZSkpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6VVJM U2NoZW1lVGFza0RpZFJlY2VpdmVSZXNwb25zZShtX3VybFNjaGVtZUhhbmRsZXItPmlkZW50aWZp ZXIoKSwgbV9pZGVudGlmaWVyLCByZXNwb25zZSksIG1fcGFnZS0+cGFnZUlEKCkpOwogICAgIHJl dHVybiBFeGNlcHRpb25UeXBlOjpOb25lOwogfQogCkBAIC0xMTcsNyArMTE4LDcgQEAgYXV0byBX ZWJVUkxTY2hlbWVUYXNrOjpkaWRSZWNlaXZlRGF0YShSZWY8U2hhcmVkQnVmZmVyPiYmIGJ1ZmZl cikgLT4gRXhjZXB0aW9uVHkKICAgICAgICAgcmV0dXJuIEV4Y2VwdGlvblR5cGU6Ok5vbmU7CiAg ICAgfQogCi0gICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpVUkxTY2hlbWVUYXNr RGlkUmVjZWl2ZURhdGEobV91cmxTY2hlbWVIYW5kbGVyLT5pZGVudGlmaWVyKCksIG1faWRlbnRp ZmllciwgeyBidWZmZXIgfSkpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6VVJMU2NoZW1lVGFza0RpZFJlY2VpdmVEYXRhKG1fdXJsU2NoZW1lSGFuZGxlci0+aWRlbnRp ZmllcigpLCBtX2lkZW50aWZpZXIsIHsgYnVmZmVyIH0pLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKICAg ICByZXR1cm4gRXhjZXB0aW9uVHlwZTo6Tm9uZTsKIH0KIApAQCAtMTQyLDcgKzE0Myw3IEBAIGF1 dG8gV2ViVVJMU2NoZW1lVGFzazo6ZGlkQ29tcGxldGUoY29uc3QgUmVzb3VyY2VFcnJvciYgZXJy b3IpIC0+IEV4Y2VwdGlvblR5cGUKICAgICAgICAgbV9zeW5jRGF0YSA9IG51bGxwdHI7CiAgICAg fQogCi0gICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpVUkxTY2hlbWVUYXNrRGlk Q29tcGxldGUobV91cmxTY2hlbWVIYW5kbGVyLT5pZGVudGlmaWVyKCksIG1faWRlbnRpZmllciwg ZXJyb3IpKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlVSTFNjaGVt ZVRhc2tEaWRDb21wbGV0ZShtX3VybFNjaGVtZUhhbmRsZXItPmlkZW50aWZpZXIoKSwgbV9pZGVu dGlmaWVyLCBlcnJvciksIG1fcGFnZS0+cGFnZUlEKCkpOwogICAgIG1fdXJsU2NoZW1lSGFuZGxl ci0+dGFza0NvbXBsZXRlZCgqdGhpcyk7CiAKICAgICByZXR1cm4gRXhjZXB0aW9uVHlwZTo6Tm9u ZTsKQEAgLTE1Miw2ICsxNTMsNyBAQCB2b2lkIFdlYlVSTFNjaGVtZVRhc2s6OnBhZ2VEZXN0cm95 ZWQoKQogewogICAgIEFTU0VSVChtX3BhZ2UpOwogICAgIG1fcGFnZSA9IG51bGxwdHI7CisgICAg bV9wcm9jZXNzID0gbnVsbHB0cjsKICAgICBtX3N0b3BwZWQgPSB0cnVlOwogICAgIAogICAgIGlm IChpc1N5bmMoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlVSTFNj aGVtZVRhc2suaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlVSTFNjaGVtZVRhc2suaApp bmRleCA0MTVmN2YzNzA3OC4uZDQ4YTQwOGU0OTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlVSTFNjaGVtZVRhc2suaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJVUkxTY2hlbWVUYXNrLmgKQEAgLTI1LDYgKzI1LDcgQEAKIAogI3ByYWdtYSBvbmNlCiAK KyNpbmNsdWRlICJXZWJQcm9jZXNzUHJveHkuaCIKICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNl UmVxdWVzdC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VSZXNwb25zZS5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvU2hhcmVkQnVmZmVyLmg+CkBAIC01Myw3ICs1NCw3IEBAIHVzaW5nIFN5bmNM b2FkQ29tcGxldGlvbkhhbmRsZXIgPSBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFdlYkNv cmU6OlJlc291cmNlCiBjbGFzcyBXZWJVUkxTY2hlbWVUYXNrIDogcHVibGljIFJlZkNvdW50ZWQ8 V2ViVVJMU2NoZW1lVGFzaz4sIHB1YmxpYyBJbnN0YW5jZUNvdW50ZWQ8V2ViVVJMU2NoZW1lVGFz az4gewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFdlYlVSTFNjaGVtZVRhc2spOwogcHVibGlj OgotICAgIHN0YXRpYyBSZWY8V2ViVVJMU2NoZW1lVGFzaz4gY3JlYXRlKFdlYlVSTFNjaGVtZUhh bmRsZXImLCBXZWJQYWdlUHJveHkmLCB1aW50NjRfdCBpZGVudGlmaWVyLCBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QmJiwgU3luY0xvYWRDb21wbGV0aW9uSGFuZGxlciYmKTsKKyAgICBzdGF0aWMg UmVmPFdlYlVSTFNjaGVtZVRhc2s+IGNyZWF0ZShXZWJVUkxTY2hlbWVIYW5kbGVyJiwgV2ViUGFn ZVByb3h5JiwgV2ViUHJvY2Vzc1Byb3h5JiwgdWludDY0X3QgaWRlbnRpZmllciwgV2ViQ29yZTo6 UmVzb3VyY2VSZXF1ZXN0JiYsIFN5bmNMb2FkQ29tcGxldGlvbkhhbmRsZXImJik7CiAKICAgICB1 aW50NjRfdCBpZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9pZGVudGlmaWVyOyB9CiAgICAg dWludDY0X3QgcGFnZUlEKCkgY29uc3QgeyByZXR1cm4gbV9wYWdlSWRlbnRpZmllcjsgfQpAQCAt NzcsMTIgKzc4LDEzIEBAIHB1YmxpYzoKICAgICB2b2lkIHBhZ2VEZXN0cm95ZWQoKTsKIAogcHJp dmF0ZToKLSAgICBXZWJVUkxTY2hlbWVUYXNrKFdlYlVSTFNjaGVtZUhhbmRsZXImLCBXZWJQYWdl UHJveHkmLCB1aW50NjRfdCBpZGVudGlmaWVyLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwg U3luY0xvYWRDb21wbGV0aW9uSGFuZGxlciYmKTsKKyAgICBXZWJVUkxTY2hlbWVUYXNrKFdlYlVS TFNjaGVtZUhhbmRsZXImLCBXZWJQYWdlUHJveHkmLCBXZWJQcm9jZXNzUHJveHkmLCB1aW50NjRf dCBpZGVudGlmaWVyLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgU3luY0xvYWRDb21wbGV0 aW9uSGFuZGxlciYmKTsKIAogICAgIGJvb2wgaXNTeW5jKCkgY29uc3QgeyByZXR1cm4gISFtX3N5 bmNDb21wbGV0aW9uSGFuZGxlcjsgfQogCiAgICAgUmVmPFdlYlVSTFNjaGVtZUhhbmRsZXI+IG1f dXJsU2NoZW1lSGFuZGxlcjsKICAgICBXZWJQYWdlUHJveHkqIG1fcGFnZTsKKyAgICBSZWZQdHI8 V2ViUHJvY2Vzc1Byb3h5PiBtX3Byb2Nlc3M7CiAgICAgdWludDY0X3QgbV9pZGVudGlmaWVyOwog ICAgIHVpbnQ2NF90IG1fcGFnZUlkZW50aWZpZXI7CiAgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0IG1fcmVxdWVzdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9Q YWdlQ2xpZW50SW1wbElPUy5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1BhZ2VDbGll bnRJbXBsSU9TLmgKaW5kZXggNWRhNmY5OWJmNTIuLjkxODNmOGMyZWRjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MuaApAQCAtNTMsNyArNTMs NyBAQCBwdWJsaWM6CiAgICAgCiBwcml2YXRlOgogICAgIC8vIFBhZ2VDbGllbnQKLSAgICBzdGQ6 OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpIG92 ZXJyaWRlOworICAgIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBjcmVhdGVEcmF3 aW5nQXJlYVByb3h5KFdlYlByb2Nlc3NQcm94eSYpIG92ZXJyaWRlOwogICAgIHZvaWQgc2V0Vmll d05lZWRzRGlzcGxheShjb25zdCBXZWJDb3JlOjpSZWdpb24mKSBvdmVycmlkZTsKICAgICB2b2lk IHJlcXVlc3RTY3JvbGwoY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgc2Nyb2xsUG9zaXRpb24s IGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBzY3JvbGxPcmlnaW4sIGJvb2wgaXNQcm9ncmFtbWF0 aWNTY3JvbGwpIG92ZXJyaWRlOwogICAgIFdlYkNvcmU6OkZsb2F0UG9pbnQgdmlld1Njcm9sbFBv c2l0aW9uKCkgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvUGFnZUNsaWVudEltcGxJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUGFn ZUNsaWVudEltcGxJT1MubW0KaW5kZXggYjIzN2VmNTA1MmEuLmI2MTA3MjRmN2RmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW0KKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLm1tCkBAIC04 MSw5ICs4MSw5IEBAIFBhZ2VDbGllbnRJbXBsOjp+UGFnZUNsaWVudEltcGwoKQogewogfQogCi1z dGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gUGFnZUNsaWVudEltcGw6OmNyZWF0ZURy YXdpbmdBcmVhUHJveHkoKQorc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IFBhZ2VD bGllbnRJbXBsOjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KFdlYlByb2Nlc3NQcm94eSYgcHJvY2Vz cykKIHsKLSAgICByZXR1cm4gW21fY29udGVudFZpZXcgX2NyZWF0ZURyYXdpbmdBcmVhUHJveHld OworICAgIHJldHVybiBbbV9jb250ZW50VmlldyBfY3JlYXRlRHJhd2luZ0FyZWFQcm94eTpwcm9j ZXNzXTsKIH0KIAogdm9pZCBQYWdlQ2xpZW50SW1wbDo6c2V0Vmlld05lZWRzRGlzcGxheShjb25z dCBSZWdpb24mKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3LmgK aW5kZXggMTFmZDhhMDQwZmYuLjY2ZjdiMDIxN2M1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3LmgKQEAgLTg2LDcgKzg2LDcgQEAgY2xhc3MgV2ViUHJvY2Vz c1Bvb2w7CiAKIC0gKHZvaWQpX3dlYlZpZXdEZXN0cm95ZWQ7CiAKLS0gKHN0ZDo6dW5pcXVlX3B0 cjxXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHk+KV9jcmVhdGVEcmF3aW5nQXJlYVByb3h5OworLSAo c3RkOjp1bmlxdWVfcHRyPFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eT4pX2NyZWF0ZURyYXdpbmdB cmVhUHJveHk6KFdlYlByb2Nlc3NQcm94eSYpcHJvY2VzczsKIC0gKHZvaWQpX3Byb2Nlc3NEaWRF eGl0OwogLSAodm9pZClfcHJvY2Vzc1dpbGxTd2FwOwogLSAodm9pZClfZGlkUmVsYXVuY2hQcm9j ZXNzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQppbmRl eCBjMjdlYmNhZTNiMC4uYTVkMzEwMThlOTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3Lm1tCkBAIC01MjAsOSArNTIwLDkgQEAgLSAodm9pZClfd2ViVmll d0Rlc3Ryb3llZAogCiAjcHJhZ21hIG1hcmsgUGFnZUNsaWVudEltcGwgbWV0aG9kcwogCi0tIChz dGQ6OnVuaXF1ZV9wdHI8V2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5PilfY3JlYXRlRHJhd2luZ0Fy ZWFQcm94eQorLSAoc3RkOjp1bmlxdWVfcHRyPFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eT4pX2Ny ZWF0ZURyYXdpbmdBcmVhUHJveHk6KFdlYlByb2Nlc3NQcm94eSYpcHJvY2VzcwogewotICAgIHJl dHVybiBzdGQ6Om1ha2VfdW5pcXVlPFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQ cm94eT4oKl9wYWdlKTsKKyAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxXZWJLaXQ6OlJlbW90 ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk+KCpfcGFnZSwgcHJvY2Vzcyk7CiB9CiAKIC0gKHZv aWQpX3Byb2Nlc3NEaWRFeGl0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9t YWMvUGFnZUNsaWVudEltcGxNYWMuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9QYWdl Q2xpZW50SW1wbE1hYy5oCmluZGV4IDEyZGMyNWFiY2MzLi4wOGZmZWE0ZThhYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsTWFjLmgKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsTWFjLmgKQEAgLTYxLDcg KzYxLDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIC8vIFBhZ2VDbGllbnQKLSAgICBzdGQ6 OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpIG92 ZXJyaWRlOworICAgIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBjcmVhdGVEcmF3 aW5nQXJlYVByb3h5KFdlYlByb2Nlc3NQcm94eSYpIG92ZXJyaWRlOwogICAgIHZvaWQgc2V0Vmll d05lZWRzRGlzcGxheShjb25zdCBXZWJDb3JlOjpSZWdpb24mKSBvdmVycmlkZTsKICAgICB2b2lk IHJlcXVlc3RTY3JvbGwoY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgc2Nyb2xsUG9zaXRpb24s IGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBzY3JvbGxPcmlnaW4sIGJvb2wgaXNQcm9ncmFtbWF0 aWNTY3JvbGwpIG92ZXJyaWRlOwogICAgIFdlYkNvcmU6OkZsb2F0UG9pbnQgdmlld1Njcm9sbFBv c2l0aW9uKCkgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9t YWMvUGFnZUNsaWVudEltcGxNYWMubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvUGFn ZUNsaWVudEltcGxNYWMubW0KaW5kZXggNWQ3YzIzOGVmZDYuLmI0OGFjM2ZhMmJmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGxNYWMubW0KKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsTWFjLm1tCkBAIC0x MjMsOSArMTIzLDkgQEAgdm9pZCBQYWdlQ2xpZW50SW1wbDo6c2V0SW1wbChXZWJWaWV3SW1wbCYg aW1wbCkKICAgICBtX2ltcGwgPSBtYWtlV2Vha1B0cihpbXBsKTsKIH0KIAotc3RkOjp1bmlxdWVf cHRyPERyYXdpbmdBcmVhUHJveHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVEcmF3aW5nQXJlYVBy b3h5KCkKK3N0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBQYWdlQ2xpZW50SW1wbDo6 Y3JlYXRlRHJhd2luZ0FyZWFQcm94eShXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MpCiB7Ci0gICAg cmV0dXJuIG1faW1wbC0+Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpOworICAgIHJldHVybiBtX2lt cGwtPmNyZWF0ZURyYXdpbmdBcmVhUHJveHkocHJvY2Vzcyk7CiB9CiAKIHZvaWQgUGFnZUNsaWVu dEltcGw6OnNldFZpZXdOZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29yZTo6UmVnaW9uJikKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvVGlsZWRDb3JlQW5p bWF0aW9uRHJhd2luZ0FyZWFQcm94eS5oCmluZGV4IDE3OWJkMjhjZmUzLi5mMmYyNzAyYTAxNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvVGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5oCkBAIC0zMyw3ICszMyw3IEBAIG5hbWVz cGFjZSBXZWJLaXQgewogCiBjbGFzcyBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5 IDogcHVibGljIERyYXdpbmdBcmVhUHJveHkgewogcHVibGljOgotICAgIGV4cGxpY2l0IFRpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkoV2ViUGFnZVByb3h5Jik7CisgICAgVGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eShXZWJQYWdlUHJveHkmLCBXZWJQcm9jZXNzUHJv eHkmKTsKICAgICB2aXJ0dWFsIH5UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5KCk7 CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvVGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5Lm1tCmluZGV4IGJjOGJj NDE2YmIzLi43N2M4MzgwOTE0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv bWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkubW0KKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkubW0K QEAgLTQyLDggKzQyLDggQEAgbmFtZXNwYWNlIFdlYktpdCB7CiB1c2luZyBuYW1lc3BhY2UgSVBD OwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKLVRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdB cmVhUHJveHk6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkoV2ViUGFnZVByb3h5 JiB3ZWJQYWdlUHJveHkpCi0gICAgOiBEcmF3aW5nQXJlYVByb3h5KERyYXdpbmdBcmVhVHlwZVRp bGVkQ29yZUFuaW1hdGlvbiwgd2ViUGFnZVByb3h5KQorVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2lu Z0FyZWFQcm94eTo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eShXZWJQYWdlUHJv eHkmIHdlYlBhZ2VQcm94eSwgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKQorICAgIDogRHJhd2lu Z0FyZWFQcm94eShEcmF3aW5nQXJlYVR5cGVUaWxlZENvcmVBbmltYXRpb24sIHdlYlBhZ2VQcm94 eSwgcHJvY2VzcykKICAgICAsIG1faXNXYWl0aW5nRm9yRGlkVXBkYXRlR2VvbWV0cnkoZmFsc2Up CiB7CiB9CkBAIC01NSw3ICs1NSw3IEBAIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJv eHk6On5UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5KCkKIAogdm9pZCBUaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5OjpkZXZpY2VTY2FsZUZhY3RvckRpZENoYW5nZSgp CiB7Ci0gICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdB cmVhOjpTZXREZXZpY2VTY2FsZUZhY3RvcihtX3dlYlBhZ2VQcm94eS5kZXZpY2VTY2FsZUZhY3Rv cigpKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3Nh Z2VzOjpEcmF3aW5nQXJlYTo6U2V0RGV2aWNlU2NhbGVGYWN0b3IobV93ZWJQYWdlUHJveHkuZGV2 aWNlU2NhbGVGYWN0b3IoKSksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKIH0KIAogdm9pZCBU aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5OjpzaXplRGlkQ2hhbmdlKCkKQEAgLTcz LDcgKzczLDcgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5OjpzaXpl RGlkQ2hhbmdlKCkKIAogdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5Ojpj b2xvclNwYWNlRGlkQ2hhbmdlKCkKIHsKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc2Vu ZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6OlNldENvbG9yU3BhY2UobV93ZWJQYWdlUHJveHkuY29s b3JTcGFjZSgpKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOworICAgIHByb2Nlc3MoKS5zZW5k KE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6U2V0Q29sb3JTcGFjZShtX3dlYlBhZ2VQcm94eS5jb2xv clNwYWNlKCkpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CiB9CiAKIHZvaWQgVGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eTo6dmlld0xheW91dFNpemVEaWRDaGFuZ2UoKQpAQCAt MTIyLDcgKzEyMiw3IEBAIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eTo6 ZGlkVXBkYXRlR2VvbWV0cnkoKQogdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVBy b3h5Ojp3YWl0Rm9yRGlkVXBkYXRlQWN0aXZpdHlTdGF0ZShBY3Rpdml0eVN0YXRlQ2hhbmdlSUQp CiB7CiAgICAgU2Vjb25kcyBhY3Rpdml0eVN0YXRlVXBkYXRlVGltZW91dCA9IFNlY29uZHM6OmZy b21NaWxsaXNlY29uZHMoMjUwKTsKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuY29ubmVj dGlvbigpLT53YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVseTxNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpEaWRVcGRhdGVBY3Rpdml0eVN0YXRlPihtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSwgYWN0 aXZpdHlTdGF0ZVVwZGF0ZVRpbWVvdXQsIElQQzo6V2FpdEZvck9wdGlvbjo6SW50ZXJydXB0V2Fp dGluZ0lmU3luY01lc3NhZ2VBcnJpdmVzKTsKKyAgICBwcm9jZXNzKCkuY29ubmVjdGlvbigpLT53 YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVseTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRV cGRhdGVBY3Rpdml0eVN0YXRlPihtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSwgYWN0aXZpdHlTdGF0 ZVVwZGF0ZVRpbWVvdXQsIElQQzo6V2FpdEZvck9wdGlvbjo6SW50ZXJydXB0V2FpdGluZ0lmU3lu Y01lc3NhZ2VBcnJpdmVzKTsKIH0KIAogdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJl YVByb3h5OjppbnRyaW5zaWNDb250ZW50U2l6ZURpZENoYW5nZShjb25zdCBJbnRTaXplJiBuZXdJ bnRyaW5zaWNDb250ZW50U2l6ZSkKQEAgLTE1MSwxOSArMTUxLDE5IEBAIE1hY2hTZW5kUmlnaHQg VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlRmVuY2UoKQogICAgIC8v IHdpbGwgbGlrZWx5IGdldCBkcm9wcGVkIG9uIHRoZSBmbG9vciAoaWYgdGhlIFdlYiBwcm9jZXNz IGlzIHRlcm1pbmF0ZWQpCiAgICAgLy8gb3IgcXVldWVkIHVwIHVudGlsIHByb2Nlc3MgbGF1bmNo IGNvbXBsZXRlcywgYW5kIHRoZXJlJ3Mgbm90aGluZyB1c2VmdWwKICAgICAvLyB0byBzeW5jaHJv bml6ZSBpbiB0aGVzZSBjYXNlcy4KLSAgICBpZiAoIW1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5j b25uZWN0aW9uKCkpCisgICAgaWYgKCFwcm9jZXNzKCkuY29ubmVjdGlvbigpKQogICAgICAgICBy ZXR1cm4gTWFjaFNlbmRSaWdodCgpOwogCiAgICAgLy8gRG9uJ3QgZmVuY2UgaWYgd2UgaGF2ZSBp bmNvbWluZyBzeW5jaHJvbm91cyBtZXNzYWdlcywgYmVjYXVzZSB3ZSBtYXkgbm90CiAgICAgLy8g YmUgYWJsZSB0byByZXBseSB0byB0aGUgbWVzc2FnZSB1bnRpbCB0aGUgZmVuY2UgdGltZXMgb3V0 LgotICAgIGlmIChtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuY29ubmVjdGlvbigpLT5oYXNJbmNv bWluZ1N5bmNNZXNzYWdlKCkpCisgICAgaWYgKHByb2Nlc3MoKS5jb25uZWN0aW9uKCktPmhhc0lu Y29taW5nU3luY01lc3NhZ2UoKSkKICAgICAgICAgcmV0dXJuIE1hY2hTZW5kUmlnaHQoKTsKIAog ICAgIE1hY2hTZW5kUmlnaHQgZmVuY2VQb3J0ID0gTWFjaFNlbmRSaWdodDo6YWRvcHQoW3Jvb3RM YXllckNvbnRleHQgY3JlYXRlRmVuY2VQb3J0XSk7CiAKICAgICAvLyBJbnZhbGlkYXRlIHRoZSBm ZW5jZSBpZiBhIHN5bmNocm9ub3VzIG1lc3NhZ2UgYXJyaXZlcyB3aGlsZSBpdCdzIGluc3RhbGxl ZCwKICAgICAvLyBiZWNhdXNlIHdlIHdvbid0IGJlIGFibGUgdG8gcmVwbHkgZHVyaW5nIHRoZSBm ZW5jZS13YWl0LgotICAgIHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBtX3dlYlBhZ2VQcm94eS5wcm9j ZXNzKCkuY29ubmVjdGlvbigpLT5pbnN0YWxsSW5jb21pbmdTeW5jTWVzc2FnZUNhbGxiYWNrKFty b290TGF5ZXJDb250ZXh0XSB7CisgICAgdWludDY0X3QgY2FsbGJhY2tJRCA9IHByb2Nlc3MoKS5j b25uZWN0aW9uKCktPmluc3RhbGxJbmNvbWluZ1N5bmNNZXNzYWdlQ2FsbGJhY2soW3Jvb3RMYXll ckNvbnRleHRdIHsKICAgICAgICAgW3Jvb3RMYXllckNvbnRleHQgaW52YWxpZGF0ZUZlbmNlc107 CiAgICAgfSk7CiAgICAgUmVmUHRyPFdlYlBhZ2VQcm94eT4gcmV0YWluZWRQYWdlID0gJm1fd2Vi UGFnZVByb3h5OwpAQCAtMTgyLDE3ICsxODIsMTcgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25E cmF3aW5nQXJlYVByb3h5OjpzZW5kVXBkYXRlR2VvbWV0cnkoKQogICAgIEFTU0VSVCghbV9pc1dh aXRpbmdGb3JEaWRVcGRhdGVHZW9tZXRyeSk7CiAKICAgICB3aWxsU2VuZFVwZGF0ZUdlb21ldHJ5 KCk7Ci0gICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdB cmVhOjpVcGRhdGVHZW9tZXRyeShtX3NpemUsIHRydWUgLyogZmx1c2hTeW5jaHJvbm91c2x5ICov LCBjcmVhdGVGZW5jZSgpKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOworICAgIHByb2Nlc3Mo KS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6VXBkYXRlR2VvbWV0cnkobV9zaXplLCB0cnVl IC8qIGZsdXNoU3luY2hyb25vdXNseSAqLywgY3JlYXRlRmVuY2UoKSksIG1fd2ViUGFnZVByb3h5 LnBhZ2VJRCgpKTsKIH0KIAogdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5 OjphZGp1c3RUcmFuc2llbnRab29tKGRvdWJsZSBzY2FsZSwgRmxvYXRQb2ludCBvcmlnaW4pCiB7 Ci0gICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVh OjpBZGp1c3RUcmFuc2llbnRab29tKHNjYWxlLCBvcmlnaW4pLCBtX3dlYlBhZ2VQcm94eS5wYWdl SUQoKSk7CisgICAgcHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpBZGp1c3RU cmFuc2llbnRab29tKHNjYWxlLCBvcmlnaW4pLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CiB9 CiAKIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eTo6Y29tbWl0VHJhbnNp ZW50Wm9vbShkb3VibGUgc2NhbGUsIEZsb2F0UG9pbnQgb3JpZ2luKQogewotICAgIG1fd2ViUGFn ZVByb3h5LnByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6Q29tbWl0VHJhbnNp ZW50Wm9vbShzY2FsZSwgb3JpZ2luKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOworICAgIHBy b2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6Q29tbWl0VHJhbnNpZW50Wm9vbShz Y2FsZSwgb3JpZ2luKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOwogfQogCiB2b2lkIFRpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6OmRpc3BhdGNoQWZ0ZXJFbnN1cmluZ0RyYXdp bmcoV1RGOjpGdW5jdGlvbjx2b2lkIChDYWxsYmFja0Jhc2U6OkVycm9yKT4mJiBjYWxsYmFjaykK QEAgLTIwMiw3ICsyMDIsNyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJv eHk6OmRpc3BhdGNoQWZ0ZXJFbnN1cmluZ0RyYXdpbmcoV1RGOjpGdW5jdAogICAgICAgICByZXR1 cm47CiAgICAgfQogCi0gICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6 OkRyYXdpbmdBcmVhOjpBZGRUcmFuc2FjdGlvbkNhbGxiYWNrSUQobV9jYWxsYmFja3MucHV0KFdU Rk1vdmUoY2FsbGJhY2spLCBudWxscHRyKSksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKKyAg ICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6OkFkZFRyYW5zYWN0aW9uQ2Fs bGJhY2tJRChtX2NhbGxiYWNrcy5wdXQoV1RGTW92ZShjYWxsYmFjayksIG51bGxwdHIpKSwgbV93 ZWJQYWdlUHJveHkucGFnZUlEKCkpOwogfQogCiB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhUHJveHk6OmRpc3BhdGNoUHJlc2VudGF0aW9uQ2FsbGJhY2tzQWZ0ZXJGbHVzaGluZ0xh eWVycyhjb25zdCBWZWN0b3I8Q2FsbGJhY2tJRD4mIGNhbGxiYWNrSURzKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3Mvd2luL1BhZ2VDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL3dpbi9QYWdlQ2xpZW50SW1wbC5jcHAKaW5kZXggODBlMmMyZDI3ZDcu LjE3MGMyZDc3NjM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy93aW4vUGFn ZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dpbi9QYWdlQ2xp ZW50SW1wbC5jcHAKQEAgLTQzLDkgKzQzLDkgQEAgUGFnZUNsaWVudEltcGw6OlBhZ2VDbGllbnRJ bXBsKFdlYlZpZXcmIHZpZXcpCiB9CiAKIC8vIFBhZ2VDbGllbnQncyBwdXJlIHZpcnR1YWwgZnVu Y3Rpb25zCi1zdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gUGFnZUNsaWVudEltcGw6 OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKQorc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJv eHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KFdlYlByb2Nlc3NQcm94 eSYgcHJvY2VzcykKIHsKLSAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxEcmF3aW5nQXJlYVBy b3h5SW1wbD4oKm1fdmlldy5wYWdlKCkpOworICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPERy YXdpbmdBcmVhUHJveHlJbXBsPigqbV92aWV3LnBhZ2UoKSwgcHJvY2Vzcyk7CiB9CiAKIHZvaWQg UGFnZUNsaWVudEltcGw6OnNldFZpZXdOZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29yZTo6UmVnaW9u JiByZWdpb24pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy93aW4vUGFnZUNs aWVudEltcGwuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dpbi9QYWdlQ2xpZW50SW1wbC5o CmluZGV4IGEwMWI2OGY0M2YzLi42NjU3MmJiMTQwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3Mvd2luL1BhZ2VDbGllbnRJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3Mvd2luL1BhZ2VDbGllbnRJbXBsLmgKQEAgLTUzLDcgKzUzLDcgQEAgcHVibGljOgogICAg IEhXTkQgdmlld1dpZGdldCgpOwogcHJpdmF0ZToKICAgICAvLyBQYWdlQ2xpZW50Ci0gICAgc3Rk Ojp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKSBv dmVycmlkZTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJh d2luZ0FyZWFQcm94eShXZWJQcm9jZXNzUHJveHkmKSBvdmVycmlkZTsKICAgICB2b2lkIHNldFZp ZXdOZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29yZTo6UmVnaW9uJikgb3ZlcnJpZGU7CiAgICAgdm9p ZCByZXF1ZXN0U2Nyb2xsKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0aW9u LCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgc2Nyb2xsT3JpZ2luLCBib29sIGlzUHJvZ3JhbW1h dGljU2Nyb2xsKSBvdmVycmlkZTsKICAgICBXZWJDb3JlOjpGbG9hdFBvaW50IHZpZXdTY3JvbGxQ b3NpdGlvbigpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oKaW5kZXggODA5NjIxZmQxMjIuLjNmMDU3MWQ1NmRkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1Nv dXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTMwNzEsNiAr MzA3MSw4IEBACiAJCTQ2NkJDMDM4MUZBMjY2QzkwMDJGQTlDMSAvKiBXZWJTV0NvbnRleHRNYW5h Z2VyQ29ubmVjdGlvbi5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBX ZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCTQ2NkJDMDM5MUZBMjY2QzkwMDJGQTlDMSAvKiBXZWJTV0NvbnRleHRNYW5hZ2VyQ29u bmVjdGlvbi5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXZWJTV0NvbnRleHRN YW5hZ2VyQ29ubmVjdGlvbi5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NjZCQzAz QTFGQTI2NkM5MDAyRkE5QzEgLyogV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24ubWVzc2Fn ZXMuaW4gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSB0ZXh0OyBwYXRoID0gV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rp b24ubWVzc2FnZXMuaW47IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTQ2ODM1NjlBMjFF ODFDQzcwMDZFMjdBMyAvKiBQcm92aXNpb25hbFBhZ2VQcm94eS5oICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jLmg7IHBhdGggPSBQcm92aXNpb25hbFBhZ2VQcm94eS5oOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OworCQk0NjgzNTY5QjIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQYWdl UHJveHkuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gUHJvdmlzaW9u YWxQYWdlUHJveHkuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NkEyQjYwNjFF NTY3NUEyMDBDM0RFREEgLyogQmFja2dyb3VuZFByb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVyLmNw cCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEJhY2tncm91bmRQcm9jZXNz UmVzcG9uc2l2ZW5lc3NUaW1lci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ2 QTJCNjA3MUU1Njc1QTIwMEMzREVEQSAvKiBCYWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVuZXNz VGltZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQmFja2dyb3VuZFByb2Nl c3NSZXNwb25zaXZlbmVzc1RpbWVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ2 REYwNjM5MUYzOTA1RTUwMDE5ODBCQiAvKiBOZXR3b3JrQ09SU1ByZWZsaWdodENoZWNrZXIuY3Bw ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gTmV0d29ya0NPUlNQcmVmbGln aHRDaGVja2VyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTczMTcsNiArNzMx OSw4IEBACiAJCQkJODZFNjdBMjIxOTBGNDExODAwMDA0QUI3IC8qIFByb2Nlc3NUaHJvdHRsZXIu Y3BwICovLAogCQkJCTg2RTY3QTIxMTkwRjQxMTgwMDAwNEFCNyAvKiBQcm9jZXNzVGhyb3R0bGVy LmggKi8sCiAJCQkJODMwNDhBRTUxQUNBNDVEQzAwODJDODMyIC8qIFByb2Nlc3NUaHJvdHRsZXJD bGllbnQuaCAqLywKKwkJCQk0NjgzNTY5QjIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQ YWdlUHJveHkuY3BwICovLAorCQkJCTQ2ODM1NjlBMjFFODFDQzcwMDZFMjdBMyAvKiBQcm92aXNp b25hbFBhZ2VQcm94eS5oICovLAogCQkJCUE1NUJBODFCMUJBMjVCMUUwMDdDRDMzRCAvKiBSZW1v dGVXZWJJbnNwZWN0b3JQcm94eS5jcHAgKi8sCiAJCQkJQTU1QkE4MTkxQkEyNUIxRTAwN0NEMzNE IC8qIFJlbW90ZVdlYkluc3BlY3RvclByb3h5LmggKi8sCiAJCQkJQTU1QkE4MUExQkEyNUIxRTAw N0NEMzNEIC8qIFJlbW90ZVdlYkluc3BlY3RvclByb3h5Lm1lc3NhZ2VzLmluICovLApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwCmluZGV4IDAwNzQ5YjQ3 N2EyLi5mZmVkMDBjODIwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViRnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYkZyYW1lLmNwcApAQCAtMjYzLDggKzI2Myw2IEBAIHN0YXRpYyBXZWJDb3JlOjpQb2xpY3lB Y3Rpb24gdG9Qb2xpY3lBY3Rpb24oV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbikKICAgICAg ICAgcmV0dXJuIFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6SWdub3JlOwogICAgIGNhc2UgV2ViUG9s aWN5QWN0aW9uOjpEb3dubG9hZDoKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6OlBvbGljeUFjdGlv bjo6RG93bmxvYWQ7Ci0gICAgY2FzZSBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQ6Ci0gICAgICAg IGJyZWFrOwogICAgIH0KICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICByZXR1cm4gV2Vi Q29yZTo6UG9saWN5QWN0aW9uOjpJZ25vcmU7CkBAIC0yNzIsMTEgKzI3MCw4IEBAIHN0YXRpYyBX ZWJDb3JlOjpQb2xpY3lBY3Rpb24gdG9Qb2xpY3lBY3Rpb24oV2ViUG9saWN5QWN0aW9uIHBvbGlj eUFjdGlvbikKIAogdm9pZCBXZWJGcmFtZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKHVpbnQ2 NF90IGxpc3RlbmVySUQsIFdlYlBvbGljeUFjdGlvbiBhY3Rpb24sIHVpbnQ2NF90IG5hdmlnYXRp b25JRCwgRG93bmxvYWRJRCBkb3dubG9hZElELCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRh PiYmIHdlYnNpdGVQb2xpY2llcykKIHsKLSAgICBpZiAoIW1fY29yZUZyYW1lIHx8ICFtX3BvbGlj eUxpc3RlbmVySUQgfHwgbGlzdGVuZXJJRCAhPSBtX3BvbGljeUxpc3RlbmVySUQgfHwgIW1fcG9s aWN5RnVuY3Rpb24pIHsKLSAgICAgICAgaWYgKGFjdGlvbiA9PSBXZWJQb2xpY3lBY3Rpb246OlN1 c3BlbmQpCi0gICAgICAgICAgICBwYWdlKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6 RGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAoKSk7CisgICAgaWYgKCFtX2NvcmVGcmFt ZSB8fCAhbV9wb2xpY3lMaXN0ZW5lcklEIHx8IGxpc3RlbmVySUQgIT0gbV9wb2xpY3lMaXN0ZW5l cklEIHx8ICFtX3BvbGljeUZ1bmN0aW9uKQogICAgICAgICByZXR1cm47Ci0gICAgfQogCiAgICAg RnJhbWVQb2xpY3lGdW5jdGlvbiBmdW5jdGlvbiA9IFdURk1vdmUobV9wb2xpY3lGdW5jdGlvbik7 CiAgICAgYm9vbCBmb3JOYXZpZ2F0aW9uQWN0aW9uID0gbV9wb2xpY3lGdW5jdGlvbkZvck5hdmln YXRpb25BY3Rpb24gPT0gRm9yTmF2aWdhdGlvbkFjdGlvbjo6WWVzOwpAQCAtMjkyLDE2ICsyODcs NyBAQCB2b2lkIFdlYkZyYW1lOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24odWludDY0X3QgbGlz dGVuZXJJRCwgV2ViUG9saWN5QWN0aW9uIGFjdAogICAgICAgICAgICAgZG9jdW1lbnRMb2FkZXIt PnNldE5hdmlnYXRpb25JRChuYXZpZ2F0aW9uSUQpOwogICAgIH0KIAotICAgIGJvb2wgc2hvdWxk U3VzcGVuZCA9IGZhbHNlOwotICAgIGlmIChhY3Rpb24gPT0gV2ViUG9saWN5QWN0aW9uOjpTdXNw ZW5kKSB7Ci0gICAgICAgIHNob3VsZFN1c3BlbmQgPSB0cnVlOwotICAgICAgICBhY3Rpb24gPSBX ZWJQb2xpY3lBY3Rpb246Oklnbm9yZTsKLSAgICB9Ci0KICAgICBmdW5jdGlvbih0b1BvbGljeUFj dGlvbihhY3Rpb24pKTsKLQotICAgIGlmIChzaG91bGRTdXNwZW5kKQotICAgICAgICBwYWdlKCkt PnN1c3BlbmRGb3JQcm9jZXNzU3dhcCgpOwogfQogCiB2b2lkIFdlYkZyYW1lOjpzdGFydERvd25s b2FkKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgU3RyaW5n JiBzdWdnZXN0ZWROYW1lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcAppbmRleCA3NjIwMzExM2Q2MC4uZGQ5N2Q2ZWIwN2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC00MDIsNyArNDAyLDcgQEAgV2Vi UGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMm JiBwYXJhbWV0ZXJzKQogICAgICwgbV9vdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSB7IHBh cmFtZXRlcnMub3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgfQogICAgICwgbV9jcHVMaW1p dChwYXJhbWV0ZXJzLmNwdUxpbWl0KQogI2lmIFBMQVRGT1JNKE1BQykKLSAgICAsIG1fc2hvdWxk QXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uKHBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1 c3BlbmRlZCkKKyAgICAsIG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9u KHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkKICNlbmRpZgogewogICAgIEFTU0VSVChtX3BhZ2VJ RCk7CkBAIC00NzMsOCArNDczLDggQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQs IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQogICAgIG1fZHJhd2luZ0Fy ZWEtPnNldFBhaW50aW5nRW5hYmxlZChmYWxzZSk7CiAgICAgbV9kcmF3aW5nQXJlYS0+c2V0U2hv dWxkU2NhbGVWaWV3VG9GaXREb2N1bWVudChwYXJhbWV0ZXJzLnNob3VsZFNjYWxlVmlld1RvRml0 RG9jdW1lbnQpOwogCi0gICAgaWYgKHBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCkKLSAg ICAgICAgZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6U3dhcEZyb21TdXNw ZW5kZWQpOworICAgIGlmIChwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXApCisgICAgICAgIGZyZWV6 ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlByb2Nlc3NTd2FwKTsKIAogI2lmIEVO QUJMRShBU1lOQ19TQ1JPTExJTkcpCiAgICAgbV91c2VBc3luY1Njcm9sbGluZyA9IHBhcmFtZXRl cnMuc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5Ojp0aHJlYWRlZFNj cm9sbGluZ0VuYWJsZWRLZXkoKSk7CkBAIC02OTgsNyArNjk4LDcgQEAgdm9pZCBXZWJQYWdlOjpy ZWluaXRpYWxpemVXZWJQYWdlKFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJz KQogICAgICAgICBtX2RyYXdpbmdBcmVhLT51cGRhdGVQcmVmZXJlbmNlcyhwYXJhbWV0ZXJzLnN0 b3JlKTsKICAgICAgICAgbV9kcmF3aW5nQXJlYS0+c2V0UGFpbnRpbmdFbmFibGVkKHRydWUpOwog I2lmIFBMQVRGT1JNKE1BQykKLSAgICAgICAgbV9zaG91bGRBdHRhY2hEcmF3aW5nQXJlYU9uUGFn ZVRyYW5zaXRpb24gPSBwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQ7CisgICAgICAgIG1f c2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uID0gcGFyYW1ldGVycy5pc1By b2Nlc3NTd2FwOwogI2VuZGlmCiAgICAgICAgIHVuZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZy ZWV6ZVJlYXNvbjo6UGFnZVN1c3BlbmRlZCk7CiAgICAgfQpAQCAtMzA1NSwxMiArMzA1NSw2IEBA IHZvaWQgV2ViUGFnZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKHVpbnQ2NF90IGZyYW1lSUQs IHVpbnQ2NF90IGxpc3RlbmVySUQsIFdlCiAgICAgV2ViRnJhbWUqIGZyYW1lID0gV2ViUHJvY2Vz czo6c2luZ2xldG9uKCkud2ViRnJhbWUoZnJhbWVJRCk7CiAgICAgaWYgKCFmcmFtZSkKICAgICAg ICAgcmV0dXJuOwotICAgIGlmIChwb2xpY3lBY3Rpb24gPT0gV2ViUG9saWN5QWN0aW9uOjpTdXNw ZW5kKSB7Ci0gICAgICAgIEFTU0VSVChmcmFtZSA9PSBtX21haW5GcmFtZSk7Ci0gICAgICAgIHNl dElzU3VzcGVuZGVkKHRydWUpOwotCi0gICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnNl bmRQcmV3YXJtSW5mb3JtYXRpb24obWFpbldlYkZyYW1lKCktPnVybCgpKTsKLSAgICB9CiAgICAg ZnJhbWUtPmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihsaXN0ZW5lcklELCBwb2xpY3lBY3Rpb24s IG5hdmlnYXRpb25JRCwgZG93bmxvYWRJRCwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKIH0K IApAQCAtMzEwMiw3ICszMDk2LDcgQEAgdm9pZCBXZWJQYWdlOjpkaWRDb21wbGV0ZVBhZ2VUcmFu c2l0aW9uKCkKIAogICAgIGJvb2wgaXNJbml0aWFsRW1wdHlEb2N1bWVudCA9ICFtX21haW5GcmFt ZTsKICAgICBpZiAoIWlzSW5pdGlhbEVtcHR5RG9jdW1lbnQpCi0gICAgICAgIHVuZnJlZXplTGF5 ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6U3dhcEZyb21TdXNwZW5kZWQpOworICAgICAg ICB1bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlByb2Nlc3NTd2FwKTsK IAogI2lmIFBMQVRGT1JNKE1BQykKICAgICBpZiAobV9zaG91bGRBdHRhY2hEcmF3aW5nQXJlYU9u UGFnZVRyYW5zaXRpb24gJiYgIWlzSW5pdGlhbEVtcHR5RG9jdW1lbnQpIHsKQEAgLTYzMTQsNiAr NjMwOCwxMCBAQCB2b2lkIFdlYlBhZ2U6OnNldElzU3VzcGVuZGVkKGJvb2wgc3VzcGVuZGVkKQog ICAgIGlmIChtX2lzU3VzcGVuZGVkKSB7CiAgICAgICAgIC8vIFVuZnJvemVuIG9uIGRyYXdpbmcg YXJlYSByZXNldC4KICAgICAgICAgZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNv bjo6UGFnZVN1c3BlbmRlZCk7CisKKyAgICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuc2Vu ZFByZXdhcm1JbmZvcm1hdGlvbihtYWluV2ViRnJhbWUoKS0+dXJsKCkpOworCisgICAgICAgIHN1 c3BlbmRGb3JQcm9jZXNzU3dhcCgpOwogICAgIH0gZWxzZQogICAgICAgICBtX3Nob3VsZFJlc2V0 RHJhd2luZ0FyZWFBZnRlclN1c3BlbmQgPSB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDcxNWUxMjQ1MjBmLi5mM2I5MzRlMjdkYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtNjk2LDcgKzY5 Niw3IEBAIHB1YmxpYzoKICAgICAgICAgUHJvY2Vzc1N1c3BlbmRlZCAgICAgICAgPSAxIDw8IDIs CiAgICAgICAgIFBhZ2VTdXNwZW5kZWQgICAgICAgICAgID0gMSA8PCAzLAogICAgICAgICBQcmlu dGluZyAgICAgICAgICAgICAgICA9IDEgPDwgNCwKLSAgICAgICAgU3dhcEZyb21TdXNwZW5kZWQg ICAgICAgPSAxIDw8IDUsCisgICAgICAgIFByb2Nlc3NTd2FwICAgICAgICAgICAgID0gMSA8PCA1 LAogICAgIH07CiAgICAgdm9pZCBmcmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29u KTsKICAgICB2b2lkIHVuZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbik7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWEubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KaW5kZXggNWVlMWY4MjYzNTcu LjA4M2U5NmNjODkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KKysrIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1t CkBAIC05Nyw3ICs5Nyw3IEBAIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpUaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYShXZWJQYWdlJiB3ZWJQYWdlLCBjCiAgICAgdXBkYXRlTGF5 ZXJIb3N0aW5nQ29udGV4dCgpOwogICAgIHNldENvbG9yU3BhY2UocGFyYW1ldGVycy5jb2xvclNw YWNlKTsKIAotICAgIGlmICghcGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKQorICAgIGlm ICghcGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwKQogICAgICAgICBhdHRhY2goKTsKIH0KIApkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dh cE9uTmF2aWdhdGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev UHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KaW5kZXggZjM1ZDhiYWEzNTMuLjE3YzNlMjJlYzdi IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nl c3NTd2FwT25OYXZpZ2F0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KQEAgLTEsNSArMSw1IEBACiAvKgot ICogQ29weXJpZ2h0IChDKSAyMDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAq IENvcHlyaWdodCAoQykgMjAxNy0yMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNzIsNiArNzIsNyBAQCBzdGF0aWMg Ym9vbCBzZXJ2ZXJSZWRpcmVjdGVkOwogc3RhdGljIEhhc2hTZXQ8cGlkX3Q+IHNlZW5QSURzOwog c3RhdGljIGJvb2wgd2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdDsKIHN0YXRpYyBib29sIGRpZFBl cmZvcm1DbGllbnRSZWRpcmVjdDsKK3N0YXRpYyBib29sIHNob3VsZENvbnZlcnRUb0Rvd25sb2Fk Owogc3RhdGljIFJldGFpblB0cjxOU1VSTD4gY2xpZW50UmVkaXJlY3RTb3VyY2VVUkw7CiBzdGF0 aWMgUmV0YWluUHRyPE5TVVJMPiBjbGllbnRSZWRpcmVjdERlc3RpbmF0aW9uVVJMOwogCkBAIC0x MjgsNiArMTI5LDExIEBAIC0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkZWNp ZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOihXS05hdmlnYXRpCiAgICAgZGlkUmVwb25kVG9Q b2xpY3lEZWNpc2lvbkNhbGwgPSB0cnVlOwogfQogCistICh2b2lkKXdlYlZpZXc6KFdLV2ViVmll dyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvblJlc3BvbnNlOihXS05hdmlnYXRp b25SZXNwb25zZSAqKW5hdmlnYXRpb25SZXNwb25zZSBkZWNpc2lvbkhhbmRsZXI6KHZvaWQgKF4p KFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5KSlkZWNpc2lvbkhhbmRsZXIKK3sKKyAgICBkZWNp c2lvbkhhbmRsZXIoc2hvdWxkQ29udmVydFRvRG93bmxvYWQgPyBfV0tOYXZpZ2F0aW9uUmVzcG9u c2VQb2xpY3lCZWNvbWVEb3dubG9hZCA6IFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5QWxsb3cp OworfQorCiAtICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlkUmVjZWl2ZVNl cnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxOYXZpZ2F0aW9uOihXS05hdmlnYXRpb24gKiluYXZp Z2F0aW9uCiB7CiAgICAgc2VlblBJRHMuYWRkKFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmll cl0pOwpAQCAtMTQ2Nyw2ICsxNDczLDEwOSBAQCBURVNUKFByb2Nlc3NTd2FwLCBTZXJ2ZXJSZWRp cmVjdDIpCiAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4x Lmh0bWwiLCBbW3dlYlZpZXcgVVJMXSBhYnNvbHV0ZVN0cmluZ10pOwogfQogCitzdGF0aWMgY29u c3QgY2hhciogbGlua1RvV2ViS2l0Qnl0ZXMgPSBSIlBTT05SRVNPVVJDRSgKKzxib2R5PgorICA8 YSBpZD0idGVzdExpbmsiIGhyZWY9InBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiPkxp bms8L2E+Cis8L2JvZHk+CispUFNPTlJFU09VUkNFIjsKKworVEVTVChQcm9jZXNzU3dhcCwgUG9s aWN5Q2FuY2VsQWZ0ZXJTZXJ2ZXJSZWRpcmVjdCkKK3sKKyAgICBhdXRvIHByb2Nlc3NQb29sQ29u ZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gYWxsb2Nd IGluaXRdKTsKKyAgICBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1N3YXBz T25OYXZpZ2F0aW9uID0gWUVTOworICAgIGF1dG8gcHJvY2Vzc1Bvb2wgPSBhZG9wdE5TKFtbV0tQ cm9jZXNzUG9vbCBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZp Z3VyYXRpb24uZ2V0KCldKTsKKworICAgIGF1dG8gd2ViVmlld0NvbmZpZ3VyYXRpb24gPSBhZG9w dE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3 Q29uZmlndXJhdGlvbiBzZXRQcm9jZXNzUG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07CisgICAgYXV0 byBoYW5kbGVyID0gYWRvcHROUyhbW1BTT05TY2hlbWUgYWxsb2NdIGluaXRdKTsKKyAgICBbaGFu ZGxlciBhZGRNYXBwaW5nRnJvbVVSTFN0cmluZzpAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWlu Lmh0bWwiIHRvRGF0YTpsaW5rVG9XZWJLaXRCeXRlc107CisgICAgW2hhbmRsZXIgYWRkUmVkaXJl Y3RGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCIgdG9VUkxT dHJpbmc6QCJwc29uOi8vd3d3LmFwcGxlLmNvbS9pZ25vcmUuaHRtbCJdOworICAgIFt3ZWJWaWV3 Q29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2No ZW1lOkAicHNvbiJdOworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBh bGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0 aW9uOndlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgYXV0byBuYXZpZ2F0aW9uRGVs ZWdhdGUgPSBhZG9wdE5TKFtbUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOwor ICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0 KCldOworCisgICAgbmF2aWdhdGlvbkRlbGVnYXRlLT5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u QWN0aW9uID0gXihXS05hdmlnYXRpb25BY3Rpb24gKmFjdGlvbiwgdm9pZCAoXmRlY2lzaW9uSGFu ZGxlcikoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5KSkgeworICAgICAgICBpZiAoW2FjdGlvbi5y ZXF1ZXN0LlVSTC5hYnNvbHV0ZVN0cmluZyBoYXNTdWZmaXg6QCJpZ25vcmUuaHRtbCJdKSB7Cisg ICAgICAgICAgICBkZWNpc2lvbkhhbmRsZXIoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5Q2FuY2Vs KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBkZWNpc2lvbkhhbmRs ZXIoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5QWxsb3cpOworICAgIH07CisKKyAgICBOU1VSTFJl cXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxX aXRoU3RyaW5nOkAicHNvbjovL3d3dy5nb29nbGUuY29tL21haW4uaHRtbCJdXTsKKyAgICBbd2Vi VmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1 bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworICAgIGF1dG8gcGlkQWZ0ZXJGaXJzdExvYWQg PSBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworCisgICAgRVhQRUNUX0VRKDEsIG51 bWJlck9mRGVjaWRlUG9saWN5Q2FsbHMpOworCisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2Ny aXB0OkAidGVzdExpbmsuY2xpY2soKSIgY29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKworICAgIFRl c3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmFpbGVkKTsKKyAgICBmYWlsZWQgPSBmYWxzZTsKKyAg ICBkb25lID0gZmFsc2U7CisKKyAgICBFWFBFQ1RfRVEoMywgbnVtYmVyT2ZEZWNpZGVQb2xpY3lD YWxscyk7CisKKyAgICAvLyBXZSBzaG91bGQgc3RpbGwgYmUgb24gZ29vZ2xlLmNvbS4KKyAgICBF WFBFQ1RfRVEocGlkQWZ0ZXJGaXJzdExvYWQsIFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmll cl0pOworICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0 bWwiLCBbW3dlYlZpZXcgVVJMXSBhYnNvbHV0ZVN0cmluZ10pOworCisgICAgW3dlYlZpZXcgZXZh bHVhdGVKYXZhU2NyaXB0OkAidGVzdExpbmsuaW5uZXJUZXh0IiBjb21wbGV0aW9uSGFuZGxlcjog WyZdIChpZCBpbm5lclRleHQsIE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAgIEVYUEVDVF9XS19T VFJFUShAIkxpbmsiLCBpbm5lclRleHQpOworICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9XTsK KyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsK K30KKworVEVTVChQcm9jZXNzU3dhcCwgQ3Jvc3NTaXRlRG93bmxvYWQpCit7CisgICAgYXV0byBw cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1 cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgp LnByb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbiA9IFlFUzsKKyAgICBhdXRvIHByb2Nlc3NQb29sID0g YWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJv Y2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpXSk7CisKKyAgICBhdXRvIHdlYlZpZXdDb25maWd1 cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsK KyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0 KCldOworICAgIGF1dG8gaGFuZGxlciA9IGFkb3B0TlMoW1tQU09OU2NoZW1lIGFsbG9jXSBpbml0 XSk7CisgICAgW2hhbmRsZXIgYWRkTWFwcGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3Lmdv b2dsZS5jb20vbWFpbi5odG1sIiB0b0RhdGE6bGlua1RvV2ViS2l0Qnl0ZXNdOworICAgIFtoYW5k bGVyIGFkZE1hcHBpbmdGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4u aHRtbCIgdG9EYXRhOiJIZWxsbyJdOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRVUkxT Y2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAicHNvbiJdOworCisgICAg YXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpO U01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0 aW9uLmdldCgpXSk7CisgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBhZG9wdE5TKFtbUFNP Tk5hdmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldE5hdmln YXRpb25EZWxlZ2F0ZTpuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCldOworCisgICAgTlNVUkxSZXF1 ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0 aFN0cmluZzpAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiXV07CisgICAgW3dlYlZp ZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4o JmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKyAgICBhdXRvIHBpZEFmdGVyRmlyc3RMb2FkID0g W3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKworICAgIHNob3VsZENvbnZlcnRUb0Rv d25sb2FkID0gdHJ1ZTsKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJ0ZXN0TGlu ay5jbGljaygpIiBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOworCisgICAgVGVzdFdlYktpdEFQSTo6 VXRpbDo6cnVuKCZmYWlsZWQpOworICAgIGZhaWxlZCA9IGZhbHNlOworICAgIHNob3VsZENvbnZl cnRUb0Rvd25sb2FkID0gZmFsc2U7CisKKyAgICAvLyBXZSBzaG91bGQgc3RpbGwgYmUgb24gZ29v Z2xlLmNvbS4KKyAgICBFWFBFQ1RfRVEocGlkQWZ0ZXJGaXJzdExvYWQsIFt3ZWJWaWV3IF93ZWJQ cm9jZXNzSWRlbnRpZmllcl0pOworICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuZ29v Z2xlLmNvbS9tYWluLmh0bWwiLCBbW3dlYlZpZXcgVVJMXSBhYnNvbHV0ZVN0cmluZ10pOworCisg ICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAidGVzdExpbmsuaW5uZXJUZXh0IiBjb21w bGV0aW9uSGFuZGxlcjogWyZdIChpZCBpbm5lclRleHQsIE5TRXJyb3IgKmVycm9yKSB7CisgICAg ICAgIEVYUEVDVF9XS19TVFJFUShAIkxpbmsiLCBpbm5lclRleHQpOworICAgICAgICBkb25lID0g dHJ1ZTsKKyAgICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAg IGRvbmUgPSBmYWxzZTsKK30KKwogZW51bSBjbGFzcyBTaG91bGRFbmFibGVQU09OIHsgTm8sIFll cyB9Owogc3RhdGljIHZvaWQgcnVuQ2xpZW50U2lkZVJlZGlyZWN0VGVzdChTaG91bGRFbmFibGVQ U09OIHNob3VsZEVuYWJsZVBTT04pCiB7CkBAIC0yMjMyLDEyICsyMzQxLDI3IEBAIFRFU1QoUHJv Y2Vzc1N3YXAsIFBhZ2VTaG93SGlkZSkKIAogICAgIEVYUEVDVF9FUSg3dSwgW3JlY2VpdmVkTWVz c2FnZXMgY291bnRdKTsKICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5v cmcvbWFpbi5odG1sIC0gcGFnZXNob3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMu Z2V0KClbMF0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9t YWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFd KTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwg LSBwYWdlc2hvdyBOT1QgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7Ci0g ICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFn ZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSk7Ci0gICAgRVhQRUNU X1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IHBl cnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNF0pOwotICAgIEVYUEVDVF9XS19TVFJF UShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQi LCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29u Oi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZl ZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAgICBpZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0g aGFzUHJlZml4OkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJdKSB7CisgICAgICAg IEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdl aGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKKyAgICAgICAgRVhQ RUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cg Tk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOworICAgIH0gZWxzZSB7 CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRt bCAtIHBhZ2VzaG93IE5PVCBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsK KyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRt bCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOworICAg IH0KKyAgICBpZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10gaGFzUHJlZml4OkAicHNvbjov L3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIl0pIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAi cHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVj ZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246 Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZl ZE1lc3NhZ2VzLmdldCgpWzRdKTsKKyAgICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RS RVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVk IiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShA InBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJl Y2VpdmVkTWVzc2FnZXMuZ2V0KClbNF0pOworICAgIH0KKyAgICBpZiAoW3JlY2VpdmVkTWVzc2Fn ZXMuZ2V0KClbNV0gaGFzUHJlZml4OkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJd KSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWlu Lmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdKTsK KyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1s IC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7CisgICAg fSBlbHNlIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20v bWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1 XSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWlu Lmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsK KyAgICB9CiB9CiAKIC8vIERpc2FibGluZyB0aGUgcGFnZSBjYWNoZSBleHBsaWNpdGx5IGlzIChm b3Igc29tZSByZWFzb24pIG5vdCBhdmFpbGFibGUgb24gaU9TLgpAQCAtMjMwNywxMiArMjQzMSwy NyBAQCBURVNUKFByb2Nlc3NTd2FwLCBMb2FkVW5sb2FkKQogCiAgICAgRVhQRUNUX0VRKDd1LCBb cmVjZWl2ZWRNZXNzYWdlcyBjb3VudF0pOwogICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93 d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBsb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsw XSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRt bCAtIHVubG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0pOwotICAgIEVYUEVDVF9XS19T VFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIGxvYWQiLCByZWNlaXZlZE1l c3NhZ2VzLmdldCgpWzJdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxl LmNvbS9tYWluLmh0bWwgLSB1bmxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKLSAg ICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gbG9h ZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNF0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBz b246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSB1bmxvYWQiLCByZWNlaXZlZE1lc3NhZ2Vz LmdldCgpWzVdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9t YWluLmh0bWwgLSBsb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7CisgICAgaWYgKFty ZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdIGhhc1ByZWZpeDpAInBzb246Ly93d3cud2Via2l0Lm9y Zy9tYWluLmh0bWwiXSkgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lndl YmtpdC5vcmcvbWFpbi5odG1sIC0gdW5sb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7 CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRt bCAtIGxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsKKyAgICB9IGVsc2UgeworICAg ICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBs b2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJF UShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSB1bmxvYWQiLCByZWNlaXZlZE1l c3NhZ2VzLmdldCgpWzJdKTsKKyAgICB9CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgp WzNdIGhhc1ByZWZpeDpAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCJdKSB7CisgICAg ICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHVu bG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10pOworICAgICAgICBFWFBFQ1RfV0tfU1RS RVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gbG9hZCIsIHJlY2VpdmVkTWVz c2FnZXMuZ2V0KClbNF0pOworICAgIH0gZWxzZSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShA InBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBsb2FkIiwgcmVjZWl2ZWRNZXNzYWdl cy5nZXQoKVszXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUu Y29tL21haW4uaHRtbCAtIHVubG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNF0pOworICAg IH0KKyAgICBpZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0gaGFzUHJlZml4OkAicHNvbjov L3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShA InBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSB1bmxvYWQiLCByZWNlaXZlZE1lc3Nh Z2VzLmdldCgpWzVdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBs ZS5jb20vbWFpbi5odG1sIC0gbG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAg IH0gZWxzZSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29t L21haW4uaHRtbCAtIGxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdKTsKKyAgICAgICAg RVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHVubG9h ZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAgIH0KIH0KIAogVEVTVChQcm9jZXNz U3dhcCwgV2ViSW5zcGVjdG9yKQo= 359269 2019-01-16 09:13:45 -0800 2019-01-16 10:01:14 -0800 WIP Patch 193361_pson_provisional_page2_wip.patch text/plain 197868 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggOGU5NTllZGFm ZmQuLjlkOTBiZThiNDhlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVz dEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0 aW9ucwpAQCAtNzMzLDggKzczMyw4IEBAIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGlj cy9yZW1vdmUtYmxvY2tpbmctaW4tcmVkaXJlY3QuaHRtbCBbIFNraXAgXQogaHR0cC90ZXN0cy9y ZXNvdXJjZUxvYWRTdGF0aXN0aWNzL25vbi1wcmV2YWxlbnQtcmVzb3VyY2VzLWNhbi1hY2Nlc3Mt Y29va2llcy1pbi1hLXRoaXJkLXBhcnR5LWNvbnRleHQuaHRtbCBbIFNraXAgXQogaHR0cC90ZXN0 cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL2NhcC1jYWNoZS1tYXgtYWdlLWZvci1wcmV2YWxlbnQt cmVzb3VyY2UuaHRtbCBbIFNraXAgXQogCi0jIFByb2Nlc3Mgc3dhcHBpbmcgaXMgb25seSBpbXBs ZW1lbnRlZCBvbiBXZWJLaXQyLgotaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3Byb2Nlc3Mtc3dhcC13 aW5kb3ctb3Blbi5odG1sIFsgUGFzcyBdCisjIFRoaXMgZmVhdHVyZSBpcyBjdXJyZW50bHkgZGlz YWJsZWQgYnkgZGVmYXVsdCBhbmQgdW5maW5pc2hlZCA8cmRhcjovL3Byb2JsZW0vMzg5MjUwNzc+ LgoraHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3Byb2Nlc3Mtc3dhcC13aW5kb3ctb3Blbi5odG1sIFsg U2tpcCBdCiAKICMgQ3Jvc3MtT3JpZ2luLVJlc291cmNlLVBvbGljeSByZXNwb25zZSBoZWFkZXIg aXMgb25seSBpbXBsZW1lbnRlZCBpbiBXZWJLaXQyLgogaHR0cC93cHQvY3Jvc3Mtb3JpZ2luLXJl c291cmNlLXBvbGljeS8gWyBQYXNzIF0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw CmluZGV4IDRjMjZhNjk4MWI0Li5lYmY5NTBiYTZjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuY3BwCkBAIC0yMDMyLDExICsyMDMyLDExIEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNv bW1pdFByb3Zpc2lvbmFsTG9hZCgpCiAKICAgICAgICAgT3B0aW9uYWw8SGFzSW5zZWN1cmVDb250 ZW50PiBoYXNJbnNlY3VyZUNvbnRlbnQgPSBjYWNoZWRQYWdlLT5jYWNoZWRNYWluRnJhbWUoKS0+ aGFzSW5zZWN1cmVDb250ZW50KCk7CiAKKyAgICAgICAgZGlzcGF0Y2hEaWRDb21taXRMb2FkKGhh c0luc2VjdXJlQ29udGVudCk7CisKICAgICAgICAgLy8gRklYTUU6IFRoaXMgQVBJIHNob3VsZCBi ZSB0dXJuZWQgYXJvdW5kIHNvIHRoYXQgd2UgZ3JvdW5kIENhY2hlZFBhZ2UgaW50byB0aGUgUGFn ZS4KICAgICAgICAgY2FjaGVkUGFnZS0+cmVzdG9yZSgqbV9mcmFtZS5wYWdlKCkpOwogCi0gICAg ICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOwotCiAjaWYgUExB VEZPUk0oSU9TX0ZBTUlMWSkKICAgICAgICAgbV9mcmFtZS5wYWdlKCktPmNocm9tZSgpLnNldERp c3BhdGNoVmlld3BvcnREYXRhRGlkQ2hhbmdlU3VwcHJlc3NlZChmYWxzZSk7CiAgICAgICAgIG1f ZnJhbWUucGFnZSgpLT5jaHJvbWUoKS5kaXNwYXRjaFZpZXdwb3J0UHJvcGVydGllc0RpZENoYW5n ZShtX2ZyYW1lLnBhZ2UoKS0+dmlld3BvcnRBcmd1bWVudHMoKSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcCBiL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCmluZGV4IGNhMmRmNDBl ZTFkLi42ZDA3YzAzYWQ4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKQEAgLTczLDcgKzczLDcgQEAgdm9pZCBXZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzOjplbmNvZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAg IGVuY29kZXIuZW5jb2RlRW51bShsYXllckhvc3RpbmdNb2RlKTsKICAgICBlbmNvZGVyIDw8IG1p bWVUeXBlc1dpdGhDdXN0b21Db250ZW50UHJvdmlkZXJzOwogICAgIGVuY29kZXIgPDwgY29udHJv bGxlZEJ5QXV0b21hdGlvbjsKLSAgICBlbmNvZGVyIDw8IGlzU3dhcEZyb21TdXNwZW5kZWQ7Cisg ICAgZW5jb2RlciA8PCBpc1Byb2Nlc3NTd2FwOwogCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIGVu Y29kZXIgPDwgY29sb3JTcGFjZTsKQEAgLTIyNyw3ICsyMjcsNyBAQCBPcHRpb25hbDxXZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzPiBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoSVBD OjpEZWNvZAogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogICAgIGlmICghZGVjb2Rlci5k ZWNvZGUocGFyYW1ldGVycy5jb250cm9sbGVkQnlBdXRvbWF0aW9uKSkKICAgICAgICAgcmV0dXJu IFdURjo6bnVsbG9wdDsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuaXNTd2Fw RnJvbVN1c3BlbmRlZCkpCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmlzUHJv Y2Vzc1N3YXApKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAjaWYgUExBVEZPUk0o TUFDKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVycy5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVy cy5oCmluZGV4IGFlNDMyNWNiZDVmLi5iMzgyY2VlZGQ0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaApAQCAtMTI5LDcgKzEyOSw3IEBA IHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICAgICBWZWN0b3I8U3RyaW5nPiBt aW1lVHlwZXNXaXRoQ3VzdG9tQ29udGVudFByb3ZpZGVyczsKIAogICAgIGJvb2wgY29udHJvbGxl ZEJ5QXV0b21hdGlvbjsKLSAgICBib29sIGlzU3dhcEZyb21TdXNwZW5kZWQgeyBmYWxzZSB9Owor ICAgIGJvb2wgaXNQcm9jZXNzU3dhcCB7IGZhbHNlIH07CiAKICNpZiBQTEFURk9STShNQUMpCiAg ICAgQ29sb3JTcGFjZURhdGEgY29sb3JTcGFjZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv U2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5 QWN0aW9uLmgKaW5kZXggMTQyYTUxOGRmMDkuLjM5NzE3OTVjNDZhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQb2xpY3lBY3Rpb24uaApAQCAtMjksMTEgKzI5LDExIEBACiAKIG5hbWVzcGFjZSBX ZWJLaXQgewogCisvLyBGSVhNRTogUmVtb3ZlIHRoaXMgdHlwZSBhbmQgdXNlIFdlYkNvcmU6OlBv bGljeUFjdGlvbiBpbnN0ZWFkLgogZW51bSBjbGFzcyBXZWJQb2xpY3lBY3Rpb24gOiB1aW50OF90 IHsKICAgICBVc2UsCiAgICAgRG93bmxvYWQsCi0gICAgSWdub3JlLAotICAgIFN1c3BlbmQKKyAg ICBJZ25vcmUKIH07CiAKIH0KQEAgLTQ1LDggKzQ1LDcgQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgRW51 bVRyYWl0czxXZWJLaXQ6OldlYlBvbGljeUFjdGlvbj4gewogICAgICAgICBXZWJLaXQ6OldlYlBv bGljeUFjdGlvbiwKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OlVzZSwKICAgICAg ICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OkRvd25sb2FkLAotICAgICAgICBXZWJLaXQ6Oldl YlBvbGljeUFjdGlvbjo6SWdub3JlLAotICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6 U3VzcGVuZAorICAgICAgICBXZWJLaXQ6OldlYlBvbGljeUFjdGlvbjo6SWdub3JlCiAgICAgPjsK IH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQgYi9Tb3VyY2UvV2Vi S2l0L1NvdXJjZXMudHh0CmluZGV4IDM0MGU3YmYyNjE4Li40ZGUwYzZmZWZlOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9Tb3VyY2VzLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMu dHh0CkBAIC0yMzAsNiArMjMwLDcgQEAgVUlQcm9jZXNzL0luc3BlY3RvclRhcmdldFByb3h5LmNw cAogVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuY3BwCiBVSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlv bi5jcHAKIFVJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNwcAorVUlQcm9jZXNzL1Byb3Zpc2lv bmFsUGFnZVByb3h5LmNwcAogVUlQcm9jZXNzL1JlbW90ZVdlYkluc3BlY3RvclByb3h5LmNwcAog VUlQcm9jZXNzL1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwCiBVSVByb2Nlc3MvU2VydmljZVdvcmtl clByb2Nlc3NQcm94eS5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tCmluZGV4IDA3NGNkZGZkMjc4Li40ZGZhZDY0ZTAxNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC00NCw2ICs0NCw3 IEBACiAjaW1wb3J0ICJOYXZpZ2F0aW9uU3RhdGUuaCIKICNpbXBvcnQgIk9iakNPYmplY3RHcmFw aC5oIgogI2ltcG9ydCAiUGFnZUNsaWVudC5oIgorI2ltcG9ydCAiUHJvdmlzaW9uYWxQYWdlUHJv eHkuaCIKICNpbXBvcnQgIlJlbW90ZUxheWVyVHJlZVNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YS5o IgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24uaCIKICNpbXBvcnQgIlJlbW90 ZU9iamVjdFJlZ2lzdHJ5LmgiCkBAIC00NzAwLDYgKzQ3MDEsMTEgQEAgLSAodm9pZClfa2lsbFdl YkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRTdGF0ZQogewogICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nl c3NQcm94eT4gcHJvdGVjdGVkUHJvY2Vzc1Byb3h5KF9wYWdlLT5wcm9jZXNzKCkpOwogICAgIHBy b3RlY3RlZFByb2Nlc3NQcm94eS0+cmVxdWVzdFRlcm1pbmF0aW9uKFdlYktpdDo6UHJvY2Vzc1Rl cm1pbmF0aW9uUmVhc29uOjpSZXF1ZXN0ZWRCeUNsaWVudCk7CisKKyAgICBpZiAoYXV0byogcHJv dmlzaW9uYWxQYWdlUHJveHkgPSBfcGFnZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKSkgeworICAg ICAgICBSZWY8V2ViS2l0OjpXZWJQcm9jZXNzUHJveHk+IHByb3RlY3RlZFByb2Nlc3NQcm94eShw cm92aXNpb25hbFBhZ2VQcm94eS0+cHJvY2VzcygpKTsKKyAgICAgICAgcHJvdGVjdGVkUHJvY2Vz c1Byb3h5LT5yZXF1ZXN0VGVybWluYXRpb24oV2ViS2l0OjpQcm9jZXNzVGVybWluYXRpb25SZWFz b246OlJlcXVlc3RlZEJ5Q2xpZW50KTsKKyAgICB9CiB9CiAKICNpZiBQTEFURk9STShNQUMpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBs LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3Bw CmluZGV4IDY4MzMzMWQ3NjE0Li4zMTc4NTlkNzUzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5jcHAKQEAgLTYwLDkgKzYwLDkgQEAg UGFnZUNsaWVudEltcGw6OlBhZ2VDbGllbnRJbXBsKEd0a1dpZGdldCogdmlld1dpZGdldCkKIH0K IAogLy8gUGFnZUNsaWVudCdzIHB1cmUgdmlydHVhbCBmdW5jdGlvbnMKLXN0ZDo6dW5pcXVlX3B0 cjxEcmF3aW5nQXJlYVByb3h5PiBQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94 eSgpCitzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gUGFnZUNsaWVudEltcGw6OmNy ZWF0ZURyYXdpbmdBcmVhUHJveHkoV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKQogewotICAgIHJl dHVybiBzdGQ6Om1ha2VfdW5pcXVlPERyYXdpbmdBcmVhUHJveHlJbXBsPigqd2Via2l0V2ViVmll d0Jhc2VHZXRQYWdlKFdFQktJVF9XRUJfVklFV19CQVNFKG1fdmlld1dpZGdldCkpKTsKKyAgICBy ZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxEcmF3aW5nQXJlYVByb3h5SW1wbD4oKndlYmtpdFdlYlZp ZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRShtX3ZpZXdXaWRnZXQpKSwgcHJvY2Vz cyk7CiB9CiAKIHZvaWQgUGFnZUNsaWVudEltcGw6OnNldFZpZXdOZWVkc0Rpc3BsYXkoY29uc3Qg V2ViQ29yZTo6UmVnaW9uJiByZWdpb24pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmgKaW5kZXggYjA5MTkyMGU4MjUuLjZkZWE4ZjM5ZmQ4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBs LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5o CkBAIC01NSw3ICs1NSw3IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICAvLyBQYWdlQ2xpZW50 Ci0gICAgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURyYXdpbmdBcmVh UHJveHkoKSBvdmVycmlkZTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4g Y3JlYXRlRHJhd2luZ0FyZWFQcm94eShXZWJQcm9jZXNzUHJveHkmKSBvdmVycmlkZTsKICAgICB2 b2lkIHNldFZpZXdOZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29yZTo6UmVnaW9uJikgb3ZlcnJpZGU7 CiAgICAgdm9pZCByZXF1ZXN0U2Nyb2xsKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIHNjcm9s bFBvc2l0aW9uLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgc2Nyb2xsT3JpZ2luLCBib29sIGlz UHJvZ3JhbW1hdGljU2Nyb2xsKSBvdmVycmlkZTsKICAgICBXZWJDb3JlOjpGbG9hdFBvaW50IHZp ZXdTY3JvbGxQb3NpdGlvbigpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL3dwZS9QYWdlQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvd3BlL1BhZ2VDbGllbnRJbXBsLmNwcAppbmRleCBkYTllNmQ3ODc0Zi4uMjIzMzYx NTBmZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvUGFnZUNs aWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvUGFnZUNs aWVudEltcGwuY3BwCkBAIC01MSw5ICs1MSw5IEBAIHN0cnVjdCB3cGVfdmlld19iYWNrZW5kKiBQ YWdlQ2xpZW50SW1wbDo6dmlld0JhY2tlbmQoKQogICAgIHJldHVybiBtX3ZpZXcuYmFja2VuZCgp OwogfQogCi1zdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gUGFnZUNsaWVudEltcGw6 OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKQorc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJv eHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KFdlYlByb2Nlc3NQcm94 eSYgcHJvY2VzcykKIHsKLSAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxBY2NlbGVyYXRlZERy YXdpbmdBcmVhUHJveHk+KG1fdmlldy5wYWdlKCkpOworICAgIHJldHVybiBzdGQ6Om1ha2VfdW5p cXVlPEFjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eT4obV92aWV3LnBhZ2UoKSwgcHJvY2Vzcyk7 CiB9CiAKIHZvaWQgUGFnZUNsaWVudEltcGw6OnNldFZpZXdOZWVkc0Rpc3BsYXkoY29uc3QgV2Vi Q29yZTo6UmVnaW9uJikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93 cGUvUGFnZUNsaWVudEltcGwuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvUGFn ZUNsaWVudEltcGwuaAppbmRleCBkNmQ1YTY5MmE4ZS4uYjY5OWYyOWY5YjIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvUGFnZUNsaWVudEltcGwuaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL1BhZ2VDbGllbnRJbXBsLmgKQEAgLTUzLDcg KzUzLDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIC8vIFBhZ2VDbGllbnQKLSAgICBzdGQ6 OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpIG92 ZXJyaWRlOworICAgIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBjcmVhdGVEcmF3 aW5nQXJlYVByb3h5KFdlYlByb2Nlc3NQcm94eSYpIG92ZXJyaWRlOwogICAgIHZvaWQgc2V0Vmll d05lZWRzRGlzcGxheShjb25zdCBXZWJDb3JlOjpSZWdpb24mKSBvdmVycmlkZTsKICAgICB2b2lk IHJlcXVlc3RTY3JvbGwoY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYsIGNvbnN0IFdlYkNvcmU6 OkludFBvaW50JiwgYm9vbCkgb3ZlcnJpZGU7CiAgICAgV2ViQ29yZTo6RmxvYXRQb2ludCB2aWV3 U2Nyb2xsUG9zaXRpb24oKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BY2NlbGVyYXRlZERyYXdpbmdBcmVhUHJveHkuY3BwCmluZGV4IGVjODQ2YjM3YTRh Li4zOWFmOWIzNzk4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQWNjZWxl cmF0ZWREcmF3aW5nQXJlYVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B Y2NlbGVyYXRlZERyYXdpbmdBcmVhUHJveHkuY3BwCkBAIC00NSw4ICs0NSw4IEBACiBuYW1lc3Bh Y2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCi1BY2NlbGVyYXRlZERyYXdp bmdBcmVhUHJveHk6OkFjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eShXZWJQYWdlUHJveHkmIHdl YlBhZ2VQcm94eSkKLSAgICA6IERyYXdpbmdBcmVhUHJveHkoRHJhd2luZ0FyZWFUeXBlSW1wbCwg d2ViUGFnZVByb3h5KQorQWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5OjpBY2NlbGVyYXRlZERy YXdpbmdBcmVhUHJveHkoV2ViUGFnZVByb3h5JiB3ZWJQYWdlUHJveHksIFdlYlByb2Nlc3NQcm94 eSYgcHJvY2VzcykKKyAgICA6IERyYXdpbmdBcmVhUHJveHkoRHJhd2luZ0FyZWFUeXBlSW1wbCwg d2ViUGFnZVByb3h5LCBwcm9jZXNzKQogewogfQogCkBAIC0xMDYsNyArMTA2LDcgQEAgdm9pZCBB Y2NlbGVyYXRlZERyYXdpbmdBcmVhUHJveHk6OmRpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKHVp bnQ2NF90IGJhY2tpbmdTdG8KICAgICBtX2lzV2FpdGluZ0ZvckRpZFVwZGF0ZUJhY2tpbmdTdG9y ZVN0YXRlID0gZmFsc2U7CiAKICAgICAvLyBTdG9wIHRoZSByZXNwb25zaXZlbmVzcyB0aW1lciB0 aGF0IHdhcyBzdGFydGVkIGluIHNlbmRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZS4KLSAgICBtX3dl YlBhZ2VQcm94eS5wcm9jZXNzKCkucmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0b3AoKTsKKyAgICBw cm9jZXNzKCkucmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0b3AoKTsKIAogICAgIGlmIChsYXllclRy ZWVDb250ZXh0ICE9IG1fbGF5ZXJUcmVlQ29udGV4dCkgewogICAgICAgICBpZiAobGF5ZXJUcmVl Q29udGV4dC5pc0VtcHR5KCkgJiYgIW1fbGF5ZXJUcmVlQ29udGV4dC5pc0VtcHR5KCkpIHsKQEAg LTE4MywxMyArMTgzLDEzIEBAIHZvaWQgQWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5OjpzZW5k VXBkYXRlQmFja2luZ1N0b3JlU3RhdGUoUmVzcG9uZEltbWVkaWF0ZWx5CiAKICAgICBtX2lzV2Fp dGluZ0ZvckRpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlID0gcmVzcG9uZEltbWVkaWF0ZWx5T3JO b3QgPT0gUmVzcG9uZEltbWVkaWF0ZWx5OwogCi0gICAgbV93ZWJQYWdlUHJveHkucHJvY2Vzcygp LnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZShtX25l eHRCYWNraW5nU3RvcmVTdGF0ZUlELCByZXNwb25kSW1tZWRpYXRlbHlPck5vdCA9PSBSZXNwb25k SW1tZWRpYXRlbHksIG1fd2ViUGFnZVByb3h5LmRldmljZVNjYWxlRmFjdG9yKCksIG1fc2l6ZSwg bV9zY3JvbGxPZmZzZXQpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CisgICAgcHJvY2Vzcygp LnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZShtX25l eHRCYWNraW5nU3RvcmVTdGF0ZUlELCByZXNwb25kSW1tZWRpYXRlbHlPck5vdCA9PSBSZXNwb25k SW1tZWRpYXRlbHksIG1fd2ViUGFnZVByb3h5LmRldmljZVNjYWxlRmFjdG9yKCksIG1fc2l6ZSwg bV9zY3JvbGxPZmZzZXQpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CiAgICAgbV9zY3JvbGxP ZmZzZXQgPSBJbnRTaXplKCk7CiAKICAgICBpZiAobV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVCYWNr aW5nU3RvcmVTdGF0ZSkgewogICAgICAgICAvLyBTdGFydCB0aGUgcmVzcG9uc2l2ZW5lc3MgdGlt ZXIuIFdlIHdpbGwgc3RvcCBpdCB3aGVuIHdlIGhlYXIgYmFjayBmcm9tIHRoZSBXZWJQcm9jZXNz CiAgICAgICAgIC8vIGluIGRpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlLgotICAgICAgICBtX3dl YlBhZ2VQcm94eS5wcm9jZXNzKCkucmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7CisgICAg ICAgIHByb2Nlc3MoKS5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKICAgICB9CiAKICAg ICBpZiAobV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSAmJiAhbV9sYXll clRyZWVDb250ZXh0LmlzRW1wdHkoKSkgewpAQCAtMjA1LDcgKzIwNSw3IEBAIHZvaWQgQWNjZWxl cmF0ZWREcmF3aW5nQXJlYVByb3h5Ojp3YWl0Rm9yQW5kRGlzcGF0Y2hEaWRVcGRhdGVCYWNraW5n U3RvcmVTdGF0ZSgpCiAKICAgICBpZiAoIW1fd2ViUGFnZVByb3h5LmlzVmFsaWQoKSkKICAgICAg ICAgcmV0dXJuOwotICAgIGlmIChtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc3RhdGUoKSA9PSBX ZWJQcm9jZXNzUHJveHk6OlN0YXRlOjpMYXVuY2hpbmcpCisgICAgaWYgKHByb2Nlc3MoKS5zdGF0 ZSgpID09IFdlYlByb2Nlc3NQcm94eTo6U3RhdGU6OkxhdW5jaGluZykKICAgICAgICAgcmV0dXJu OwogICAgIGlmICghbV93ZWJQYWdlUHJveHkuaXNWaWV3VmlzaWJsZSgpKQogICAgICAgICByZXR1 cm47CkBAIC0yMjIsNyArMjIyLDcgQEAgdm9pZCBBY2NlbGVyYXRlZERyYXdpbmdBcmVhUHJveHk6 OndhaXRGb3JBbmREaXNwYXRjaERpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKCkKICAgICAvLyBj aG9vc2UgdGhlIG1vc3QgcmVjZW50IG9uZSwgb3IgdGhlIG9uZSB0aGF0IGlzIGNsb3Nlc3QgdG8g b3VyIGN1cnJlbnQgc2l6ZS4KIAogICAgIC8vIFRoZSB0aW1lb3V0LCBpbiBzZWNvbmRzLCB3ZSB1 c2Ugd2hlbiB3YWl0aW5nIGZvciBhIERpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlIG1lc3NhZ2Ug d2hlbiB3ZSdyZSBhc2tlZCB0byBwYWludC4KLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCku Y29ubmVjdGlvbigpLT53YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVseTxNZXNzYWdlczo6RHJh d2luZ0FyZWFQcm94eTo6RGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGU+KG1fd2ViUGFnZVByb3h5 LnBhZ2VJRCgpLCBTZWNvbmRzOjpmcm9tTWlsbGlzZWNvbmRzKDUwMCkpOworICAgIHByb2Nlc3Mo KS5jb25uZWN0aW9uKCktPndhaXRGb3JBbmREaXNwYXRjaEltbWVkaWF0ZWx5PE1lc3NhZ2VzOjpE cmF3aW5nQXJlYVByb3h5OjpEaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZT4obV93ZWJQYWdlUHJv eHkucGFnZUlEKCksIFNlY29uZHM6OmZyb21NaWxsaXNlY29uZHMoNTAwKSk7CiB9CiAKIHZvaWQg QWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5OjplbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdN b2RlKGNvbnN0IExheWVyVHJlZUNvbnRleHQmIGxheWVyVHJlZUNvbnRleHQpCkBAIC0yNTYsNyAr MjU2LDcgQEAgdm9pZCBBY2NlbGVyYXRlZERyYXdpbmdBcmVhUHJveHk6OnNldE5hdGl2ZVN1cmZh Y2VIYW5kbGVGb3JDb21wb3NpdGluZyh1aW50NjRfdAogICAgICAgICBtX3BlbmRpbmdOYXRpdmVT dXJmYWNlSGFuZGxlRm9yQ29tcG9zaXRpbmcgPSBoYW5kbGU7CiAgICAgICAgIHJldHVybjsKICAg ICB9Ci0gICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdB cmVhOjpTZXROYXRpdmVTdXJmYWNlSGFuZGxlRm9yQ29tcG9zaXRpbmcoaGFuZGxlKSwgbV93ZWJQ YWdlUHJveHkucGFnZUlEKCksIElQQzo6U2VuZE9wdGlvbjo6RGlzcGF0Y2hNZXNzYWdlRXZlbldo ZW5XYWl0aW5nRm9yU3luY1JlcGx5KTsKKyAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJh d2luZ0FyZWE6OlNldE5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZyhoYW5kbGUpLCBt X3dlYlBhZ2VQcm94eS5wYWdlSUQoKSwgSVBDOjpTZW5kT3B0aW9uOjpEaXNwYXRjaE1lc3NhZ2VF dmVuV2hlbldhaXRpbmdGb3JTeW5jUmVwbHkpOwogfQogCiB2b2lkIEFjY2VsZXJhdGVkRHJhd2lu Z0FyZWFQcm94eTo6ZGVzdHJveU5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZygpCkBA IC0yNjYsNyArMjY2LDcgQEAgdm9pZCBBY2NlbGVyYXRlZERyYXdpbmdBcmVhUHJveHk6OmRlc3Ry b3lOYXRpdmVTdXJmYWNlSGFuZGxlRm9yQ29tcG9zaXRpbmcoKQogICAgICAgICByZXR1cm47CiAg ICAgfQogICAgIGJvb2wgaGFuZGxlZDsKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc2Vu ZFN5bmMoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpEZXN0cm95TmF0aXZlU3VyZmFjZUhhbmRsZUZv ckNvbXBvc2l0aW5nKCksIE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6RGVzdHJveU5hdGl2ZVN1cmZh Y2VIYW5kbGVGb3JDb21wb3NpdGluZzo6UmVwbHkoaGFuZGxlZCksIG1fd2ViUGFnZVByb3h5LnBh Z2VJRCgpKTsKKyAgICBwcm9jZXNzKCkuc2VuZFN5bmMoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpE ZXN0cm95TmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKCksIE1lc3NhZ2VzOjpEcmF3 aW5nQXJlYTo6RGVzdHJveU5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZzo6UmVwbHko aGFuZGxlZCksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKIH0KICNlbmRpZgogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BY2NlbGVyYXRlZERyYXdpbmdBcmVhUHJveHku aCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eS5o CmluZGV4IDc2ODNjM2YyNGE2Li5jMzhhOWJiMTJiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5LmgKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5LmgKQEAgLTM0LDcgKzM0 LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIEFjY2VsZXJhdGVkRHJhd2luZ0FyZWFQ cm94eSA6IHB1YmxpYyBEcmF3aW5nQXJlYVByb3h5IHsKIHB1YmxpYzoKLSAgICBleHBsaWNpdCBB Y2NlbGVyYXRlZERyYXdpbmdBcmVhUHJveHkoV2ViUGFnZVByb3h5Jik7CisgICAgQWNjZWxlcmF0 ZWREcmF3aW5nQXJlYVByb3h5KFdlYlBhZ2VQcm94eSYsIFdlYlByb2Nlc3NQcm94eSYpOwogICAg IHZpcnR1YWwgfkFjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eSgpOwogCiAgICAgYm9vbCBpc0lu QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSBjb25zdCB7IHJldHVybiBhbHdheXNVc2VDb21w b3NpdGluZygpIHx8ICFtX2xheWVyVHJlZUNvbnRleHQuaXNFbXB0eSgpOyB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQYWdlUHJveHlDb2NvYS5tbSBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlBhZ2VQcm94eUNvY29hLm1tCmluZGV4IDgz ZjVlOGZmZmRkLi4zNTRmNWFmM2ExMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQ29jb2EvV2ViUGFnZVByb3h5Q29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQ29jb2EvV2ViUGFnZVByb3h5Q29jb2EubW0KQEAgLTEyMSw3ICsxMjEsNyBAQCB2b2lkIFdl YlBhZ2VQcm94eTo6Y3JlYXRlU2FuZGJveEV4dGVuc2lvbnNJZk5lZWRlZChjb25zdCBWZWN0b3I8 U3RyaW5nPiYgZmlsZXMsCiAgICAgICAgIEJPT0wgaXNEaXJlY3Rvcnk7CiAgICAgICAgIGlmIChb W05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGZpbGVFeGlzdHNBdFBhdGg6ZmlsZXNbMF0g aXNEaXJlY3Rvcnk6JmlzRGlyZWN0b3J5XSAmJiAhaXNEaXJlY3RvcnkpIHsKICAgICAgICAgICAg IFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZSgiLyIsIFNhbmRib3hFeHRlbnNpb246OlR5 cGU6OlJlYWRPbmx5LCBmaWxlUmVhZEhhbmRsZSk7Ci0gICAgICAgICAgICB3aWxsQWNxdWlyZVVu aXZlcnNhbEZpbGVSZWFkU2FuZGJveEV4dGVuc2lvbigpOworICAgICAgICAgICAgd2lsbEFjcXVp cmVVbml2ZXJzYWxGaWxlUmVhZFNhbmRib3hFeHRlbnNpb24obV9wcm9jZXNzKTsKICAgICAgICAg fQogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2Vi Vmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmgK aW5kZXggYzY4ZGJjYzdjZWEuLjViMjEzOGRmMzA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0NvY29hL1dlYlZpZXdJbXBsLmgKQEAgLTE5Nyw3ICsxOTcsNyBAQCBwdWJsaWM6CiAgICAg dm9pZCBzZXRGaXhlZExheW91dFNpemUoQ0dTaXplKTsKICAgICBDR1NpemUgZml4ZWRMYXlvdXRT aXplKCkgY29uc3Q7CiAKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gY3Jl YXRlRHJhd2luZ0FyZWFQcm94eSgpOworICAgIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVBy b3h5PiBjcmVhdGVEcmF3aW5nQXJlYVByb3h5KFdlYlByb2Nlc3NQcm94eSYpOwogICAgIGJvb2wg aXNVc2luZ1VJU2lkZUNvbXBvc2l0aW5nKCkgY29uc3Q7CiAgICAgdm9pZCBzZXREcmF3aW5nQXJl YVNpemUoQ0dTaXplKTsKICAgICB2b2lkIHVwZGF0ZUxheWVyKCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbSBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCmluZGV4IGQ1MWVmNWQ5ZmUxLi41ZGQxNTM1 NWNiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0lt cGwubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0K QEAgLTE3MjUsMTIgKzE3MjUsMTIgQEAgQ0dTaXplIFdlYlZpZXdJbXBsOjpmaXhlZExheW91dFNp emUoKSBjb25zdAogICAgIHJldHVybiBtX3BhZ2UtPmZpeGVkTGF5b3V0U2l6ZSgpOwogfQogCi1z dGQ6OnVuaXF1ZV9wdHI8V2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5PiBXZWJWaWV3SW1wbDo6Y3Jl YXRlRHJhd2luZ0FyZWFQcm94eSgpCitzdGQ6OnVuaXF1ZV9wdHI8V2ViS2l0OjpEcmF3aW5nQXJl YVByb3h5PiBXZWJWaWV3SW1wbDo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eShXZWJQcm9jZXNzUHJv eHkmIHByb2Nlc3MpCiB7CiAgICAgaWYgKFtbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRl ZmF1bHRzXSBvYmplY3RGb3JLZXk6QCJXZWJLaXQyVXNlUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0Fy ZWEiXSBib29sVmFsdWVdKQotICAgICAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxSZW1vdGVM YXllclRyZWVEcmF3aW5nQXJlYVByb3h5PihtX3BhZ2UpOworICAgICAgICByZXR1cm4gc3RkOjpt YWtlX3VuaXF1ZTxSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5PihtX3BhZ2UsIHByb2Nl c3MpOwogCi0gICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8VGlsZWRDb3JlQW5pbWF0aW9uRHJh d2luZ0FyZWFQcm94eT4obV9wYWdlKTsKKyAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxUaWxl ZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5PihtX3BhZ2UsIHByb2Nlc3MpOwogfQogCiBi b29sIFdlYlZpZXdJbXBsOjppc1VzaW5nVUlTaWRlQ29tcG9zaXRpbmcoKSBjb25zdApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmNwcAppbmRleCA3OTU2OGRmMTY3 ZS4uZDM2YmM0NmZlNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdp bmdBcmVhUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdpbmdBcmVh UHJveHkuY3BwCkBAIC0zOCwyMCArMzgsMjEgQEAKIG5hbWVzcGFjZSBXZWJLaXQgewogdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiAKLURyYXdpbmdBcmVhUHJveHk6OkRyYXdpbmdBcmVhUHJveHko RHJhd2luZ0FyZWFUeXBlIHR5cGUsIFdlYlBhZ2VQcm94eSYgd2ViUGFnZVByb3h5KQorRHJhd2lu Z0FyZWFQcm94eTo6RHJhd2luZ0FyZWFQcm94eShEcmF3aW5nQXJlYVR5cGUgdHlwZSwgV2ViUGFn ZVByb3h5JiB3ZWJQYWdlUHJveHksIFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcykKICAgICA6IG1f dHlwZSh0eXBlKQogICAgICwgbV93ZWJQYWdlUHJveHkod2ViUGFnZVByb3h5KQorICAgICwgbV9w cm9jZXNzKG1ha2VSZWYocHJvY2VzcykpCiAgICAgLCBtX3NpemUod2ViUGFnZVByb3h5LnZpZXdT aXplKCkpCiAjaWYgUExBVEZPUk0oTUFDKQogICAgICwgbV92aWV3RXhwb3NlZFJlY3RDaGFuZ2Vk VGltZXIoUnVuTG9vcDo6bWFpbigpLCB0aGlzLCAmRHJhd2luZ0FyZWFQcm94eTo6dmlld0V4cG9z ZWRSZWN0Q2hhbmdlZFRpbWVyRmlyZWQpCiAjZW5kaWYKIHsKLSAgICBtX3dlYlBhZ2VQcm94eS5w cm9jZXNzKCkuYWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYVByb3h5Ojpt ZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpLCAqdGhpcyk7Cisg ICAgcHJvY2Vzcy5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJveHk6 Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCksICp0aGlzKTsK IH0KIAogRHJhd2luZ0FyZWFQcm94eTo6fkRyYXdpbmdBcmVhUHJveHkoKQogewotICAgIG1fd2Vi UGFnZVByb3h5LnByb2Nlc3MoKS5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OkRyYXdp bmdBcmVhUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV93ZWJQYWdlUHJveHkucGFnZUlE KCkpOworICAgIHByb2Nlc3MoKS5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OkRyYXdp bmdBcmVhUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV93ZWJQYWdlUHJveHkucGFnZUlE KCkpOwogfQogCiBib29sIERyYXdpbmdBcmVhUHJveHk6OnNldFNpemUoY29uc3QgSW50U2l6ZSYg c2l6ZSwgY29uc3QgSW50U2l6ZSYgc2Nyb2xsRGVsdGEpCkBAIC05Miw3ICs5Myw3IEBAIHZvaWQg RHJhd2luZ0FyZWFQcm94eTo6dmlld0V4cG9zZWRSZWN0Q2hhbmdlZFRpbWVyRmlyZWQoKQogICAg IGlmIChtX3ZpZXdFeHBvc2VkUmVjdCA9PSBtX2xhc3RTZW50Vmlld0V4cG9zZWRSZWN0KQogICAg ICAgICByZXR1cm47CiAKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc2VuZChNZXNzYWdl czo6RHJhd2luZ0FyZWE6OlNldFZpZXdFeHBvc2VkUmVjdChtX3ZpZXdFeHBvc2VkUmVjdCksIG1f d2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKKyAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJh d2luZ0FyZWE6OlNldFZpZXdFeHBvc2VkUmVjdChtX3ZpZXdFeHBvc2VkUmVjdCksIG1fd2ViUGFn ZVByb3h5LnBhZ2VJRCgpKTsKICAgICBtX2xhc3RTZW50Vmlld0V4cG9zZWRSZWN0ID0gbV92aWV3 RXhwb3NlZFJlY3Q7CiB9CiAjZW5kaWYgLy8gUExBVEZPUk0oTUFDKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oCmluZGV4IDg2ZmIxM2Q5NzY0Li4zNDE5YTg5ZThk NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5o CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaApAQCAtNDgs NiArNDgsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIExheWVyVHJlZUNvbnRleHQ7CiBj bGFzcyBVcGRhdGVJbmZvOwogY2xhc3MgV2ViUGFnZVByb3h5OworY2xhc3MgV2ViUHJvY2Vzc1By b3h5OwogCiBjbGFzcyBEcmF3aW5nQXJlYVByb3h5IDogcHVibGljIElQQzo6TWVzc2FnZVJlY2Vp dmVyIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShEcmF3aW5nQXJlYVByb3h5KTsKQEAgLTEw NywxMiArMTA4LDE0IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hQcmVzZW50 YXRpb25DYWxsYmFja3NBZnRlckZsdXNoaW5nTGF5ZXJzKGNvbnN0IFZlY3RvcjxDYWxsYmFja0lE PiYpIHsgfQogCiAgICAgV2ViUGFnZVByb3h5JiBwYWdlKCkgY29uc3QgeyByZXR1cm4gbV93ZWJQ YWdlUHJveHk7IH0KKyAgICBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MoKSB7IHJldHVybiBtX3By b2Nlc3MuZ2V0KCk7IH0KIAogcHJvdGVjdGVkOgotICAgIGV4cGxpY2l0IERyYXdpbmdBcmVhUHJv eHkoRHJhd2luZ0FyZWFUeXBlLCBXZWJQYWdlUHJveHkmKTsKKyAgICBEcmF3aW5nQXJlYVByb3h5 KERyYXdpbmdBcmVhVHlwZSwgV2ViUGFnZVByb3h5JiwgV2ViUHJvY2Vzc1Byb3h5Jik7CiAKICAg ICBEcmF3aW5nQXJlYVR5cGUgbV90eXBlOwogICAgIFdlYlBhZ2VQcm94eSYgbV93ZWJQYWdlUHJv eHk7CisgICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gbV9wcm9jZXNzOwogCiAgICAgV2ViQ29yZTo6 SW50U2l6ZSBtX3NpemU7CiAgICAgV2ViQ29yZTo6SW50U2l6ZSBtX3Njcm9sbE9mZnNldDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNw cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcAppbmRl eCA5MDcwYjVhZmI1YS4uOGM2Y2U4ZDY1ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5jcHAKQEAgLTQ3LDggKzQ3LDggQEAKIG5hbWVzcGFj ZSBXZWJLaXQgewogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKLURyYXdpbmdBcmVhUHJveHlJ bXBsOjpEcmF3aW5nQXJlYVByb3h5SW1wbChXZWJQYWdlUHJveHkmIHdlYlBhZ2VQcm94eSkKLSAg ICA6IEFjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eSh3ZWJQYWdlUHJveHkpCitEcmF3aW5nQXJl YVByb3h5SW1wbDo6RHJhd2luZ0FyZWFQcm94eUltcGwoV2ViUGFnZVByb3h5JiB3ZWJQYWdlUHJv eHksIFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcykKKyAgICA6IEFjY2VsZXJhdGVkRHJhd2luZ0Fy ZWFQcm94eSh3ZWJQYWdlUHJveHksIHByb2Nlc3MpCiAgICAgLCBtX2Rpc2NhcmRCYWNraW5nU3Rv cmVUaW1lcihSdW5Mb29wOjpjdXJyZW50KCksIHRoaXMsICZEcmF3aW5nQXJlYVByb3h5SW1wbDo6 ZGlzY2FyZEJhY2tpbmdTdG9yZSkKIHsKICNpZiBVU0UoR0xJQl9FVkVOVF9MT09QKQpAQCAtMTI0 LDcgKzEyNCw3IEBAIHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OnVwZGF0ZSh1aW50NjRfdCBi YWNraW5nU3RvcmVTdGF0ZUlELCBjb25zdCBVcGRhdGVJbmZvCiAgICAgLy8gRklYTUU6IEhhbmRs ZSB0aGUgY2FzZSB3aGVyZSB0aGUgdmlldyBpcyBoaWRkZW4uCiAKICAgICBpbmNvcnBvcmF0ZVVw ZGF0ZSh1cGRhdGVJbmZvKTsKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc2VuZChNZXNz YWdlczo6RHJhd2luZ0FyZWE6OkRpZFVwZGF0ZSgpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7 CisgICAgcHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpEaWRVcGRhdGUoKSwg bV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOwogfQogCiB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBs OjpkaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSh1aW50NjRfdCBiYWNraW5nU3RvcmVTdGF0ZUlE LCBjb25zdCBVcGRhdGVJbmZvJiB1cGRhdGVJbmZvLCBjb25zdCBMYXllclRyZWVDb250ZXh0JiBs YXllclRyZWVDb250ZXh0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvRHJh d2luZ0FyZWFQcm94eUltcGwuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdpbmdBcmVh UHJveHlJbXBsLmgKaW5kZXggMGFmNzc3ZmNlNDQuLjMxYTljYzc5ODYxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmgKQEAgLTM5LDcgKzM5LDcg QEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIERyYXdpbmdBcmVhUHJveHlJbXBsIGZpbmFs IDogcHVibGljIEFjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eSB7CiBwdWJsaWM6Ci0gICAgZXhw bGljaXQgRHJhd2luZ0FyZWFQcm94eUltcGwoV2ViUGFnZVByb3h5Jik7CisgICAgRHJhd2luZ0Fy ZWFQcm94eUltcGwoV2ViUGFnZVByb3h5JiwgV2ViUHJvY2Vzc1Byb3h5Jik7CiAgICAgdmlydHVh bCB+RHJhd2luZ0FyZWFQcm94eUltcGwoKTsKIAogICAgIHZvaWQgcGFpbnQoQmFja2luZ1N0b3Jl OjpQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dCwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYsIFdlYkNv cmU6OlJlZ2lvbiYgdW5wYWludGVkUmVnaW9uKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1BhZ2VDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VDbGll bnQuaAppbmRleCAwMDdiMjgxODRmMy4uYmY0ZWIyZGY0OTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9QYWdlQ2xpZW50LmgKQEAgLTQ5LDYgKzQ5LDcgQEAKIAogT0JKQ19DTEFTUyBDQUxheWVyOwog T0JKQ19DTEFTUyBOU0ZpbGVXcmFwcGVyOworT0JKQ19DTEFTUyBOU01lbnU7CiBPQkpDX0NMQVNT IE5TU2V0OwogT0JKQ19DTEFTUyBXS0RyYXdpbmdWaWV3OwogT0JKQ19DTEFTUyBfV0tSZW1vdGVP YmplY3RSZWdpc3RyeTsKQEAgLTEyMiw2ICsxMjMsNyBAQCBjbGFzcyBXZWJGcmFtZVByb3h5Owog Y2xhc3MgV2ViT3BlblBhbmVsUmVzdWx0TGlzdGVuZXJQcm94eTsKIGNsYXNzIFdlYlBhZ2VQcm94 eTsKIGNsYXNzIFdlYlBvcHVwTWVudVByb3h5OworY2xhc3MgV2ViUHJvY2Vzc1Byb3h5OwogCiBl bnVtIGNsYXNzIENvbnRpbnVlVW5zYWZlTG9hZCA6IGJvb2wgeyBObywgWWVzIH07CiAKQEAgLTE1 OCw3ICsxNjAsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB+UGFnZUNsaWVudCgpIHsgfQogCiAg ICAgLy8gQ3JlYXRlIGEgbmV3IGRyYXdpbmcgYXJlYSBwcm94eSBmb3IgdGhlIGdpdmVuIHBhZ2Uu Ci0gICAgdmlydHVhbCBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJh d2luZ0FyZWFQcm94eSgpID0gMDsKKyAgICB2aXJ0dWFsIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5n QXJlYVByb3h5PiBjcmVhdGVEcmF3aW5nQXJlYVByb3h5KFdlYlByb2Nlc3NQcm94eSYpID0gMDsK IAogICAgIC8vIFRlbGwgdGhlIHZpZXcgdG8gaW52YWxpZGF0ZSB0aGUgZ2l2ZW4gcmVnaW9uLiBU aGUgcmVnaW9uIGlzIGluIHZpZXcgY29vcmRpbmF0ZXMuCiAgICAgdmlydHVhbCB2b2lkIHNldFZp ZXdOZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29yZTo6UmVnaW9uJikgPSAwOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi4xNGZiYWM4ZDA4MAotLS0gL2Rldi9udWxsCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmNwcApAQCAtMCww ICsxLDM2NyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6 CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFi b3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFy eSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0 aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3 aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBC WSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBF WFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQg VE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklU TkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBF VkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBG T1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwg T1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQg VE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NT IE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikg SE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElO CisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJ R0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNF IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJQ cm92aXNpb25hbFBhZ2VQcm94eS5oIgorCisjaW5jbHVkZSAiQVBJTmF2aWdhdGlvbi5oIgorI2lu Y2x1ZGUgIkRyYXdpbmdBcmVhUHJveHkuaCIKKyNpbmNsdWRlICJGb3JtRGF0YVJlZmVyZW5jZS5o IgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKKyNpbmNsdWRlICJQYWdlQ2xpZW50LmgiCisjaW5jbHVk ZSAiVVJMU2NoZW1lVGFza1BhcmFtZXRlcnMuaCIKKyNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExp c3QuaCIKKyNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3RJdGVtLmgiCisjaW5jbHVkZSAiV2Vi RXJyb3JzLmgiCisjaW5jbHVkZSAiV2ViTmF2aWdhdGlvbkRhdGFTdG9yZS5oIgorI2luY2x1ZGUg IldlYk5hdmlnYXRpb25TdGF0ZS5oIgorI2luY2x1ZGUgIldlYlBhZ2VNZXNzYWdlcy5oIgorI2lu Y2x1ZGUgIldlYlBhZ2VQcm94eS5oIgorI2luY2x1ZGUgIldlYlBhZ2VQcm94eU1lc3NhZ2VzLmgi CisjaW5jbHVkZSAiV2ViUHJvY2Vzc01lc3NhZ2VzLmgiCisjaW5jbHVkZSAiV2ViUHJvY2Vzc1By b3h5LmgiCisjaW5jbHVkZSA8V2ViQ29yZS9TaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQuaD4K KworbmFtZXNwYWNlIFdlYktpdCB7CisKKyNkZWZpbmUgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChj aGFubmVsLCBmbXQsIC4uLikgUkVMRUFTRV9MT0dfSUYobV9wYWdlLmlzQWx3YXlzT25Mb2dnaW5n QWxsb3dlZCgpLCBjaGFubmVsLCAiJXAgLSBQcm92aXNpb25hbFBhZ2VQcm94eTo6IiBmbXQsIHRo aXMsICMjX19WQV9BUkdTX18pCisjZGVmaW5lIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQo Y2hhbm5lbCwgZm10LCAuLi4pIFJFTEVBU0VfTE9HX0VSUk9SX0lGKG1fcGFnZS5pc0Fsd2F5c09u TG9nZ2luZ0FsbG93ZWQoKSwgY2hhbm5lbCwgIiVwIC0gUHJvdmlzaW9uYWxQYWdlUHJveHk6OiIg Zm10LCB0aGlzLCAjI19fVkFfQVJHU19fKQorCitQcm92aXNpb25hbFBhZ2VQcm94eTo6UHJvdmlz aW9uYWxQYWdlUHJveHkoV2ViUGFnZVByb3h5JiBwYWdlLCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiYm IHByb2Nlc3MsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+IHN1c3BlbmRlZFBh Z2UsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgYm9vbCBpc1NlcnZlclJlZGlyZWN0LCBjb25zdCBX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlD bGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCkKKyAgICA6IG1fcGFnZShwYWdlKQor ICAgICwgbV9wcm9jZXNzKFdURk1vdmUocHJvY2VzcykpCisgICAgLCBtX25hdmlnYXRpb25JRChu YXZpZ2F0aW9uSUQpCisgICAgLCBtX2lzU2VydmVyUmVkaXJlY3QoaXNTZXJ2ZXJSZWRpcmVjdCkK KyAgICAsIG1fcmVxdWVzdChyZXF1ZXN0KQorICAgICwgbV9wcm9jZXNzU3dhcFJlcXVlc3RlZEJ5 Q2xpZW50KHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpCisjaWYgUExBVEZPUk0oSU9TX0ZB TUlMWSkKKyAgICAsIG1fc3VzcGVuc2lvblRva2VuKG1fcHJvY2Vzcy0+dGhyb3R0bGVyKCkuZm9y ZWdyb3VuZEFjdGl2aXR5VG9rZW4oKSkKKyNlbmRpZgoreworICAgIG1fcHJvY2Vzcy0+YWRkTWVz c2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUo KSwgbV9wYWdlLnBhZ2VJRCgpLCAqdGhpcyk7CisgICAgbV9wcm9jZXNzLT5hZGRQcm92aXNpb25h bFBhZ2VQcm94eSgqdGhpcyk7CisKKyAgICAvLyBJZiB3ZSBhcmUgcmVhdHRhY2hpbmcgdG8gYSBT dXNwZW5kZWRQYWdlLCB0aGVuIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdlIGFscmVhZHkgZXhpc3Rz IGFuZAorICAgIC8vIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKCkgd2lsbCBub3Qg YmUgY2FsbGVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUuIEluIHN1Y2gKKyAgICAvLyBjYXNl LCB3ZSBuZWVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUgdG8gcmVmbGVjdCB0aGUgZmFjdCB0 aGUgdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UKKyAgICAvLyBhbHJlYWR5IGV4aXN0cyBhbmQgYWxy ZWFkeSBoYXMgYSBtYWluIGZyYW1lLgorICAgIGlmIChzdXNwZW5kZWRQYWdlKSB7CisgICAgICAg IEFTU0VSVCgmc3VzcGVuZGVkUGFnZS0+cHJvY2VzcygpID09IG1fcHJvY2Vzcy5wdHIoKSk7Cisg ICAgICAgIHN1c3BlbmRlZFBhZ2UtPnVuc3VzcGVuZCgpOworICAgICAgICBtX21haW5GcmFtZSA9 IFdlYkZyYW1lUHJveHk6OmNyZWF0ZShtX3BhZ2UsIHN1c3BlbmRlZFBhZ2UtPm1haW5GcmFtZUlE KCkpOworICAgICAgICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChzdXNwZW5kZWRQYWdlLT5tYWlu RnJhbWVJRCgpLCAqbV9tYWluRnJhbWUpOworICAgIH0KKworICAgIGluaXRpYWxpemVXZWJQYWdl KCk7Cit9CisKK1Byb3Zpc2lvbmFsUGFnZVByb3h5Ojp+UHJvdmlzaW9uYWxQYWdlUHJveHkoKQor eworICAgIG1fcHJvY2Vzcy0+cmVtb3ZlUHJvdmlzaW9uYWxQYWdlUHJveHkoKnRoaXMpOworCisg ICAgaWYgKG1fd2FzQ29tbWl0dGVkKQorICAgICAgICByZXR1cm47CisKKyAgICBtX3Byb2Nlc3Mt PnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVj ZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlOjpDbG9zZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAgUnVuTG9vcDo6 bWFpbigpLmRpc3BhdGNoKFtwcm9jZXNzID0gbV9wcm9jZXNzLmNvcHlSZWYoKV0geworICAgICAg ICBwcm9jZXNzLT5tYXliZVNodXREb3duKCk7CisgICAgfSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9u YWxQYWdlUHJveHk6OnByb2Nlc3NEaWRUZXJtaW5hdGUoKQoreworICAgIFJFTEVBU0VfTE9HX0VS Uk9SX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAicHJvY2Vzc0RpZFRlcm1pbmF0ZTogcGFn ZUlEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCkpOworICAgIG1fcGFnZS5wcm92aXNpb25h bFByb2Nlc3NEaWRUZXJtaW5hdGUoKTsKK30KKworc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVh UHJveHk+IFByb3Zpc2lvbmFsUGFnZVByb3h5Ojp0YWtlRHJhd2luZ0FyZWEoKQoreworICAgIHJl dHVybiBXVEZNb3ZlKG1fZHJhd2luZ0FyZWEpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVBy b3h5OjpjYW5jZWwoKQoreworICAgIC8vIElmIHRoZSBwcm92aXNpb25hbCBsb2FkIHN0YXJ0ZWQs IHRoZW4gaW5kaWNhdGUgdGhhdCBpdCBmYWlsZWQgZHVlIHRvIGNhbmNlbGxhdGlvbiBieSBjYWxs aW5nIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSgpLgorICAgIGlmIChtX3Byb3Zpc2lv bmFsTG9hZFVSTC5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKworICAgIFJFTEVBU0VfTE9H X0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiY2FuY2VsOiBTaW11bGF0aW5nIGEgZGlkRmFp bFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lIGZvciBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5w YWdlSUQoKSk7CisgICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKKyAgICBhdXRvIGVycm9yID0gV2Vi S2l0OjpjYW5jZWxsZWRFcnJvcihtX3JlcXVlc3QpOworICAgIGVycm9yLnNldFR5cGUoV2ViQ29y ZTo6UmVzb3VyY2VFcnJvcjo6VHlwZTo6Q2FuY2VsbGF0aW9uKTsKKyAgICBkaWRGYWlsUHJvdmlz aW9uYWxMb2FkRm9yRnJhbWUobV9tYWluRnJhbWUtPmZyYW1lSUQoKSwgeyB9LCBtX25hdmlnYXRp b25JRCwgbV9wcm92aXNpb25hbExvYWRVUkwsIGVycm9yLCBVc2VyRGF0YSB7IH0pOyAvLyBXaWxs IGRlbGV0ZSB8dGhpc3wuCit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OnByb2Nlc3NE aWRGaW5pc2hMYXVuY2hpbmcoKQoreworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vz c1N3YXBwaW5nLCAicHJvY2Vzc0RpZEZpbmlzaExhdW5jaGluZzogcGFnZUlEID0gJSIgUFJJdTY0 LCBtX3BhZ2UucGFnZUlEKCkpOworICAgIGZpbmlzaEluaXRpYWxpemluZ1dlYlBhZ2VBZnRlclBy b2Nlc3NMYXVuY2goKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZmluaXNoSW5p dGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCgpCit7CisgICAgQVNTRVJUKG1fcHJv Y2Vzcy0+c3RhdGUoKSA9PSBXZWJQcm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKTsKKworICAg IC8vIEZJWE1FOiBUaGUgV2ViUGFnZVByb3h5IGRlbGF5cyBhZGRpbmcgdGhlIHZpc2l0ZWQgbGlu ayBzdG9yZSB1bnRpbCBhZnRlciB0aGUgcHJvY2VzcyBoYXMgbGF1bmNoZWQKKyAgICAvLyBzbyB0 aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkgZG9lcyB0aGUgc2FtZS4gSG93ZXZlciwgZG8gd2UgcmVh bGx5IG5lZWQgdG8/CisgICAgbV9wcm9jZXNzLT5hZGRWaXNpdGVkTGlua1N0b3JlKG1fcGFnZS52 aXNpdGVkTGlua1N0b3JlKCkpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojppbml0 aWFsaXplV2ViUGFnZSgpCit7CisgICAgbV9kcmF3aW5nQXJlYSA9IG1fcGFnZS5wYWdlQ2xpZW50 KCkuY3JlYXRlRHJhd2luZ0FyZWFQcm94eShtX3Byb2Nlc3MpOworCisgICAgYXV0byBwYXJhbWV0 ZXJzID0gbV9wYWdlLmNyZWF0aW9uUGFyYW1ldGVycyhtX3Byb2Nlc3MpOworICAgIHBhcmFtZXRl cnMuaXNQcm9jZXNzU3dhcCA9IHRydWU7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQcm9jZXNzOjpDcmVhdGVXZWJQYWdlKG1fcGFnZS5wYWdlSUQoKSwgcGFyYW1ldGVycyksIDAp OworCisgICAgaWYgKG1fcHJvY2Vzcy0+c3RhdGUoKSA9PSBXZWJQcm9jZXNzUHJveHk6OlN0YXRl OjpSdW5uaW5nKQorICAgICAgICBmaW5pc2hJbml0aWFsaXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNz TGF1bmNoKCk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmxvYWREYXRhKEFQSTo6 TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBkYXRhLCBj b25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJp bmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0aW9uYWw8V2Vic2l0ZVBvbGlj aWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RChQcm9jZXNzU3dhcHBpbmcsICJsb2FkRGF0YTogcGFnZUlEID0gJSIgUFJJdTY0LCBtX3BhZ2Uu cGFnZUlEKCkpOworCisgICAgbV9wYWdlLmxvYWREYXRhV2l0aE5hdmlnYXRpb25TaGFyZWQobV9w cm9jZXNzLCBuYXZpZ2F0aW9uLCBkYXRhLCBNSU1FVHlwZSwgZW5jb2RpbmcsIGJhc2VVUkwsIHVz ZXJEYXRhLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92 ZSh3ZWJzaXRlUG9saWNpZXMpKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6bG9h ZFJlcXVlc3QoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBXZWJDb3JlOjpSZXNvdXJjZVJl cXVlc3QmJiByZXF1ZXN0LCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5IHNo b3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0aW9u YWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit7CisgICAgUkVMRUFT RV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJsb2FkUmVxdWVzdDogcGFnZUlEID0g JSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAgbV9wYWdlLmxvYWRSZXF1ZXN0V2l0 aE5hdmlnYXRpb25TaGFyZWQobV9wcm9jZXNzLCBuYXZpZ2F0aW9uLCBXVEZNb3ZlKHJlcXVlc3Qp LCBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxk VHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Cit9 CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0oQVBJOjpO YXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtJiBpdGVtLCBPcHRp b25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBSRUxF QVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImdvVG9CYWNrRm9yd2FyZEl0ZW06 IHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wYWdlLnBhZ2VJRCgpKTsKKworICAgIGF1dG8gaXRlbVN0 YXRlcyA9IG1fcGFnZS5iYWNrRm9yd2FyZExpc3QoKS5maWx0ZXJlZEl0ZW1TdGF0ZXMoW3RoaXMs IHRhcmdldEl0ZW0gPSAmaXRlbV0oYXV0byYgaXRlbSkgeworICAgICAgICBpZiAoYXV0byogcGFn ZSA9IGl0ZW0uc3VzcGVuZGVkUGFnZSgpKSB7CisgICAgICAgICAgICBpZiAoJnBhZ2UtPnByb2Nl c3MoKSA9PSBtX3Byb2Nlc3MucHRyKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgICAgICB9CisgICAgICAgIHJldHVybiAmaXRlbSAhPSB0YXJnZXRJdGVtOworICAgIH0pOwor ICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6VXBkYXRlQmFja0ZvcndhcmRM aXN0Rm9yUmVhdHRhY2goV1RGTW92ZShpdGVtU3RhdGVzKSksIG1fcGFnZS5wYWdlSUQoKSk7Cisg ICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVt KG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIGl0ZW0uaXRlbUlEKCksICpuYXZpZ2F0aW9uLmJh Y2tGb3J3YXJkRnJhbWVMb2FkVHlwZSgpLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWlu Z0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKSwgbV9wYWdlLnBhZ2VJRCgpKTsK KyAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS5zdGFydCgpOworfQorCit2b2lk IFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUodWludDY0X3QgZnJhbWVJ RCkKK3sKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZENy ZWF0ZU1haW5GcmFtZTogcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQs IG1fcGFnZS5wYWdlSUQoKSwgZnJhbWVJRCk7CisgICAgQVNTRVJUKCFtX21haW5GcmFtZSk7CisK KyAgICBtX21haW5GcmFtZSA9IFdlYkZyYW1lUHJveHk6OmNyZWF0ZShtX3BhZ2UsIGZyYW1lSUQp OworCisgICAgLy8gQWRkIHRoZSBmcmFtZSB0byB0aGUgcHJvY2VzcyB3aWRlIG1hcC4KKyAgICBt X3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChmcmFtZUlELCAqbV9tYWluRnJhbWUpOworCisgICAgLy8g VGhpcyBuYXZpZ2F0aW9uIHdhcyBkZXN0cm95ZWQgc28gbm8gbmVlZCB0byBub3RpZnkgb2YgcmVk aXJlY3QuCisgICAgaWYgKCFtX3BhZ2UubmF2aWdhdGlvblN0YXRlKCkuaGFzTmF2aWdhdGlvbiht X25hdmlnYXRpb25JRCkpCisgICAgICAgIHJldHVybjsKKworICAgIC8vIFJlc3RvcmUgdGhlIG1h aW4gZnJhbWUncyBjb21taXR0ZWQgVVJMIGFzIHNvbWUgY2xpZW50cyBtYXkgcmVseSBvbiBpdCB1 bnRpbCB0aGUgbmV4dCBsb2FkIGlzIGNvbW1pdHRlZC4KKyAgICBpZiAoYXV0byogbWFpbkZyYW1l ID0gbV9wYWdlLm1haW5GcmFtZSgpKQorICAgICAgICBtX21haW5GcmFtZS0+ZnJhbWVMb2FkU3Rh dGUoKS5zZXRVUkwobWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLnVybCgpKTsKKworICAgIC8v IE5vcm1hbGx5LCBub3RpZmljYXRpb24gb2YgYSBzZXJ2ZXIgcmVkaXJlY3QgY29tZXMgZnJvbSB0 aGUgV2ViQ29udGVudCBwcm9jZXNzLgorICAgIC8vIElmIHdlIGFyZSBwcm9jZXNzIHN3YXBwaW5n IGluIHJlc3BvbnNlIHRvIGEgc2VydmVyIHJlZGlyZWN0IHRoZW4gdGhhdCBub3RpZmljYXRpb24g d2lsbCBub3QgY29tZSBmcm9tIHRoZSBuZXcgV2ViQ29udGVudCBwcm9jZXNzLgorICAgIC8vIElu IHRoaXMgY2FzZSB3ZSBoYXZlIHRoZSBVSVByb2Nlc3Mgc3ludGhlc2l6ZSB0aGUgcmVkaXJlY3Qg bm90aWZpY2F0aW9uIGF0IHRoZSBhcHByb3ByaWF0ZSB0aW1lLgorICAgIGlmIChtX2lzU2VydmVy UmVkaXJlY3QpIHsKKyAgICAgICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkuZGlkU3Rh cnRQcm92aXNpb25hbExvYWQobV9yZXF1ZXN0LnVybCgpKTsKKyAgICAgICAgbV9wYWdlLmRpZFJl Y2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKG1fcHJv Y2VzcywgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSwgbV9uYXZpZ2F0aW9uSUQsIFdURk1vdmUobV9y ZXF1ZXN0KSwgeyB9KTsKKyAgICB9Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRp ZFBlcmZvcm1DbGllbnRSZWRpcmVjdChjb25zdCBTdHJpbmcmIHNvdXJjZVVSTFN0cmluZywgY29u c3QgU3RyaW5nJiBkZXN0aW5hdGlvblVSTFN0cmluZywgdWludDY0X3QgZnJhbWVJRCkKK3sKKyAg ICBtX3BhZ2UuZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0U2hhcmVkKG1fcHJvY2Vzcywgc291cmNl VVJMU3RyaW5nLCBkZXN0aW5hdGlvblVSTFN0cmluZywgZnJhbWVJRCk7Cit9CisKK3ZvaWQgUHJv dmlzaW9uYWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0 X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiB1cmwsIFVSTCYmIHVucmVh Y2hhYmxlVVJMLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCit7CisgICAgLy8gSWYgdGhlIHBy ZXZpb3VzIHByb3Zpc2lvbmFsIGxvYWQgdXNlZCB0aGUgc2FtZSBwcm9jZXNzLCB3ZSBtYXkgcmVj ZWl2ZSBJUEMgZm9yIHRoaXMgcHJldmlvdXMgcHJvdmlzaW9uYWwncyBtYWluIGZyYW1lIHRoYXQg d2UgbmVlZCB0byBpZ25vcmUuCisgICAgaWYgKCFtX21haW5GcmFtZSB8fCBtX21haW5GcmFtZS0+ ZnJhbWVJRCgpICE9IGZyYW1lSUQpCisgICAgICAgIHJldHVybjsKKworICAgIFJFTEVBU0VfTE9H X0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JG cmFtZTogcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgbmF2aWdh dGlvbklEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQsIG5hdmlnYXRpb25J RCk7CisgICAgQVNTRVJUKG1fcHJvdmlzaW9uYWxMb2FkVVJMLmlzTnVsbCgpKTsKKyAgICBtX3By b3Zpc2lvbmFsTG9hZFVSTCA9IHVybDsKKworICAgIC8vIE1lcmVseSBmb2xsb3dpbmcgYSBzZXJ2 ZXIgc2lkZSByZWRpcmVjdCBzbyB0aGVyZSBpcyBubyBuZWVkIHRvIHNlbmQgYSBkaWRTdGFydFBy b3Zpc2lvbmFsTG9hZCBhZ2Fpbi4KKyAgICBpZiAobV9pc1NlcnZlclJlZGlyZWN0KQorICAgICAg ICByZXR1cm47CisKKyAgICAvLyBDbGllbnRzIGV4cGVjdCB0aGUgUGFnZSdzIG1haW4gZnJhbWUn cyBleHBlY3RlZFVSTCB0byBiZSB0aGUgcHJvdmlzaW9uYWwgb25lIHdoZW4gYSBwcm92aXNpb25h bCBsb2FkIGlzIHN0YXJ0ZWQuCisgICAgaWYgKGF1dG8qIHBhZ2VNYWluRnJhbWUgPSBtX3BhZ2Uu bWFpbkZyYW1lKCkpCisgICAgICAgIHBhZ2VNYWluRnJhbWUtPmRpZFN0YXJ0UHJvdmlzaW9uYWxM b2FkKHVybCk7CisKKyAgICBtX3BhZ2UuZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZVNo YXJlZChtX3Byb2Nlc3MsIGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgV1RGTW92ZSh1cmwpLCBXVEZN b3ZlKHVucmVhY2hhYmxlVVJMKSwgdXNlckRhdGEpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFn ZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwg Y29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1 aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0 IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImIGVycm9yLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEp Cit7CisgICAgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJk aWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFt ZUlEID0gJSIgUFJJdTY0ICIsIG5hdmlnYXRpb25JRCA9ICUiIFBSSXU2NCwgbV9wYWdlLnBhZ2VJ RCgpLCBmcmFtZUlELCBuYXZpZ2F0aW9uSUQpOworICAgIG1fcHJvdmlzaW9uYWxMb2FkVVJMID0g eyB9OworCisgICAgLy8gTWFrZSBzdXJlIHRoZSBQYWdlJ3MgbWFpbiBmcmFtZSdzIGV4cGVjdGVk VVJMIGdldHMgY2xlYXJlZCBzaW5jZSB3ZSB1cGRhdGVkIGl0IGluIGRpZFN0YXJ0UHJvdmlzaW9u YWxMb2FkLgorICAgIGlmIChhdXRvKiBwYWdlTWFpbkZyYW1lID0gbV9wYWdlLm1haW5GcmFtZSgp KQorICAgICAgICBwYWdlTWFpbkZyYW1lLT5kaWRGYWlsUHJvdmlzaW9uYWxMb2FkKCk7CisKKyAg ICBtX3BhZ2UuZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKG1fcHJvY2Vzcywg ZnJhbWVJRCwgZnJhbWVTZWN1cml0eU9yaWdpbiwgbmF2aWdhdGlvbklELCBwcm92aXNpb25hbFVS TCwgZXJyb3IsIHVzZXJEYXRhKTsgLy8gV2lsbCBkZWxldGUgfHRoaXN8LgorfQorCit2b2lkIFBy b3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJ RCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZy YW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25z dCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5mbywgYm9vbCBjb250YWlu c1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZv cmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAg IC8vIElmIHRoZSBwcmV2aW91cyBwcm92aXNpb25hbCBsb2FkIHVzZWQgdGhlIHNhbWUgcHJvY2Vz cywgd2UgbWF5IHJlY2VpdmUgSVBDIGZvciB0aGlzIHByZXZpb3VzIHByb3Zpc2lvbmFsJ3MgbWFp biBmcmFtZSB0aGF0IHdlIG5lZWQgdG8gaWdub3JlLgorICAgIGlmICghbV9tYWluRnJhbWUgfHwg bV9tYWluRnJhbWUtPmZyYW1lSUQoKSAhPSBmcmFtZUlEKQorICAgICAgICByZXR1cm47CisKKyAg ICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZENvbW1pdExvYWRG b3JGcmFtZTogcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgbmF2 aWdhdGlvbklEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQsIG5hdmlnYXRp b25JRCk7CisgICAgbV9wcm92aXNpb25hbExvYWRVUkwgPSB7IH07CisgICAgbV9wcm9jZXNzLT5y ZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2Vp dmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAgbV93YXNDb21taXR0ZWQgPSB0cnVl OworICAgIG1fcGFnZS5jb21taXRQcm92aXNpb25hbFBhZ2UoZnJhbWVJRCwgbmF2aWdhdGlvbklE LCBtaW1lVHlwZSwgZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIGZyYW1lTG9hZFR5cGUs IGNlcnRpZmljYXRlSW5mbywgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgZm9yY2VkSGFzSW5zZWN1 cmVDb250ZW50LCB1c2VyRGF0YSk7IC8vIFdpbGwgZGVsZXRlIHx0aGlzfC4KK30KKwordm9pZCBQ cm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGEoY29uc3Qg V2ViTmF2aWdhdGlvbkRhdGFTdG9yZSYgc3RvcmUsIHVpbnQ2NF90IGZyYW1lSUQpCit7CisgICAg bV9wYWdlLmRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhU2hhcmVkKG1fcHJvY2Vzcywgc3Rv cmUsIGZyYW1lSUQpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDaGFuZ2VQ cm92aXNpb25hbFVSTEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRp b25JRCwgVVJMJiYgdXJsKQoreworICAgIG1fcGFnZS5kaWRDaGFuZ2VQcm92aXNpb25hbFVSTEZv ckZyYW1lU2hhcmVkKG1fcHJvY2VzcywgZnJhbWVJRCwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKHVy bCkpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uQXN5bmModWludDY0X3QgZnJhbWVJRCwgV2ViQ29yZTo6U2VjdXJpdHlPcmln aW5EYXRhJiYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBOYXZp Z2F0aW9uQWN0aW9uRGF0YSYmIG5hdmlnYXRpb25BY3Rpb25EYXRhLCBGcmFtZUluZm9EYXRhJiYg ZnJhbWVJbmZvRGF0YSwgdWludDY0X3Qgb3JpZ2luYXRpbmdQYWdlSUQsIGNvbnN0IFdlYkNvcmU6 OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0LCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QmJiByZXF1ZXN0LCBJUEM6OkZvcm1EYXRhUmVmZXJlbmNlJiYgcmVxdWVzdEJvZHksIFdlYkNv cmU6OlJlc291cmNlUmVzcG9uc2UmJiByZWRpcmVjdFJlc3BvbnNlLCBjb25zdCBVc2VyRGF0YSYg dXNlckRhdGEsIHVpbnQ2NF90IGxpc3RlbmVySUQpCit7CisgICAgbV9wYWdlLmRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb25Bc3luY1NoYXJlZChtX3Byb2Nlc3MsIGZyYW1lSUQsIFdURk1v dmUoZnJhbWVTZWN1cml0eU9yaWdpbiksIG5hdmlnYXRpb25JRCwgV1RGTW92ZShuYXZpZ2F0aW9u QWN0aW9uRGF0YSksIFdURk1vdmUoZnJhbWVJbmZvRGF0YSksIG9yaWdpbmF0aW5nUGFnZUlELCBv cmlnaW5hbFJlcXVlc3QsIFdURk1vdmUocmVxdWVzdCksIFdURk1vdmUocmVxdWVzdEJvZHkpLCBX VEZNb3ZlKHJlZGlyZWN0UmVzcG9uc2UpLCB1c2VyRGF0YSwgbGlzdGVuZXJJRCk7Cit9CisKK3Zv aWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlKHVpbnQ2NF90 IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0 eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJl c3BvbnNlJiByZXNwb25zZSwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0 LCBib29sIGNhblNob3dNSU1FVHlwZSwgdWludDY0X3QgbGlzdGVuZXJJRCwgY29uc3QgVXNlckRh dGEmIHVzZXJEYXRhKQoreworICAgIG1fcGFnZS5kZWNpZGVQb2xpY3lGb3JSZXNwb25zZVNoYXJl ZChtX3Byb2Nlc3MsIGZyYW1lSUQsIGZyYW1lU2VjdXJpdHlPcmlnaW4sIG5hdmlnYXRpb25JRCwg cmVzcG9uc2UsIHJlcXVlc3QsIGNhblNob3dNSU1FVHlwZSwgbGlzdGVuZXJJRCwgdXNlckRhdGEp OworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpzdGFydFVSTFNjaGVtZVRhc2soVVJM U2NoZW1lVGFza1BhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQoreworICAgIG1fcGFnZS5zdGFydFVS TFNjaGVtZVRhc2tTaGFyZWQobV9wcm9jZXNzLCBXVEZNb3ZlKHBhcmFtZXRlcnMpKTsKK30KKwor dm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6YmFja0ZvcndhcmRHb1RvSXRlbShjb25zdCBXZWJD b3JlOjpCYWNrRm9yd2FyZEl0ZW1JZGVudGlmaWVyJiBpZGVudGlmaWVyLCBTYW5kYm94RXh0ZW5z aW9uOjpIYW5kbGUmIGhhbmRsZSkKK3sKKyAgICBtX3BhZ2UuYmFja0ZvcndhcmRHb1RvSXRlbVNo YXJlZChtX3Byb2Nlc3MsIGlkZW50aWZpZXIsIGhhbmRsZSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9u YWxQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlv biwgSVBDOjpEZWNvZGVyJiBkZWNvZGVyKQoreworICAgIEFTU0VSVChkZWNvZGVyLm1lc3NhZ2VS ZWNlaXZlck5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJO YW1lKCkpOworCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjpEaWRTdGFydFByb2dyZXNzOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5t ZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENoYW5nZVByb2dyZXNz OjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OkJhY2tGb3J3YXJkQWRkSXRlbTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29k ZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpMb2dEaWFnbm9zdGlj TWVzc2FnZTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpMb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhFbmhhbmNlZFByaXZh Y3k6Om5hbWUoKQorICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6U2V0TmV0d29ya1JlcXVlc3RzSW5Qcm9ncmVzczo6bmFtZSgpCisjaWYg UExBVEZPUk0oQ09DT0EpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpSZWdpc3RlcldlYlByb2Nlc3NBY2Nlc3NpYmlsaXR5VG9rZW46 Om5hbWUoKQorI2VuZGlmCisgICAgICAgICkKKyAgICB7CisgICAgICAgIG1fcGFnZS5kaWRSZWNl aXZlTWVzc2FnZShjb25uZWN0aW9uLCBkZWNvZGVyKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6U3RhcnRVUkxTY2hlbWVUYXNrOjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNz YWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlN0YXJ0VVJMU2NoZW1lVGFzaz4oZGVjb2Rlciwg dGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpzdGFydFVSTFNjaGVtZVRhc2spOworICAgICAg ICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmM6 Om5hbWUoKSkgeworICAgICAgICBJUEM6OmhhbmRsZU1lc3NhZ2U8TWVzc2FnZXM6OldlYlBhZ2VQ cm94eTo6RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jPihkZWNvZGVyLCB0aGlz LCAmUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25B c3luYyk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdl TmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRlY2lkZVBvbGljeUZvclJlc3BvbnNl OjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OkRlY2lkZVBvbGljeUZvclJlc3BvbnNlPihkZWNvZGVyLCB0aGlzLCAmUHJvdmlzaW9u YWxQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlKTsKKyAgICAgICAgcmV0dXJuOwor ICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6RGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZTo6bmFtZSgpKSB7CisgICAg ICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDaGFuZ2VQ cm92aXNpb25hbFVSTEZvckZyYW1lPihkZWNvZGVyLCB0aGlzLCAmUHJvdmlzaW9uYWxQYWdlUHJv eHk6OmRpZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWUpOworICAgICAgICByZXR1cm47Cisg ICAgfQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjpEaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YTo6bmFtZSgpKSB7CisgICAgICAg IElQQzo6aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWROYXZpZ2F0ZVdp dGhOYXZpZ2F0aW9uRGF0YT4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5Ojpk aWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisK KyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 OkRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdDo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxl TWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3Q+ KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkUGVyZm9ybUNsaWVudFJl ZGlyZWN0KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3Nh Z2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ3JlYXRlTWFpbkZyYW1lOjpu YW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6OkRpZENyZWF0ZU1haW5GcmFtZT4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVBy b3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAg aWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRT dGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5k bGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFN0YXJ0UHJvdmlzaW9uYWxMb2Fk Rm9yRnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkU3RhcnRQ cm92aXNpb25hbExvYWRGb3JGcmFtZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBp ZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZEZh aWxQcm92aXNpb25hbExvYWRGb3JGcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxl TWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWU+KGRlY29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zp c2lvbmFsTG9hZEZvckZyYW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ29tbWl0 TG9hZEZvckZyYW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3Nh Z2VzOjpXZWJQYWdlUHJveHk6OkRpZENvbW1pdExvYWRGb3JGcmFtZT4oZGVjb2RlciwgdGhpcywg JlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUpOworICAgICAgICBy ZXR1cm47CisgICAgfQorCisgICAgTE9HKFByb2Nlc3NTd2FwcGluZywgIlVuaGFuZGxlZCBtZXNz YWdlICVzOjolcyBmcm9tIHByb3Zpc2lvbmFsIHByb2Nlc3MiLCBkZWNvZGVyLm1lc3NhZ2VSZWNl aXZlck5hbWUoKS50b1N0cmluZygpLmRhdGEoKSwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpLnRvU3Ry aW5nKCkuZGF0YSgpKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkUmVjZWl2 ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgSVBDOjpEZWNvZGVyJiBk ZWNvZGVyLCBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVyPiYgcmVwbHlFbmNvZGVyKQorewor ICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6 QmFja0ZvcndhcmRHb1RvSXRlbTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2Fn ZUxlZ2FjeVN5bmM8TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6QmFja0ZvcndhcmRHb1RvSXRlbT4o ZGVjb2RlciwgKnJlcGx5RW5jb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpiYWNr Rm9yd2FyZEdvVG9JdGVtKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIG1fcGFnZS5k aWRSZWNlaXZlU3luY01lc3NhZ2UoY29ubmVjdGlvbiwgZGVjb2RlciwgcmVwbHlFbmNvZGVyKTsK K30KKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv UHJvdmlzaW9uYWxQYWdlUHJveHkuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMC4uZGQxNTE5ZTA1YTMKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oCkBAIC0wLDAgKzEsMTAzIEBACisvKgorICogQ29w eXJpZ2h0IChDKSAyMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9u cyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBu b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt ZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2Ug dGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlv biBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4K KyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBD T05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJS QU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdB UlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIK KyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4g T1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVD VCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBE QU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAq IFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9G SVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04g QU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1Qg TElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisg KiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZF TiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8K KworI3ByYWdtYSBvbmNlCisKKyNpbmNsdWRlICJNZXNzYWdlUmVjZWl2ZXIuaCIKKyNpbmNsdWRl IDx3dGYvV2Vha1B0ci5oPgorCituYW1lc3BhY2UgV2ViQ29yZSB7CitjbGFzcyBSZXNvdXJjZVJl cXVlc3Q7Cit9CisKK25hbWVzcGFjZSBXZWJLaXQgeworCitjbGFzcyBEcmF3aW5nQXJlYVByb3h5 OworY2xhc3MgU3VzcGVuZGVkUGFnZVByb3h5OworY2xhc3MgV2ViRnJhbWVQcm94eTsKK3N0cnVj dCBXZWJOYXZpZ2F0aW9uRGF0YVN0b3JlOworY2xhc3MgV2ViUGFnZVByb3h5OworY2xhc3MgV2Vi UHJvY2Vzc1Byb3h5OworCitjbGFzcyBQcm92aXNpb25hbFBhZ2VQcm94eSA6IHB1YmxpYyBJUEM6 Ok1lc3NhZ2VSZWNlaXZlciwgcHVibGljIENhbk1ha2VXZWFrUHRyPFByb3Zpc2lvbmFsUGFnZVBy b3h5PiB7CisgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CitwdWJsaWM6CisgICAgUHJvdmlz aW9uYWxQYWdlUHJveHkoV2ViUGFnZVByb3h5JiwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiwgc3Rk Ojp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwg Ym9vbCBpc1NlcnZlclJlZGlyZWN0LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBQ cm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KTsKKyAgICB+UHJvdmlzaW9uYWxQYWdlUHJveHko KTsKKworICAgIFdlYlBhZ2VQcm94eSYgcGFnZSgpIHsgcmV0dXJuIG1fcGFnZTsgfQorICAgIFdl YkZyYW1lUHJveHkqIG1haW5GcmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fbWFpbkZyYW1lLmdldCgp OyB9CisgICAgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKCkgeyByZXR1cm4gbV9wcm9jZXNzLmdl dCgpOyB9CisgICAgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVl c3RlZEJ5Q2xpZW50KCkgY29uc3QgeyByZXR1cm4gbV9wcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xp ZW50OyB9CisgICAgdWludDY0X3QgbmF2aWdhdGlvbklEKCkgY29uc3QgeyByZXR1cm4gbV9uYXZp Z2F0aW9uSUQ7IH0KKworICAgIERyYXdpbmdBcmVhUHJveHkqIGRyYXdpbmdBcmVhKCkgY29uc3Qg eyByZXR1cm4gbV9kcmF3aW5nQXJlYS5nZXQoKTsgfQorICAgIHN0ZDo6dW5pcXVlX3B0cjxEcmF3 aW5nQXJlYVByb3h5PiB0YWtlRHJhd2luZ0FyZWEoKTsKKworICAgIHZvaWQgbG9hZERhdGEoQVBJ OjpOYXZpZ2F0aW9uJiwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiwgY29uc3QgU3RyaW5nJiBN SU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBB UEk6Ok9iamVjdCogdXNlckRhdGEsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBX VEY6Om51bGxvcHQpOworICAgIHZvaWQgbG9hZFJlcXVlc3QoQVBJOjpOYXZpZ2F0aW9uJiwgV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQ b2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0 YT4mJiA9IFdURjo6bnVsbG9wdCk7CisgICAgdm9pZCBnb1RvQmFja0ZvcndhcmRJdGVtKEFQSTo6 TmF2aWdhdGlvbiYsIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mLCBPcHRpb25hbDxXZWJzaXRlUG9s aWNpZXNEYXRhPiYmKTsKKyAgICB2b2lkIGNhbmNlbCgpOworCisgICAgdm9pZCBwcm9jZXNzRGlk RmluaXNoTGF1bmNoaW5nKCk7CisgICAgdm9pZCBwcm9jZXNzRGlkVGVybWluYXRlKCk7CisKK3By aXZhdGU6CisgICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKKyAgICB2b2lkIGRpZFJlY2VpdmVN ZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIGZpbmFsOworICAgIHZvaWQg ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYsIHN0 ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+JikgZmluYWw7CisKKyAgICB2b2lkIGRlY2lkZVBv bGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYyh1aW50NjRfdCBmcmFtZUlELCBXZWJDb3JlOjpT ZWN1cml0eU9yaWdpbkRhdGEmJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0 aW9uSUQsIE5hdmlnYXRpb25BY3Rpb25EYXRhJiYsIEZyYW1lSW5mb0RhdGEmJiwgdWludDY0X3Qg b3JpZ2luYXRpbmdQYWdlSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2lu YWxSZXF1ZXN0LCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgSVBDOjpGb3JtRGF0YVJlZmVy ZW5jZSYmIHJlcXVlc3RCb2R5LCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYgcmVkaXJlY3RS ZXNwb25zZSwgY29uc3QgVXNlckRhdGEmLCB1aW50NjRfdCBsaXN0ZW5lcklEKTsKKyAgICB2b2lk IGRlY2lkZVBvbGljeUZvclJlc3BvbnNlKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6 OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdh dGlvbklELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiwgY29uc3QgV2ViQ29yZTo6 UmVzb3VyY2VSZXF1ZXN0JiwgYm9vbCBjYW5TaG93TUlNRVR5cGUsIHVpbnQ2NF90IGxpc3RlbmVy SUQsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRDaGFuZ2VQcm92aXNpb25hbFVSTEZv ckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYpOwor ICAgIHZvaWQgZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGEoY29uc3QgV2ViTmF2aWdhdGlv bkRhdGFTdG9yZSYsIHVpbnQ2NF90IGZyYW1lSUQpOworICAgIHZvaWQgZGlkUGVyZm9ybUNsaWVu dFJlZGlyZWN0KGNvbnN0IFN0cmluZyYgc291cmNlVVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIGRl c3RpbmF0aW9uVVJMU3RyaW5nLCB1aW50NjRfdCBmcmFtZUlEKTsKKyAgICB2b2lkIGRpZENyZWF0 ZU1haW5GcmFtZSh1aW50NjRfdCBmcmFtZUlEKTsKKyAgICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9u YWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBV UkwmJiwgVVJMJiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBk aWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlv bklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFBy b3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0 ZUluZm8mLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhh c0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0 YSYpOworICAgIHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZy YW1lSUQsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9y aWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJM LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2 b2lkIHN0YXJ0VVJMU2NoZW1lVGFzayhVUkxTY2hlbWVUYXNrUGFyYW1ldGVycyYmKTsKKyAgICB2 b2lkIGJhY2tGb3J3YXJkR29Ub0l0ZW0oY29uc3QgV2ViQ29yZTo6QmFja0ZvcndhcmRJdGVtSWRl bnRpZmllciYsIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYpOworCisgICAgdm9pZCBpbml0aWFs aXplV2ViUGFnZSgpOworICAgIHZvaWQgZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJv Y2Vzc0xhdW5jaCgpOworCisgICAgV2ViUGFnZVByb3h5JiBtX3BhZ2U7CisgICAgUmVmPFdlYlBy b2Nlc3NQcm94eT4gbV9wcm9jZXNzOworICAgIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVBy b3h5PiBtX2RyYXdpbmdBcmVhOworICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5PiBtX21haW5GcmFt ZTsKKyAgICB1aW50NjRfdCBtX25hdmlnYXRpb25JRDsKKyAgICBib29sIG1faXNTZXJ2ZXJSZWRp cmVjdDsKKyAgICBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QgbV9yZXF1ZXN0OworICAgIFByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgbV9wcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50Owor ICAgIGJvb2wgbV93YXNDb21taXR0ZWQgeyBmYWxzZSB9OworICAgIFVSTCBtX3Byb3Zpc2lvbmFs TG9hZFVSTDsKKworI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgUHJvY2Vzc1Rocm90dGxl cjo6Rm9yZWdyb3VuZEFjdGl2aXR5VG9rZW4gbV9zdXNwZW5zaW9uVG9rZW47CisjZW5kaWYKK307 CisKK30gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHkuaCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllclRyZWVE cmF3aW5nQXJlYVByb3h5LmgKaW5kZXggMzJmMjg4NjRmY2EuLmY5NGFkM2Y4NmE3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJU cmVlRHJhd2luZ0FyZWFQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90 ZUxheWVyVHJlZS9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5LmgKQEAgLTQwLDcgKzQw LDcgQEAgY2xhc3MgUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JUcmFuc2FjdGlvbjsKIAogY2xh c3MgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eSBmaW5hbCA6IHB1YmxpYyBEcmF3aW5n QXJlYVByb3h5IHsKIHB1YmxpYzoKLSAgICBleHBsaWNpdCBSZW1vdGVMYXllclRyZWVEcmF3aW5n QXJlYVByb3h5KFdlYlBhZ2VQcm94eSYpOworICAgIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVh UHJveHkoV2ViUGFnZVByb3h5JiwgV2ViUHJvY2Vzc1Byb3h5Jik7CiAgICAgdmlydHVhbCB+UmVt b3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eSgpOwogCiAgICAgY29uc3QgUmVtb3RlTGF5ZXJU cmVlSG9zdCYgcmVtb3RlTGF5ZXJUcmVlSG9zdCgpIGNvbnN0IHsgcmV0dXJuICptX3JlbW90ZUxh eWVyVHJlZUhvc3Q7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90 ZUxheWVyVHJlZS9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5Lm1tIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVh UHJveHkubW0KaW5kZXggMzU5NDZiYjNkYzcuLmEzODBhNTAzYWU5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2lu Z0FyZWFQcm94eS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRy ZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tbQpAQCAtMTA1LDggKzEwNSw4IEBA IG5hbWVzcGFjZSBXZWJLaXQgewogdXNpbmcgbmFtZXNwYWNlIElQQzsKIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogCi1SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5OjpSZW1vdGVMYXll clRyZWVEcmF3aW5nQXJlYVByb3h5KFdlYlBhZ2VQcm94eSYgd2ViUGFnZVByb3h5KQotICAgIDog RHJhd2luZ0FyZWFQcm94eShEcmF3aW5nQXJlYVR5cGVSZW1vdGVMYXllclRyZWUsIHdlYlBhZ2VQ cm94eSkKK1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6OlJlbW90ZUxheWVyVHJlZURy YXdpbmdBcmVhUHJveHkoV2ViUGFnZVByb3h5JiB3ZWJQYWdlUHJveHksIFdlYlByb2Nlc3NQcm94 eSYgcHJvY2VzcykKKyAgICA6IERyYXdpbmdBcmVhUHJveHkoRHJhd2luZ0FyZWFUeXBlUmVtb3Rl TGF5ZXJUcmVlLCB3ZWJQYWdlUHJveHksIHByb2Nlc3MpCiAgICAgLCBtX3JlbW90ZUxheWVyVHJl ZUhvc3Qoc3RkOjptYWtlX3VuaXF1ZTxSZW1vdGVMYXllclRyZWVIb3N0PigqdGhpcykpCiB7CiAj aWYgSEFWRShJT1NVUkZBQ0UpCkBAIC0xMTUsNyArMTE1LDcgQEAgUmVtb3RlTGF5ZXJUcmVlRHJh d2luZ0FyZWFQcm94eTo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eShXZWJQYWdlUHJv eHkmIHcKICAgICBJT1N1cmZhY2VQb29sOjpzaGFyZWRQb29sKCkuc2V0UG9vbFNpemUoMCk7CiAj ZW5kaWYKIAotICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5hZGRNZXNzYWdlUmVjZWl2ZXIo TWVzc2FnZXM6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6Om1lc3NhZ2VSZWNlaXZl ck5hbWUoKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCksICp0aGlzKTsKKyAgICBwcm9jZXNzLmFk ZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94 eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSwgKnRoaXMp OwogCiAgICAgaWYgKG1fd2ViUGFnZVByb3h5LnByZWZlcmVuY2VzKCkudGlsZWRTY3JvbGxpbmdJ bmRpY2F0b3JWaXNpYmxlKCkpCiAgICAgICAgIGluaXRpYWxpemVEZWJ1Z0luZGljYXRvcigpOwpA QCAtMTI0LDcgKzEyNCw3IEBAIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6OlJlbW90 ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHkoV2ViUGFnZVByb3h5JiB3CiBSZW1vdGVMYXllclRy ZWVEcmF3aW5nQXJlYVByb3h5Ojp+UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eSgpCiB7 CiAgICAgbV9jYWxsYmFja3MuaW52YWxpZGF0ZShDYWxsYmFja0Jhc2U6OkVycm9yOjpPd25lcldh c0ludmFsaWRhdGVkKTsKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkucmVtb3ZlTWVzc2Fn ZVJlY2VpdmVyKE1lc3NhZ2VzOjpSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5OjptZXNz YWdlUmVjZWl2ZXJOYW1lKCksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKKyAgICBwcm9jZXNz KCkucmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpSZW1vdGVMYXllclRyZWVEcmF3aW5n QXJlYVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgp KTsKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgW21fZGlzcGxheUxpbmtIYW5kbGVy IGludmFsaWRhdGVdOwpAQCAtMTYxLDcgKzE2MSw3IEBAIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJh d2luZ0FyZWFQcm94eTo6c2l6ZURpZENoYW5nZSgpCiAKIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJh d2luZ0FyZWFQcm94eTo6ZGV2aWNlU2NhbGVGYWN0b3JEaWRDaGFuZ2UoKQogewotICAgIG1fd2Vi UGFnZVByb3h5LnByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6U2V0RGV2aWNl U2NhbGVGYWN0b3IobV93ZWJQYWdlUHJveHkuZGV2aWNlU2NhbGVGYWN0b3IoKSksIG1fd2ViUGFn ZVByb3h5LnBhZ2VJRCgpKTsKKyAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2luZ0Fy ZWE6OlNldERldmljZVNjYWxlRmFjdG9yKG1fd2ViUGFnZVByb3h5LmRldmljZVNjYWxlRmFjdG9y KCkpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CiB9CiAKIHZvaWQgUmVtb3RlTGF5ZXJUcmVl RHJhd2luZ0FyZWFQcm94eTo6ZGlkVXBkYXRlR2VvbWV0cnkoKQpAQCAtMTc5LDcgKzE3OSw3IEBA IHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6ZGlkVXBkYXRlR2VvbWV0cnko KQogdm9pZCBSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5OjpzZW5kVXBkYXRlR2VvbWV0 cnkoKQogewogICAgIG1fbGFzdFNlbnRTaXplID0gbV9zaXplOwotICAgIG1fd2ViUGFnZVByb3h5 LnByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6VXBkYXRlR2VvbWV0cnkobV9z aXplLCBmYWxzZSAvKiBmbHVzaFN5bmNocm9ub3VzbHkgKi8sIE1hY2hTZW5kUmlnaHQoKSksIG1f d2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKKyAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJh d2luZ0FyZWE6OlVwZGF0ZUdlb21ldHJ5KG1fc2l6ZSwgZmFsc2UgLyogZmx1c2hTeW5jaHJvbm91 c2x5ICovLCBNYWNoU2VuZFJpZ2h0KCkpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CiAgICAg bV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVHZW9tZXRyeSA9IHRydWU7CiB9CiAKQEAgLTI2NCwxMiAr MjY0LDEyIEBAIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6Y29tbWl0TGF5 ZXJUcmVlKGNvbnN0IFJlbW90ZUxheWVyVHJlZVRyYW5zCiAKIHZvaWQgUmVtb3RlTGF5ZXJUcmVl RHJhd2luZ0FyZWFQcm94eTo6YWNjZWxlcmF0ZWRBbmltYXRpb25EaWRTdGFydCh1aW50NjRfdCBs YXllcklELCBjb25zdCBTdHJpbmcmIGtleSwgTW9ub3RvbmljVGltZSBzdGFydFRpbWUpCiB7Ci0g ICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpB Y2NlbGVyYXRlZEFuaW1hdGlvbkRpZFN0YXJ0KGxheWVySUQsIGtleSwgc3RhcnRUaW1lKSwgbV93 ZWJQYWdlUHJveHkucGFnZUlEKCkpOworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3 aW5nQXJlYTo6QWNjZWxlcmF0ZWRBbmltYXRpb25EaWRTdGFydChsYXllcklELCBrZXksIHN0YXJ0 VGltZSksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKIH0KIAogdm9pZCBSZW1vdGVMYXllclRy ZWVEcmF3aW5nQXJlYVByb3h5OjphY2NlbGVyYXRlZEFuaW1hdGlvbkRpZEVuZCh1aW50NjRfdCBs YXllcklELCBjb25zdCBTdHJpbmcmIGtleSkKIHsKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNz KCkuc2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6OkFjY2VsZXJhdGVkQW5pbWF0aW9uRGlkRW5k KGxheWVySUQsIGtleSksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKKyAgICBwcm9jZXNzKCku c2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6OkFjY2VsZXJhdGVkQW5pbWF0aW9uRGlkRW5kKGxh eWVySUQsIGtleSksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKIH0KIAogc3RhdGljIGNvbnN0 IGZsb2F0IGluZGljYXRvckluc2V0ID0gMTA7CkBAIC00MzAsNyArNDMwLDcgQEAgdm9pZCBSZW1v dGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5OjpkaWRSZWZyZXNoRGlzcGxheSgpCiAgICAgLy8g V2FpdGluZyBmb3IgQ0EgdG8gY29tbWl0IGlzIGluc3VmZmljaWVudCwgYmVjYXVzZSB0aGUgcmVu ZGVyIHNlcnZlciBjYW4gc3RpbGwgYmUKICAgICAvLyB1c2luZyBvdXIgYmFja2luZyBzdG9yZS4g V2UgY2FuIGltcHJvdmUgdGhpcyBieSB3YWl0aW5nIGZvciB0aGUgcmVuZGVyIHNlcnZlciB0byBj b21taXQKICAgICAvLyBpZiB3ZSBmaW5kIEFQSSB0byBkbyBzbywgYnV0IGZvciBub3cgd2Ugd2ls bCBtYWtlIGV4dHJhIGJ1ZmZlcnMgaWYgbmVlZCBiZS4KLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9j ZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6OkRpZFVwZGF0ZSgpLCBtX3dlYlBhZ2VQ cm94eS5wYWdlSUQoKSk7CisgICAgcHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVh OjpEaWRVcGRhdGUoKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOwogCiAgICAgbV9sYXN0Vmlz aWJsZVRyYW5zYWN0aW9uSUQgPSBtX3RyYW5zYWN0aW9uSURGb3JQZW5kaW5nQ0FDb21taXQ7CiAK QEAgLTQ1OCw3ICs0NTgsNyBAQCB2b2lkIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6 OndhaXRGb3JEaWRVcGRhdGVBY3Rpdml0eVN0YXRlKEFjdGl2aXR5U3RhdAogICAgIH0oKTsKIAog ICAgIGF1dG8gc3RhcnRUaW1lID0gTW9ub3RvbmljVGltZTo6bm93KCk7Ci0gICAgd2hpbGUgKG1f d2ViUGFnZVByb3h5LnByb2Nlc3MoKS5jb25uZWN0aW9uKCktPndhaXRGb3JBbmREaXNwYXRjaElt bWVkaWF0ZWx5PE1lc3NhZ2VzOjpSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5OjpDb21t aXRMYXllclRyZWU+KG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpLCBhY3Rpdml0eVN0YXRlVXBkYXRl VGltZW91dCAtIChNb25vdG9uaWNUaW1lOjpub3coKSAtIHN0YXJ0VGltZSksIElQQzo6V2FpdEZv ck9wdGlvbjo6SW50ZXJydXB0V2FpdGluZ0lmU3luY01lc3NhZ2VBcnJpdmVzKSkgeworICAgIHdo aWxlIChwcm9jZXNzKCkuY29ubmVjdGlvbigpLT53YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVs eTxNZXNzYWdlczo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6Q29tbWl0TGF5ZXJU cmVlPihtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSwgYWN0aXZpdHlTdGF0ZVVwZGF0ZVRpbWVvdXQg LSAoTW9ub3RvbmljVGltZTo6bm93KCkgLSBzdGFydFRpbWUpLCBJUEM6OldhaXRGb3JPcHRpb246 OkludGVycnVwdFdhaXRpbmdJZlN5bmNNZXNzYWdlQXJyaXZlcykpIHsKICAgICAgICAgaWYgKGFj dGl2aXR5U3RhdGVDaGFuZ2VJRCA9PSBBY3Rpdml0eVN0YXRlQ2hhbmdlQXN5bmNocm9ub3VzIHx8 IGFjdGl2aXR5U3RhdGVDaGFuZ2VJRCA8PSBtX2FjdGl2aXR5U3RhdGVDaGFuZ2VJRCkKICAgICAg ICAgICAgIHJldHVybjsKICAgICB9CkBAIC00NzEsNyArNDcxLDcgQEAgdm9pZCBSZW1vdGVMYXll clRyZWVEcmF3aW5nQXJlYVByb3h5OjpkaXNwYXRjaEFmdGVyRW5zdXJpbmdEcmF3aW5nKFdURjo6 RnVuY3Rpb24KICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIG1fd2ViUGFnZVByb3h5LnBy b2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6QWRkVHJhbnNhY3Rpb25DYWxsYmFj a0lEKG1fY2FsbGJhY2tzLnB1dChXVEZNb3ZlKGNhbGxiYWNrRnVuY3Rpb24pLCBtX3dlYlBhZ2VQ cm94eS5wcm9jZXNzKCkudGhyb3R0bGVyKCkuYmFja2dyb3VuZEFjdGl2aXR5VG9rZW4oKSkpLCBt X3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CisgICAgcHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRy YXdpbmdBcmVhOjpBZGRUcmFuc2FjdGlvbkNhbGxiYWNrSUQobV9jYWxsYmFja3MucHV0KFdURk1v dmUoY2FsbGJhY2tGdW5jdGlvbiksIHByb2Nlc3MoKS50aHJvdHRsZXIoKS5iYWNrZ3JvdW5kQWN0 aXZpdHlUb2tlbigpKSksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKIH0KIAogdm9pZCBSZW1v dGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5OjpoaWRlQ29udGVudFVudGlsUGVuZGluZ1VwZGF0 ZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJv eHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcApp bmRleCBmMTk4YTgxNTMzZi4uZmY3NmQ5ZjdmOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcApAQCAtMTAwLDcgKzEwMCw5IEBAIFN1c3BlbmRl ZFBhZ2VQcm94eTo6flN1c3BlbmRlZFBhZ2VQcm94eSgpCiAgICAgLy8gSWYgdGhlIHN1c3BlbmRl ZCBwYWdlIHdhcyBub3QgY29uc3VtZWQgYmVmb3JlIGdldHRpbmcgZGVzdHJveWVkLCB0aGVuIGNs b3NlIHRoZSBjb3JyZXNwb25kaW5nIHBhZ2UKICAgICAvLyBvbiB0aGUgV2ViUHJvY2VzcyBzaWRl LgogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9wYWdl LnBhZ2VJRCgpKTsKLSAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdl czo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7 CisKKyAgICBpZiAobV9zdXNwZW5zaW9uU3RhdGUgPT0gU3VzcGVuc2lvblN0YXRlOjpTdXNwZW5k aW5nKQorICAgICAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CiAK ICAgICAvLyBXZSBjYWxsIG1heWJlU2h1dERvd24oKSBhc3luY2hyb25vdXNseSBzaW5jZSB0aGUg U3VzcGVuZGVkUGFnZSBpcyBjdXJyZW50bHkgYmVpbmcgcmVtb3ZlZCBmcm9tIHRoZSBXZWJQcm9j ZXNzUG9vbAogICAgIC8vIGFuZCB3ZSB3YW50IHRvIGF2b2lkIHJlLWVudGVyaW5nIFdlYlByb2Nl c3NQb29sIG1ldGhvZHMuCkBAIC0xMzQsNyArMTM2LDYgQEAgdm9pZCBTdXNwZW5kZWRQYWdlUHJv eHk6OnVuc3VzcGVuZCgpCiAgICAgQVNTRVJUKG1fc3VzcGVuc2lvblN0YXRlID09IFN1c3BlbnNp b25TdGF0ZTo6U3VzcGVuZGVkKTsKIAogICAgIG1fc3VzcGVuc2lvblN0YXRlID0gU3VzcGVuc2lv blN0YXRlOjpSZXN1bWVkOwotICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJ RCgpKTsKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldElzU3VzcGVu ZGVkKGZhbHNlKSwgbV9wYWdlLnBhZ2VJRCgpKTsKIH0KIApAQCAtMTUxLDYgKzE1Miw4IEBAIHZv aWQgU3VzcGVuZGVkUGFnZVByb3h5OjpkaWRQcm9jZXNzUmVxdWVzdFRvU3VzcGVuZChTdXNwZW5z aW9uU3RhdGUgbmV3U3VzcGVuc2lvCiAgICAgbV9zdXNwZW5zaW9uVG9rZW4gPSBudWxscHRyOwog I2VuZGlmCiAKKyAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CisK ICAgICBpZiAobV9yZWFkeVRvVW5zdXNwZW5kSGFuZGxlcikKICAgICAgICAgbV9yZWFkeVRvVW5z dXNwZW5kSGFuZGxlcih0aGlzKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYkZyYW1lUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQ cm94eS5jcHAKaW5kZXggYzc3YTI2Yjc0MjcuLjUzYzcxOTZjMmFhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcApAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUg IldlYkZyYW1lUHJveHkuaCIKIAogI2luY2x1ZGUgIkFQSU5hdmlnYXRpb24uaCIKKyNpbmNsdWRl ICJQcm92aXNpb25hbFBhZ2VQcm94eS5oIgogI2luY2x1ZGUgIldlYkNlcnRpZmljYXRlSW5mby5o IgogI2luY2x1ZGUgIldlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eS5oIgogI2luY2x1ZGUgIldl YlBhZ2VNZXNzYWdlcy5oIgpAQCAtNzQsNyArNzUsNyBAQCBib29sIFdlYkZyYW1lUHJveHk6Omlz TWFpbkZyYW1lKCkgY29uc3QKICAgICBpZiAoIW1fcGFnZSkKICAgICAgICAgcmV0dXJuIGZhbHNl OwogCi0gICAgcmV0dXJuIHRoaXMgPT0gbV9wYWdlLT5tYWluRnJhbWUoKTsKKyAgICByZXR1cm4g dGhpcyA9PSBtX3BhZ2UtPm1haW5GcmFtZSgpIHx8IChtX3BhZ2UtPnByb3Zpc2lvbmFsUGFnZVBy b3h5KCkgJiYgdGhpcyA9PSBtX3BhZ2UtPnByb3Zpc2lvbmFsUGFnZVByb3h5KCktPm1haW5GcmFt ZSgpKTsKIH0KIAogdm9pZCBXZWJGcmFtZVByb3h5Ojpsb2FkVVJMKGNvbnN0IFVSTCYgdXJsKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMGM4YTY4NzZmMjUu LjVmOTFhY2JkZmNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK QEAgLTc3LDYgKzc3LDcgQEAKICNpbmNsdWRlICJQbHVnaW5JbmZvcm1hdGlvbi5oIgogI2luY2x1 ZGUgIlBsdWdpblByb2Nlc3NNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiUHJpbnRJbmZvLmgiCisjaW5j bHVkZSAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbmNsdWRlICJTYWZlQnJvd3NpbmdXYXJu aW5nLmgiCiAjaW5jbHVkZSAiU2hhcmVTaGVldENhbGxiYWNrSUQuaCIKICNpbmNsdWRlICJTaGFy ZWRCdWZmZXJEYXRhUmVmZXJlbmNlLmgiCkBAIC0yMzYsOCArMjM3LDggQEAKIC8vIFRoaXMgY29u dHJvbHMgd2hhdCBzdHJhdGVneSB3ZSB1c2UgZm9yIG1vdXNlIHdoZWVsIGNvYWxlc2NpbmcuCiAj ZGVmaW5lIE1FUkdFX1dIRUVMX0VWRU5UUyAxCiAKLSNkZWZpbmUgTUVTU0FHRV9DSEVDSyhhc3Nl cnRpb24pIE1FU1NBR0VfQ0hFQ0tfQkFTRShhc3NlcnRpb24sIG1fcHJvY2Vzcy0+Y29ubmVjdGlv bigpKQotI2RlZmluZSBNRVNTQUdFX0NIRUNLX1VSTCh1cmwpIE1FU1NBR0VfQ0hFQ0tfQkFTRShj aGVja1VSTFJlY2VpdmVkRnJvbUN1cnJlbnRPclByZXZpb3VzV2ViUHJvY2Vzcyh1cmwpLCBtX3By b2Nlc3MtPmNvbm5lY3Rpb24oKSkKKyNkZWZpbmUgTUVTU0FHRV9DSEVDSyhwcm9jZXNzLCBhc3Nl cnRpb24pIE1FU1NBR0VfQ0hFQ0tfQkFTRShhc3NlcnRpb24sIHByb2Nlc3MuY29ubmVjdGlvbigp KQorI2RlZmluZSBNRVNTQUdFX0NIRUNLX1VSTChwcm9jZXNzLCB1cmwpIE1FU1NBR0VfQ0hFQ0tf QkFTRShjaGVja1VSTFJlY2VpdmVkRnJvbUN1cnJlbnRPclByZXZpb3VzV2ViUHJvY2Vzcyhwcm9j ZXNzLCB1cmwpLCBwcm9jZXNzLmNvbm5lY3Rpb24oKSkKIAogI2RlZmluZSBSRUxFQVNFX0xPR19J Rl9BTExPV0VEKGNoYW5uZWwsIGZtdCwgLi4uKSBSRUxFQVNFX0xPR19JRihpc0Fsd2F5c09uTG9n Z2luZ0FsbG93ZWQoKSwgY2hhbm5lbCwgIiVwIC0gV2ViUGFnZVByb3h5OjoiIGZtdCwgdGhpcywg IyNfX1ZBX0FSR1NfXykKIApAQCAtNzY4LDM4ICs3NjksMjYgQEAgYm9vbCBXZWJQYWdlUHJveHk6 OnN1c3BlbmRDdXJyZW50UGFnZUlmUG9zc2libGUoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9u LCBPcHQKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OnN3YXBUb1dl YlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVuaXF1ZV9wdHI8 U3VzcGVuZGVkUGFnZVByb3h5PiYmIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSwgSXNTd2FwRnJv bVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9pZCBXZWJQYWdlUHJveHk6OnN3YXBU b1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLCBzdGQ6OnVuaXF1ZV9w dHI8RHJhd2luZ0FyZWFQcm94eT4mJiBkcmF3aW5nQXJlYSwgUmVmUHRyPFdlYkZyYW1lUHJveHk+ JiYgbWFpbkZyYW1lKQogewogICAgIEFTU0VSVCghbV9pc0Nsb3NlZCk7CiAgICAgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRChMb2FkaW5nLCAic3dhcFRvV2ViUHJvY2Vzczogd2ViUElEID0gJWksIHBh Z2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJ RCk7CiAKICAgICBtX3Byb2Nlc3MgPSBXVEZNb3ZlKHByb2Nlc3MpOworICAgIEFTU0VSVCghbV9k cmF3aW5nQXJlYSk7CisgICAgc2V0RHJhd2luZ0FyZWEoV1RGTW92ZShkcmF3aW5nQXJlYSkpOwor ICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOworICAgIG1fbWFpbkZyYW1lID0gV1RGTW92ZShtYWlu RnJhbWUpOwogICAgIG1faXNWYWxpZCA9IHRydWU7CiAKLSAgICAvLyBJZiB3ZSBhcmUgcmVhdHRh Y2hpbmcgdG8gYSBTdXNwZW5kZWRQYWdlLCB0aGVuIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdlIGFs cmVhZHkgZXhpc3RzIGFuZAotICAgIC8vIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1l KCkgd2lsbCBub3QgYmUgY2FsbGVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUuIEluIHN1Y2gK LSAgICAvLyBjYXNlLCB3ZSBuZWVkIHRvIGluaXRpYWxpemUgbV9tYWluRnJhbWUgdG8gcmVmbGVj dCB0aGUgZmFjdCB0aGUgdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UKLSAgICAvLyBhbHJlYWR5IGV4 aXN0cyBhbmQgYWxyZWFkeSBoYXMgYSBtYWluIGZyYW1lLgotICAgIGlmIChkZXN0aW5hdGlvblN1 c3BlbmRlZFBhZ2UpIHsKLSAgICAgICAgaWYgKCFkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UtPmZh aWxlZFRvU3VzcGVuZCgpKSB7Ci0gICAgICAgICAgICBBU1NFUlQoIW1fbWFpbkZyYW1lKTsKLSAg ICAgICAgICAgIEFTU0VSVCgmZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5wcm9jZXNzKCkgPT0g bV9wcm9jZXNzLnB0cigpKTsKLSAgICAgICAgICAgIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZS0+ dW5zdXNwZW5kKCk7Ci0gICAgICAgICAgICBtX21haW5GcmFtZSA9IFdlYkZyYW1lUHJveHk6OmNy ZWF0ZSgqdGhpcywgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpKTsKLSAg ICAgICAgICAgIG1fcHJvY2Vzcy0+ZnJhbWVDcmVhdGVkKGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFn ZS0+bWFpbkZyYW1lSUQoKSwgKm1fbWFpbkZyYW1lKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAg ICAgICAgIC8vIFdlIGZhaWxlZCB0byBzdXNwZW5kIHRoZSBwYWdlIHNvIGRlc3Ryb3kgaXQgbm93 IGFuZCBtZXJlbHkgcmV1c2UgaXRzIFdlYkNvbnRlbnQgcHJvY2Vzcy4KLSAgICAgICAgICAgIGRl c3RpbmF0aW9uU3VzcGVuZGVkUGFnZSA9IG51bGxwdHI7Ci0gICAgICAgIH0KLSAgICB9Ci0KICAg ICBtX3Byb2Nlc3MtPmFkZEV4aXN0aW5nV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQsIFdlYlByb2Nl c3NQcm94eTo6QmVnaW5zVXNpbmdEYXRhU3RvcmU6Ok5vKTsKICAgICBtX3Byb2Nlc3MtPmFkZE1l c3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1l KCksIG1fcGFnZUlELCAqdGhpcyk7CiAKLSAgICBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3Mo aXNTd2FwRnJvbVN1c3BlbmRlZCk7CisgICAgLy8gTm8gbmVlZCB0byBpbml0aWFsaXplIHRoZSBX ZWJQYWdlIHNpbmNlIGl0IHdhcyBjcmVhdGVkIHdoZW4gd2UgY3JlYXRlZCB0aGUgUHJvdmlzaW9u YWxQYWdlUHJveHkuCisgICAgZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKFNob3VsZEluaXRp YWxpemVXZWJQYWdlOjpObyk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hp bmdUb1dlYlByb2Nlc3MoSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQor dm9pZCBXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhTaG91bGRJbml0 aWFsaXplV2ViUGFnZSBzaG91bGRJbml0aWFsaXplUGFnZSkKIHsKICAgICBBU1NFUlQobV9wcm9j ZXNzLT5zdGF0ZSgpICE9IENoaWxkUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6VGVybWluYXRlZCk7CiAK QEAgLTgzNSw3ICs4MjQsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNoaW5nVG9X ZWJQcm9jZXNzKElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJvbVN1cwogICAgIG1fZWRpdGFi bGVJbWFnZUNvbnRyb2xsZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEVkaXRhYmxlSW1hZ2VDb250cm9s bGVyPigqdGhpcyk7CiAjZW5kaWYKIAotICAgIGluaXRpYWxpemVXZWJQYWdlKGlzU3dhcEZyb21T dXNwZW5kZWQpOworICAgIGlmIChzaG91bGRJbml0aWFsaXplUGFnZSA9PSBTaG91bGRJbml0aWFs aXplV2ViUGFnZTo6WWVzKQorICAgICAgICBpbml0aWFsaXplV2ViUGFnZSgpOwogCiAgICAgbV9p bnNwZWN0b3ItPnVwZGF0ZUZvck5ld1BhZ2VQcm9jZXNzKHRoaXMpOwogCkBAIC05MDAsMTIgKzg5 MCwxMSBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9X ZWJQcm9jZXNzV2l0aEl0ZW0oV2ViQmFja0ZvcndhcgogICAgIHJldHVybiBXVEZNb3ZlKG5hdmln YXRpb24pOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoSXNTd2Fw RnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9pZCBXZWJQYWdlUHJveHk6OnNl dERyYXdpbmdBcmVhKHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmIGRyYXdpbmdB cmVhKQogewotICAgIEFTU0VSVChpc1ZhbGlkKCkpOwotCi0gICAgbV9kcmF3aW5nQXJlYSA9IHBh Z2VDbGllbnQoKS5jcmVhdGVEcmF3aW5nQXJlYVByb3h5KCk7Ci0gICAgQVNTRVJUKG1fZHJhd2lu Z0FyZWEpOworICAgIG1fZHJhd2luZ0FyZWEgPSBXVEZNb3ZlKGRyYXdpbmdBcmVhKTsKKyAgICBp ZiAoIW1fZHJhd2luZ0FyZWEpCisgICAgICAgIHJldHVybjsKIAogI2lmIEVOQUJMRShBU1lOQ19T Q1JPTExJTkcpICYmIFBMQVRGT1JNKENPQ09BKQogICAgIGlmIChtX2RyYXdpbmdBcmVhLT50eXBl KCkgPT0gRHJhd2luZ0FyZWFUeXBlUmVtb3RlTGF5ZXJUcmVlKSB7CkBAIC05MTYsMTUgKzkwNSwx NiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoSXNTd2FwRnJvbVN1c3Bl bmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQogI2VuZGlmCiAgICAgfQogI2VuZGlmCit9CiAKLSAg ICBhdXRvIHBhcmFtZXRlcnMgPSBjcmVhdGlvblBhcmFtZXRlcnMoKTsKLSAgICBwYXJhbWV0ZXJz LmlzU3dhcEZyb21TdXNwZW5kZWQgPSBpc1N3YXBGcm9tU3VzcGVuZGVkID09IElzU3dhcEZyb21T dXNwZW5kZWQ6OlllczsKK3ZvaWQgV2ViUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFnZSgpCit7 CisgICAgQVNTRVJUKGlzVmFsaWQoKSk7CiAKLSNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCi0g ICAgcGFyYW1ldGVycy5oYXNSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMgPSBwcm9jZXNzKCkucHJv Y2Vzc1Bvb2woKS5tYXlIYXZlUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXJzKG1fd2Vic2l0ZURhdGFT dG9yZSk7Ci0jZW5kaWYKKyAgICBzZXREcmF3aW5nQXJlYShwYWdlQ2xpZW50KCkuY3JlYXRlRHJh d2luZ0FyZWFQcm94eShtX3Byb2Nlc3MpKTsKKyAgICBBU1NFUlQobV9kcmF3aW5nQXJlYSk7CiAK LSAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6Q3JlYXRlV2ViUGFnZSht X3BhZ2VJRCwgcGFyYW1ldGVycyksIDApOworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpX ZWJQcm9jZXNzOjpDcmVhdGVXZWJQYWdlKG1fcGFnZUlELCBjcmVhdGlvblBhcmFtZXRlcnMobV9w cm9jZXNzKSksIDApOwogCiAgICAgbV9uZWVkc1RvRmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFm dGVyUHJvY2Vzc0xhdW5jaCA9IHRydWU7CiAgICAgZmluaXNoSW5pdGlhbGl6aW5nV2ViUGFnZUFm dGVyUHJvY2Vzc0xhdW5jaCgpOwpAQCAtMTAzNCwxMiArMTAyNCwxMiBAQCBib29sIFdlYlBhZ2VQ cm94eTo6dHJ5Q2xvc2UoKQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9vbCBXZWJQYWdlUHJv eHk6Om1heWJlSW5pdGlhbGl6ZVNhbmRib3hFeHRlbnNpb25IYW5kbGUoY29uc3QgVVJMJiB1cmws IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSkKK2Jvb2wg V2ViUGFnZVByb3h5OjptYXliZUluaXRpYWxpemVTYW5kYm94RXh0ZW5zaW9uSGFuZGxlKFdlYlBy b2Nlc3NQcm94eSYgcHJvY2VzcywgY29uc3QgVVJMJiB1cmwsIFNhbmRib3hFeHRlbnNpb246Okhh bmRsZSYgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSkKIHsKICAgICBpZiAoIXVybC5pc0xvY2FsRmls ZSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAobV9wcm9jZXNzLT5oYXNBc3N1 bWVkUmVhZEFjY2Vzc1RvVVJMKHVybCkpCisgICAgaWYgKHByb2Nlc3MuaGFzQXNzdW1lZFJlYWRB Y2Nlc3NUb1VSTCh1cmwpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyBJbnNwZWN0 b3IgcmVzb3VyY2VzIGFyZSBpbiBhIGRpcmVjdG9yeSB3aXRoIGFzc3VtZWQgYWNjZXNzLgpAQCAt MTA2MywyMCArMTA1MywyMSBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6 OmxvYWRSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFNobwogICAgIFJFTEVBU0Vf TE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImxvYWRSZXF1ZXN0OiB3ZWJQSUQgPSAlaSwgcGFnZUlE ID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsK IAogICAgIGF1dG8gbmF2aWdhdGlvbiA9IG1fbmF2aWdhdGlvblN0YXRlLT5jcmVhdGVMb2FkUmVx dWVzdE5hdmlnYXRpb24oUmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3QpLCBtX2JhY2tGb3J3YXJkTGlz dC0+Y3VycmVudEl0ZW0oKSk7Ci0gICAgbG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbihuYXZpZ2F0 aW9uLmdldCgpLCBXVEZNb3ZlKHJlcXVlc3QpLCBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5 LCB1c2VyRGF0YSwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpObyk7CisgICAgbG9hZFJl cXVlc3RXaXRoTmF2aWdhdGlvblNoYXJlZChtX3Byb2Nlc3MsIG5hdmlnYXRpb24uZ2V0KCksIFdU Rk1vdmUocmVxdWVzdCksIHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIHVzZXJEYXRhLCBT aG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6Ok5vKTsKICAgICByZXR1cm4gV1RGTW92ZShuYXZp Z2F0aW9uKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRp b24oQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0 LCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5IHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xp Y3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkIHNo b3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4m JiB3ZWJzaXRlUG9saWNpZXMpCit2b2lkIFdlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3RXaXRoTmF2 aWdhdGlvblNoYXJlZChXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIEFQSTo6TmF2aWdhdGlvbiYg bmF2aWdhdGlvbiwgUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgU2hvdWxkT3BlbkV4dGVybmFs VVJMc1BvbGljeSBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNl ckRhdGEsIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCBzaG91bGRUcmVhdEFzQ29udGludWlu Z0xvYWQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQog ewogICAgIEFTU0VSVCghbV9pc0Nsb3NlZCk7CiAKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VE KExvYWRpbmcsICJsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uOiB3ZWJQSUQgPSAlaSwgcGFnZUlE ID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsK KyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJsb2FkUmVxdWVzdFdpdGhOYXZp Z2F0aW9uOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBwcm9jZXNzLnByb2Nlc3NJ ZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKIAogICAgIGF1dG8gdHJhbnNhY3Rpb24gPSBtX3BhZ2VM b2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKIAogICAgIGF1dG8gdXJsID0gcmVxdWVzdC51cmwoKTsK LSAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0UGVuZGluZ0FQSVJlcXVlc3RVUkwodHJhbnNhY3Rpb24s IHVybCk7CisgICAgaWYgKHNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCAhPSBTaG91bGRUcmVh dEFzQ29udGludWluZ0xvYWQ6OlllcykKKyAgICAgICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRp bmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCB1cmwpOwogCiAgICAgaWYgKCFpc1ZhbGlkKCkp CiAgICAgICAgIHJlYXR0YWNoVG9XZWJQcm9jZXNzKCk7CkBAIC0xMDg1LDE5ICsxMDc2LDE5IEBA IHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdh dGlvbiYgbmF2aWdhdGlvbiwgUmVzb3VyCiAgICAgbG9hZFBhcmFtZXRlcnMubmF2aWdhdGlvbklE ID0gbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKTsKICAgICBsb2FkUGFyYW1ldGVycy5yZXF1ZXN0 ID0gV1RGTW92ZShyZXF1ZXN0KTsKICAgICBsb2FkUGFyYW1ldGVycy5zaG91bGRPcGVuRXh0ZXJu YWxVUkxzUG9saWN5ID0gKHVpbnQ2NF90KXNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k7Ci0g ICAgbG9hZFBhcmFtZXRlcnMudXNlckRhdGEgPSBVc2VyRGF0YShwcm9jZXNzKCkudHJhbnNmb3Jt T2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YSkuZ2V0KCkpOworICAgIGxvYWRQYXJhbWV0ZXJzLnVz ZXJEYXRhID0gVXNlckRhdGEocHJvY2Vzcy50cmFuc2Zvcm1PYmplY3RzVG9IYW5kbGVzKHVzZXJE YXRhKS5nZXQoKSk7CiAgICAgbG9hZFBhcmFtZXRlcnMuc2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdM b2FkID0gc2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkID09IFNob3VsZFRyZWF0QXNDb250aW51 aW5nTG9hZDo6WWVzOwogICAgIGxvYWRQYXJhbWV0ZXJzLndlYnNpdGVQb2xpY2llcyA9IFdURk1v dmUod2Vic2l0ZVBvbGljaWVzKTsKICAgICBsb2FkUGFyYW1ldGVycy5sb2NrSGlzdG9yeSA9IG5h dmlnYXRpb24ubG9ja0hpc3RvcnkoKTsKICAgICBsb2FkUGFyYW1ldGVycy5sb2NrQmFja0Zvcndh cmRMaXN0ID0gbmF2aWdhdGlvbi5sb2NrQmFja0ZvcndhcmRMaXN0KCk7CiAgICAgbG9hZFBhcmFt ZXRlcnMuY2xpZW50UmVkaXJlY3RTb3VyY2VGb3JIaXN0b3J5ID0gbmF2aWdhdGlvbi5jbGllbnRS ZWRpcmVjdFNvdXJjZUZvckhpc3RvcnkoKTsKLSAgICBib29sIGNyZWF0ZWRFeHRlbnNpb24gPSBt YXliZUluaXRpYWxpemVTYW5kYm94RXh0ZW5zaW9uSGFuZGxlKHVybCwgbG9hZFBhcmFtZXRlcnMu c2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7CisgICAgYm9vbCBjcmVhdGVkRXh0ZW5zaW9uID0gbWF5 YmVJbml0aWFsaXplU2FuZGJveEV4dGVuc2lvbkhhbmRsZShwcm9jZXNzLCB1cmwsIGxvYWRQYXJh bWV0ZXJzLnNhbmRib3hFeHRlbnNpb25IYW5kbGUpOwogICAgIGlmIChjcmVhdGVkRXh0ZW5zaW9u KQotICAgICAgICB3aWxsQWNxdWlyZVVuaXZlcnNhbEZpbGVSZWFkU2FuZGJveEV4dGVuc2lvbigp OworICAgICAgICB3aWxsQWNxdWlyZVVuaXZlcnNhbEZpbGVSZWFkU2FuZGJveEV4dGVuc2lvbihw cm9jZXNzKTsKICAgICBhZGRQbGF0Zm9ybUxvYWRQYXJhbWV0ZXJzKGxvYWRQYXJhbWV0ZXJzKTsK IAotICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6TG9hZFJlcXVlc3QobG9h ZFBhcmFtZXRlcnMpLCBtX3BhZ2VJRCk7Ci0gICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1Rp bWVyKCkuc3RhcnQoKTsKKyAgICBwcm9jZXNzLnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkxvYWRS ZXF1ZXN0KGxvYWRQYXJhbWV0ZXJzKSwgbV9wYWdlSUQpOworICAgIHByb2Nlc3MucmVzcG9uc2l2 ZW5lc3NUaW1lcigpLnN0YXJ0KCk7CiB9CiAKIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBh Z2VQcm94eTo6bG9hZEZpbGUoY29uc3QgU3RyaW5nJiBmaWxlVVJMU3RyaW5nLCBjb25zdCBTdHJp bmcmIHJlc291cmNlRGlyZWN0b3J5VVJMU3RyaW5nLCBBUEk6Ok9iamVjdCogdXNlckRhdGEpCkBA IC0xMTYyLDEzICsxMTUzLDEzIEBAIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94 eTo6bG9hZERhdGEoY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBkYXRhLCBjCiAgICAgfQogCiAg ICAgYXV0byBuYXZpZ2F0aW9uID0gbV9uYXZpZ2F0aW9uU3RhdGUtPmNyZWF0ZUxvYWREYXRhTmF2 aWdhdGlvbihzdGQ6Om1ha2VfdW5pcXVlPEFQSTo6U3Vic3RpdHV0ZURhdGE+KGRhdGEudmVjdG9y KCksIE1JTUVUeXBlLCBlbmNvZGluZywgYmFzZVVSTCwgdXNlckRhdGEpKTsKLSAgICBsb2FkRGF0 YVdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIGRhdGEsIE1JTUVUeXBlLCBlbmNvZGluZywgYmFz ZVVSTCwgdXNlckRhdGEsIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6Tm8pOworICAgIGxv YWREYXRhV2l0aE5hdmlnYXRpb25TaGFyZWQobV9wcm9jZXNzLCBuYXZpZ2F0aW9uLCBkYXRhLCBN SU1FVHlwZSwgZW5jb2RpbmcsIGJhc2VVUkwsIHVzZXJEYXRhLCBTaG91bGRUcmVhdEFzQ29udGlu dWluZ0xvYWQ6Ok5vKTsKICAgICByZXR1cm4gV1RGTW92ZShuYXZpZ2F0aW9uKTsKIH0KIAotdm9p ZCBXZWJQYWdlUHJveHk6OmxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBu YXZpZ2F0aW9uLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEsIGNvbnN0IFN0cmluZyYg TUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwg QVBJOjpPYmplY3QqIHVzZXJEYXRhLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQgc2hvdWxk VHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdl YnNpdGVQb2xpY2llcykKK3ZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkRGF0YVdpdGhOYXZpZ2F0aW9u U2hhcmVkKFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcywgQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0 aW9uLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEsIGNvbnN0IFN0cmluZyYgTUlNRVR5 cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpP YmplY3QqIHVzZXJEYXRhLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQgc2hvdWxkVHJlYXRB c0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQ b2xpY2llcykKIHsKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJsb2FkRGF0 YVdpdGhOYXZpZ2F0aW9uOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nl c3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKKyAgICBSRUxFQVNFX0xPR19JRl9B TExPV0VEKExvYWRpbmcsICJsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uOiB3ZWJQSUQgPSAlaSwgcGFn ZUlEID0gJSIgUFJJdTY0LCBwcm9jZXNzLnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsK IAogICAgIEFTU0VSVCghbV9pc0Nsb3NlZCk7CiAKQEAgLTExODYsMTMgKzExNzcsMTMgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmxvYWREYXRhV2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBu YXZpZ2F0aW9uLCBjb25zdCBJUEMKICAgICBsb2FkUGFyYW1ldGVycy5lbmNvZGluZ05hbWUgPSBl bmNvZGluZzsKICAgICBsb2FkUGFyYW1ldGVycy5iYXNlVVJMU3RyaW5nID0gYmFzZVVSTDsKICAg ICBsb2FkUGFyYW1ldGVycy5zaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQgPSBzaG91bGRUcmVh dEFzQ29udGludWluZ0xvYWQgPT0gU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXM7Ci0g ICAgbG9hZFBhcmFtZXRlcnMudXNlckRhdGEgPSBVc2VyRGF0YShwcm9jZXNzKCkudHJhbnNmb3Jt T2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YSkuZ2V0KCkpOworICAgIGxvYWRQYXJhbWV0ZXJzLnVz ZXJEYXRhID0gVXNlckRhdGEocHJvY2Vzcy50cmFuc2Zvcm1PYmplY3RzVG9IYW5kbGVzKHVzZXJE YXRhKS5nZXQoKSk7CiAgICAgbG9hZFBhcmFtZXRlcnMud2Vic2l0ZVBvbGljaWVzID0gV1RGTW92 ZSh3ZWJzaXRlUG9saWNpZXMpOwogICAgIGFkZFBsYXRmb3JtTG9hZFBhcmFtZXRlcnMobG9hZFBh cmFtZXRlcnMpOwogCi0gICAgbV9wcm9jZXNzLT5hc3N1bWVSZWFkQWNjZXNzVG9CYXNlVVJMKCp0 aGlzLCBiYXNlVVJMKTsKLSAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6Okxv YWREYXRhKGxvYWRQYXJhbWV0ZXJzKSwgbV9wYWdlSUQpOwotICAgIG1fcHJvY2Vzcy0+cmVzcG9u c2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7CisgICAgcHJvY2Vzcy5hc3N1bWVSZWFkQWNjZXNzVG9C YXNlVVJMKCp0aGlzLCBiYXNlVVJMKTsKKyAgICBwcm9jZXNzLnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OkxvYWREYXRhKGxvYWRQYXJhbWV0ZXJzKSwgbV9wYWdlSUQpOworICAgIHByb2Nlc3MucmVz cG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2Fk QWx0ZXJuYXRlSFRNTChjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGh0bWxEYXRhLCBjb25zdCBT dHJpbmcmIGVuY29kaW5nLCBjb25zdCBVUkwmIGJhc2VVUkwsIGNvbnN0IFVSTCYgdW5yZWFjaGFi bGVVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSkKQEAgLTEyOTQsNiArMTI4NSwxMCBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6c3RvcExvYWRpbmcoKQogICAgIH0KIAogICAgIG1fcHJvY2Vzcy0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6U3RvcExvYWRpbmcoKSwgbV9wYWdlSUQpOworICAgIGlmICht X3Byb3Zpc2lvbmFsUGFnZSkgeworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZS0+Y2FuY2VsKCk7 CisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlID0gbnVsbHB0cjsKKyAgICB9CiAgICAgbV9wcm9j ZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKIH0KIApAQCAtMTMwOSw5ICsxMzA0 LDkgQEAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gV2ViUGFnZVByb3h5OjpyZWxvYWQoT3B0aW9u U2V0PFdlYkNvcmU6OlJlbG9hZE9wdGlvbj4gb3AKICAgICAgICAgbV9wYWdlTG9hZFN0YXRlLnNl dFBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCB1cmwpOwogCiAgICAgICAgIC8vIFdl IG1heSBub3QgaGF2ZSBhbiBleHRlbnNpb24geWV0IGlmIGJhY2svZm9yd2FyZCBsaXN0IHdhcyBy ZWluc3RhdGVkIGFmdGVyIGEgV2ViUHJvY2VzcyBjcmFzaCBvciBhIGJyb3dzZXIgcmVsYXVuY2gK LSAgICAgICAgYm9vbCBjcmVhdGVkRXh0ZW5zaW9uID0gbWF5YmVJbml0aWFsaXplU2FuZGJveEV4 dGVuc2lvbkhhbmRsZShVUkwoVVJMKCksIHVybCksIHNhbmRib3hFeHRlbnNpb25IYW5kbGUpOwor ICAgICAgICBib29sIGNyZWF0ZWRFeHRlbnNpb24gPSBtYXliZUluaXRpYWxpemVTYW5kYm94RXh0 ZW5zaW9uSGFuZGxlKG1fcHJvY2VzcywgVVJMKFVSTCgpLCB1cmwpLCBzYW5kYm94RXh0ZW5zaW9u SGFuZGxlKTsKICAgICAgICAgaWYgKGNyZWF0ZWRFeHRlbnNpb24pCi0gICAgICAgICAgICB3aWxs QWNxdWlyZVVuaXZlcnNhbEZpbGVSZWFkU2FuZGJveEV4dGVuc2lvbigpOworICAgICAgICAgICAg d2lsbEFjcXVpcmVVbml2ZXJzYWxGaWxlUmVhZFNhbmRib3hFeHRlbnNpb24obV9wcm9jZXNzKTsK ICAgICB9CiAKICAgICBpZiAoIWlzVmFsaWQoKSkKQEAgLTIwOTIsNyArMjA4Nyw3IEBAIHZvaWQg V2ViUGFnZVByb3h5OjpwZXJmb3JtRHJhZ0NvbnRyb2xsZXJBY3Rpb24oRHJhZ0NvbnRyb2xsZXJB Y3Rpb24gYWN0aW9uLCBEcmFnCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRQZXJmb3JtRHJhZ0Nv bnRyb2xsZXJBY3Rpb24odWludDY0X3QgZHJhZ09wZXJhdGlvbiwgV2ViQ29yZTo6RHJhZ0hhbmRs aW5nTWV0aG9kIGRyYWdIYW5kbGluZ01ldGhvZCwgYm9vbCBtb3VzZUlzT3ZlckZpbGVJbnB1dCwg dW5zaWduZWQgbnVtYmVyT2ZJdGVtc1RvQmVBY2NlcHRlZCwgY29uc3QgSW50UmVjdCYgaW5zZXJ0 aW9uUmVjdCwgY29uc3QgSW50UmVjdCYgZWRpdGFibGVFbGVtZW50UmVjdCkKIHsKLSAgICBNRVNT QUdFX0NIRUNLKGRyYWdPcGVyYXRpb24gPD0gRHJhZ09wZXJhdGlvbkRlbGV0ZSk7CisgICAgTUVT U0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGRyYWdPcGVyYXRpb24gPD0gRHJhZ09wZXJhdGlv bkRlbGV0ZSk7CiAKICAgICBtX2N1cnJlbnREcmFnT3BlcmF0aW9uID0gc3RhdGljX2Nhc3Q8RHJh Z09wZXJhdGlvbj4oZHJhZ09wZXJhdGlvbik7CiAgICAgbV9jdXJyZW50RHJhZ0hhbmRsaW5nTWV0 aG9kID0gZHJhZ0hhbmRsaW5nTWV0aG9kOwpAQCAtMjQwNSw3ICsyNDAwLDcgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OmZpbmRQbHVnaW4oY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgdWludDMyX3QgcHJv Y2Vzc1R5cGUsIGNvbnMKIHsKICAgICBQYWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3RvcihwYWdl Q2xpZW50KCkpOwogCi0gICAgTUVTU0FHRV9DSEVDS19VUkwodXJsU3RyaW5nKTsKKyAgICBNRVNT QUdFX0NIRUNLX1VSTChtX3Byb2Nlc3MuZ2V0KCksIHVybFN0cmluZyk7CiAKICAgICBVUkwgcGx1 Z2luVVJMID0gVVJMIHsgVVJMKCksIHVybFN0cmluZyB9OwogICAgIFN0cmluZyBuZXdNaW1lVHlw ZSA9IG1pbWVUeXBlLmNvbnZlcnRUb0FTQ0lJTG93ZXJjYXNlKCk7CkBAIC0yNjk4LDcgKzI2OTMs NyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVjZWl2ZWROYXZpZ2F0aW9uUG9saWN5RGVjaXNpb24o V2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbgogICAgICAgICB9CiAKICAgICAgICAgaWYgKHBy b2Nlc3NGb3JOYXZpZ2F0aW9uLnB0cigpICE9ICZwcm9jZXNzKCkpIHsKLSAgICAgICAgICAgIHBv bGljeUFjdGlvbiA9IGlzUGFnZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50 KCkgPyBXZWJQb2xpY3lBY3Rpb246Oklnbm9yZSA6IFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZDsK KyAgICAgICAgICAgIHBvbGljeUFjdGlvbiA9IFdlYlBvbGljeUFjdGlvbjo6SWdub3JlOwogICAg ICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJkZWNpZGVQ b2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uLCBzd2FwcGluZyBwcm9jZXNzICVpIHdpdGggcHJvY2Vz cyAlaSBmb3IgbmF2aWdhdGlvbiwgcmVhc29uOiAle3B1YmxpY31zIiwgcHJvY2Vzc0lkZW50aWZp ZXIoKSwgcHJvY2Vzc0Zvck5hdmlnYXRpb24tPnByb2Nlc3NJZGVudGlmaWVyKCksIHJlYXNvbi51 dGY4KCkuZGF0YSgpKTsKICAgICAgICAgICAgIExPRyhQcm9jZXNzU3dhcHBpbmcsICIoUHJvY2Vz c1N3YXBwaW5nKSBTd2l0Y2hpbmcgZnJvbSBwcm9jZXNzICVpIHRvIG5ldyBwcm9jZXNzICglaSkg Zm9yIG5hdmlnYXRpb24gJSIgUFJJdTY0ICIgJyVzJyIsIHByb2Nlc3NJZGVudGlmaWVyKCksIHBy b2Nlc3NGb3JOYXZpZ2F0aW9uLT5wcm9jZXNzSWRlbnRpZmllcigpLCBuYXZpZ2F0aW9uLT5uYXZp Z2F0aW9uSUQoKSwgbmF2aWdhdGlvbi0+bG9nZ2luZ1N0cmluZygpKTsKICAgICAgICAgfSBlbHNl CkBAIC0yNzA3LDggKzI3MDIsMTQgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdh dGlvblBvbGljeURlY2lzaW9uKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24KICAgICAgICAg Ym9vbCBzaG91bGRQcm9jZXNzU3dhcCA9IHByb2Nlc3NGb3JOYXZpZ2F0aW9uLnB0cigpICE9ICZw cm9jZXNzKCk7CiAgICAgICAgIHJlY2VpdmVkUG9saWN5RGVjaXNpb24ocG9saWN5QWN0aW9uLCBu YXZpZ2F0aW9uLnB0cigpLCBzaG91bGRQcm9jZXNzU3dhcCA/IFdURjo6bnVsbG9wdCA6IFdURk1v dmUoZGF0YSksIFdURk1vdmUoc2VuZGVyKSk7CiAKLSAgICAgICAgaWYgKHNob3VsZFByb2Nlc3NT d2FwKQotICAgICAgICAgICAgY29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKG5hdmlnYXRp b24sIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSA/IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLnRh a2VTdXNwZW5kZWRQYWdlKCpkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UpIDogbnVsbHB0ciwgV1RG TW92ZShwcm9jZXNzRm9yTmF2aWdhdGlvbiksIHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQs IFdURk1vdmUoZGF0YSkpOworICAgICAgICBpZiAoIXNob3VsZFByb2Nlc3NTd2FwKQorICAgICAg ICAgICAgcmV0dXJuOworCisgICAgICAgIGF1dG8gc3VzcGVuZGVkUGFnZSA9IGRlc3RpbmF0aW9u U3VzcGVuZGVkUGFnZSA/IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLnRha2VTdXNwZW5kZWRQYWdl KCpkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UpIDogbnVsbHB0cjsKKyAgICAgICAgaWYgKHN1c3Bl bmRlZFBhZ2UgJiYgc3VzcGVuZGVkUGFnZS0+ZmFpbGVkVG9TdXNwZW5kKCkpCisgICAgICAgICAg ICBzdXNwZW5kZWRQYWdlID0gbnVsbHB0cjsKKworICAgICAgICBjb250aW51ZU5hdmlnYXRpb25J bk5ld1Byb2Nlc3MobmF2aWdhdGlvbiwgV1RGTW92ZShzdXNwZW5kZWRQYWdlKSwgV1RGTW92ZShw cm9jZXNzRm9yTmF2aWdhdGlvbiksIHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFdURk1v dmUoZGF0YSkpOwogICAgIH0pOwogfQogCkBAIC0yNzQ0LDI0ICsyNzQ1LDQ1IEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpyZWNlaXZlZFBvbGljeURlY2lzaW9uKFdlYlBvbGljeUFjdGlvbiBhY3Rpb24s IEFQSTo6TmF2aWdhdGlvCiAgICAgc2VuZGVyLT5zZW5kKGFjdGlvbiwgbmF2aWdhdGlvbiA/IG5h dmlnYXRpb24tPm5hdmlnYXRpb25JRCgpIDogMCwgZG93bmxvYWRJRCwgV1RGTW92ZSh3ZWJzaXRl UG9saWNpZXMpKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmNvbnRpbnVlTmF2aWdhdGlvbklu TmV3UHJvY2VzcyhBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIHN0ZDo6dW5pcXVlX3B0cjxT dXNwZW5kZWRQYWdlUHJveHk+JiYgc3VzcGVuZGVkUGFnZVByb3h5LCBSZWY8V2ViUHJvY2Vzc1By b3h5PiYmIHByb2Nlc3MsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBS ZXF1ZXN0ZWRCeUNsaWVudCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRl UG9saWNpZXMpCit2b2lkIFdlYlBhZ2VQcm94eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKHVpbnQ2 NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlw ZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVMb2Fk VHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiBjZXJ0aWZpY2F0ZUluZm8sIGJv b2wgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVD b250ZW50PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0 YSkKIHsKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJjb250aW51ZU5hdmln YXRpb25Jbk5ld1Byb2Nlc3M6IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcHJv Y2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQpOwotICAgIExPRyhMb2FkaW5nLCAi Q29udGludWluZyBuYXZpZ2F0aW9uICUiIFBSSXU2NCAiICclcycgaW4gYSBuZXcgd2ViIHByb2Nl c3MiLCBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBuYXZpZ2F0aW9uLmxvZ2dpbmdTdHJpbmco KSk7CisgICAgQVNTRVJUKG1fcHJvdmlzaW9uYWxQYWdlKTsKKyAgICBSRUxFQVNFX0xPR19JRl9B TExPV0VEKExvYWRpbmcsICJjb21taXRQcm92aXNpb25hbFBhZ2U6IHByZXZpb3VzUElEID0gJWks IG5ld1BJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50 aWZpZXIoKSwgbV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3MoKS5wcm9jZXNzSWRlbnRpZmllcigp LCBtX3BhZ2VJRCk7CiAKLSAgICBSZWY8V2ViUHJvY2Vzc1Byb3h5PiBwcmV2aW91c1Byb2Nlc3Mg PSBtX3Byb2Nlc3MuY29weVJlZigpOwogICAgIE9wdGlvbmFsPHVpbnQ2NF90PiBtYWluRnJhbWVJ REluUHJldmlvdXNQcm9jZXNzID0gbV9tYWluRnJhbWUgPyBtYWtlT3B0aW9uYWwobV9tYWluRnJh bWUtPmZyYW1lSUQoKSkgOiBXVEY6Om51bGxvcHQ7Ci0gICAgYXV0byBtYWluRnJhbWVVUkwgPSBt X21haW5GcmFtZSA/IG1fbWFpbkZyYW1lLT51cmwoKSA6IFVSTCgpOwogCi0gICAgQVNTRVJUKG1f cHJvY2Vzcy5wdHIoKSAhPSBwcm9jZXNzLnB0cigpKTsKKyAgICBBU1NFUlQobV9wcm9jZXNzLnB0 cigpICE9ICZtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2VzcygpKTsKIAogICAgIHByb2Nlc3NEaWRU ZXJtaW5hdGUoUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpOYXZpZ2F0aW9uU3dhcCk7CiAKICAg ICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZUlEKTsKLSAgICBib29sIGRpZFN1c3BlbmRQ cmV2aW91c1BhZ2UgPSBzdXNwZW5kQ3VycmVudFBhZ2VJZlBvc3NpYmxlKG5hdmlnYXRpb24sIG1h aW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MsIHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQp OworICAgIGF1dG8qIG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG1f cHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSk7CisgICAgYm9vbCBkaWRTdXNwZW5kUHJl dmlvdXNQYWdlID0gbmF2aWdhdGlvbiA/IHN1c3BlbmRDdXJyZW50UGFnZUlmUG9zc2libGUoKm5h dmlnYXRpb24sIG1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MsIG1fcHJvdmlzaW9uYWxQYWdl LT5wcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KCkpIDogZmFsc2U7CiAgICAgbV9wcm9jZXNz LT5yZW1vdmVXZWJQYWdlKCp0aGlzLCBtX3BhZ2VJRCwgV2ViUHJvY2Vzc1Byb3h5OjpFbmRzVXNp bmdEYXRhU3RvcmU6Ok5vKTsKIAotICAgIHN3YXBUb1dlYlByb2Nlc3MoV1RGTW92ZShwcm9jZXNz KSwgV1RGTW92ZShzdXNwZW5kZWRQYWdlUHJveHkpLCBkaWRTdXNwZW5kUHJldmlvdXNQYWdlID8g SXNTd2FwRnJvbVN1c3BlbmRlZDo6WWVzIDogSXNTd2FwRnJvbVN1c3BlbmRlZDo6Tm8pOworICAg IC8vIFRoZXJlIGlzIG5vIHdheSB3ZSdsbCBiZSBhYmxlIHRvIHJldHVybiB0byB0aGUgcGFnZSBp biB0aGUgcHJldmlvdXMgcGFnZSBzbyBjbG9zZSBpdC4KKyAgICBpZiAoIWRpZFN1c3BlbmRQcmV2 aW91c1BhZ2UpCisgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xv c2UoKSwgcGFnZUlEKCkpOworCisgICAgc3dhcFRvV2ViUHJvY2VzcyhtX3Byb3Zpc2lvbmFsUGFn ZS0+cHJvY2VzcygpLCBtX3Byb3Zpc2lvbmFsUGFnZS0+dGFrZURyYXdpbmdBcmVhKCksIG1fcHJv dmlzaW9uYWxQYWdlLT5tYWluRnJhbWUoKSk7CisKKyAgICBkaWRDb21taXRMb2FkRm9yRnJhbWUo ZnJhbWVJRCwgbmF2aWdhdGlvbklELCBtaW1lVHlwZSwgZnJhbWVIYXNDdXN0b21Db250ZW50UHJv dmlkZXIsIGZyYW1lTG9hZFR5cGUsIGNlcnRpZmljYXRlSW5mbywgY29udGFpbnNQbHVnaW5Eb2N1 bWVudCwgZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCB1c2VyRGF0YSk7CisKKyAgICBtX3Byb3Zp c2lvbmFsUGFnZSA9IG51bGxwdHI7Cit9CisKK3ZvaWQgV2ViUGFnZVByb3h5Ojpjb250aW51ZU5h dmlnYXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBzdGQ6OnVu aXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmIHN1c3BlbmRlZFBhZ2VQcm94eSwgUmVmPFdl YlByb2Nlc3NQcm94eT4mJiBuZXdQcm9jZXNzLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50 IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0Rh dGE+JiYgd2Vic2l0ZVBvbGljaWVzKQoreworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9h ZGluZywgImNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2Vzczogd2ViUElEID0gJWksIHBhZ2VJ RCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCk7 CisgICAgTE9HKExvYWRpbmcsICJDb250aW51aW5nIG5hdmlnYXRpb24gJSIgUFJJdTY0ICIgJyVz JyBpbiBhIG5ldyB3ZWIgcHJvY2VzcyIsIG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCksIG5hdmln YXRpb24ubG9nZ2luZ1N0cmluZygpKTsKKworICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZSkgewor ICAgICAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UtPm5hdmlnYXRpb25JRCgpICE9IG5hdmlnYXRp b24ubmF2aWdhdGlvbklEKCkpCisgICAgICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZS0+Y2FuY2Vs KCk7CisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlID0gbnVsbHB0cjsKKyAgICB9CisKKyAgICBt X3Byb3Zpc2lvbmFsUGFnZSA9IHN0ZDo6bWFrZV91bmlxdWU8UHJvdmlzaW9uYWxQYWdlUHJveHk+ KCp0aGlzLCBuZXdQcm9jZXNzLmNvcHlSZWYoKSwgV1RGTW92ZShzdXNwZW5kZWRQYWdlUHJveHkp LCBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0SXNS ZWRpcmVjdCgpLCBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCksIHByb2Nlc3NTd2FwUmVxdWVz dGVkQnlDbGllbnQpOwogCiAgICAgaWYgKGF1dG8qIGl0ZW0gPSBuYXZpZ2F0aW9uLnRhcmdldEl0 ZW0oKSkgewogICAgICAgICBMT0coTG9hZGluZywgIldlYlBhZ2VQcm94eSAlcCBjb250aW51ZU5h dmlnYXRpb25Jbk5ld1Byb2Nlc3MgdG8gYmFjayBpdGVtIFVSTCAlcyIsIHRoaXMsIGl0ZW0tPnVy bCgpLnV0ZjgoKS5kYXRhKCkpOwpAQCAtMjc2OSw2NyArMjc5MSwyMiBAQCB2b2lkIFdlYlBhZ2VQ cm94eTo6Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKEFQSTo6TmF2aWdhdGlvbiYgbmF2 aWdhdGlvbiwgcwogICAgICAgICBhdXRvIHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRy YW5zYWN0aW9uKCk7CiAgICAgICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVz dFVSTCh0cmFuc2FjdGlvbiwgaXRlbS0+dXJsKCkpOwogCi0gICAgICAgIGF1dG8gaXRlbVN0YXRl cyA9IG1fYmFja0ZvcndhcmRMaXN0LT5maWx0ZXJlZEl0ZW1TdGF0ZXMoW3RoaXMsIHRhcmdldEl0 ZW0gPSBpdGVtXShXZWJCYWNrRm9yd2FyZExpc3RJdGVtJiBpdGVtKSB7Ci0gICAgICAgICAgICBp ZiAoYXV0byogcGFnZSA9IGl0ZW0uc3VzcGVuZGVkUGFnZSgpKSB7Ci0gICAgICAgICAgICAgICAg aWYgKCZwYWdlLT5wcm9jZXNzKCkgPT0gbV9wcm9jZXNzLnB0cigpKQotICAgICAgICAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICByZXR1cm4gJml0 ZW0gIT0gdGFyZ2V0SXRlbTsKLSAgICAgICAgfSk7Ci0gICAgICAgIG1fcHJvY2Vzcy0+c2VuZChN ZXNzYWdlczo6V2ViUGFnZTo6VXBkYXRlQmFja0ZvcndhcmRMaXN0Rm9yUmVhdHRhY2goV1RGTW92 ZShpdGVtU3RhdGVzKSksIG1fcGFnZUlEKTsKLSAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtKG5hdmlnYXRpb24ubmF2aWdhdGlvbklE KCksIGl0ZW0tPml0ZW1JRCgpLCAqbmF2aWdhdGlvbi5iYWNrRm9yd2FyZEZyYW1lTG9hZFR5cGUo KSwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGlj aWVzKSksIG1fcGFnZUlEKTsKLSAgICAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVy KCkuc3RhcnQoKTsKLQorICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZS0+Z29Ub0JhY2tGb3J3YXJk SXRlbShuYXZpZ2F0aW9uLCAqaXRlbSwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIAogICAgIGlmIChtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0 ZW0oKSAmJiAobmF2aWdhdGlvbi5sb2NrQmFja0ZvcndhcmRMaXN0KCkgPT0gTG9ja0JhY2tGb3J3 YXJkTGlzdDo6WWVzIHx8IG5hdmlnYXRpb24ubG9ja0hpc3RvcnkoKSA9PSBMb2NrSGlzdG9yeTo6 WWVzKSkgewogICAgICAgICAvLyBJZiBXZWJDb3JlIGlzIHN1cHBvc2VkIHRvIGxvY2sgdGhlIGhp c3RvcnkgZm9yIHRoaXMgbG9hZCwgdGhlbiB0aGUgbmV3IHByb2Nlc3MgbmVlZHMgdG8ga25vdyBh Ym91dCB0aGUgY3VycmVudCBoaXN0b3J5IGl0ZW0gc28gaXQgY2FuIHVwZGF0ZQogICAgICAgICAv LyBpdCBpbnN0ZWFkIG9mIGNyZWF0aW5nIGEgbmV3IG9uZS4KLSAgICAgICAgbV9wcm9jZXNzLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRDdXJyZW50SGlzdG9yeUl0ZW1Gb3JSZWF0dGFjaCht X2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKS0+aXRlbVN0YXRlKCkpLCBtX3BhZ2VJRCk7 CisgICAgICAgIG5ld1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldEN1cnJlbnRI aXN0b3J5SXRlbUZvclJlYXR0YWNoKG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50SXRlbSgpLT5p dGVtU3RhdGUoKSksIG1fcGFnZUlEKTsKICAgICB9CiAKICAgICAvLyBGSVhNRTogV29yayBvdXQg dGltaW5nIG9mIHJlc3BvbmRpbmcgd2l0aCB0aGUgbGFzdCBwb2xpY3kgZGVsZWdhdGUsIGV0Ywog ICAgIEFTU0VSVCghbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpLmlzRW1wdHkoKSk7CiAgICAg aWYgKGF1dG8mIHN1YnN0aXR1dGVEYXRhID0gbmF2aWdhdGlvbi5zdWJzdGl0dXRlRGF0YSgpKQot ICAgICAgICBsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIHsgc3Vic3RpdHV0ZURh dGEtPmNvbnRlbnQuZGF0YSgpLCBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5zaXplKCkgfSwgc3Vi c3RpdHV0ZURhdGEtPk1JTUVUeXBlLCBzdWJzdGl0dXRlRGF0YS0+ZW5jb2RpbmcsIHN1YnN0aXR1 dGVEYXRhLT5iYXNlVVJMLCBzdWJzdGl0dXRlRGF0YS0+dXNlckRhdGEuZ2V0KCksIFNob3VsZFRy ZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOworICAg ICAgICBtX3Byb3Zpc2lvbmFsUGFnZS0+bG9hZERhdGEobmF2aWdhdGlvbiwgeyBzdWJzdGl0dXRl RGF0YS0+Y29udGVudC5kYXRhKCksIHN1YnN0aXR1dGVEYXRhLT5jb250ZW50LnNpemUoKSB9LCBz dWJzdGl0dXRlRGF0YS0+TUlNRVR5cGUsIHN1YnN0aXR1dGVEYXRhLT5lbmNvZGluZywgc3Vic3Rp dHV0ZURhdGEtPmJhc2VVUkwsIHN1YnN0aXR1dGVEYXRhLT51c2VyRGF0YS5nZXQoKSwgV1RGTW92 ZSh3ZWJzaXRlUG9saWNpZXMpKTsKICAgICBlbHNlCi0gICAgICAgIGxvYWRSZXF1ZXN0V2l0aE5h dmlnYXRpb24obmF2aWdhdGlvbiwgUmVzb3VyY2VSZXF1ZXN0IHsgbmF2aWdhdGlvbi5jdXJyZW50 UmVxdWVzdCgpIH0sIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3Vs ZEFsbG93RXh0ZXJuYWxTY2hlbWVzLCBudWxscHRyLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xv YWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKLQotICAgIEFTU0VSVCghbV9tYWlu RnJhbWUpOwotICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyID0gW3RoaXMsIHdlYWtUaGlz ID0gbWFrZVdlYWtQdHIoKnRoaXMpLCBuYXZpZ2F0aW9uSUQgPSBuYXZpZ2F0aW9uLm5hdmlnYXRp b25JRCgpLCByZXF1ZXN0ID0gIG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKSwgbWFpbkZyYW1l VVJMLCBpc1NlcnZlclJlZGlyZWN0ID0gbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdElzUmVkaXJl Y3QoKV0oKSBtdXRhYmxlIHsKLSAgICAgICAgaWYgKCF3ZWFrVGhpcykKLSAgICAgICAgICAgIHJl dHVybjsKLQotICAgICAgICBBU1NFUlQobV9tYWluRnJhbWUpOwotICAgICAgICAvLyBUaGlzIG5h dmlnYXRpb24gd2FzIGRlc3Ryb3llZCBzbyBubyBuZWVkIHRvIG5vdGlmeSBvZiByZWRpcmVjdC4K LSAgICAgICAgaWYgKCFuYXZpZ2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCkp Ci0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgLy8gUmVzdG9yZSB0aGUgbWFpbiBmcmFt ZSdzIGNvbW1pdHRlZCBVUkwgYXMgc29tZSBjbGllbnRzIG1heSByZWx5IG9uIGl0IHVudGlsIHRo ZSBuZXh0IGxvYWQgaXMgY29tbWl0dGVkLgotICAgICAgICBtX21haW5GcmFtZS0+ZnJhbWVMb2Fk U3RhdGUoKS5zZXRVUkwobWFpbkZyYW1lVVJMKTsKLQotICAgICAgICAvLyBOb3JtYWxseSwgbm90 aWZpY2F0aW9uIG9mIGEgc2VydmVyIHJlZGlyZWN0IGNvbWVzIGZyb20gdGhlIFdlYkNvbnRlbnQg cHJvY2Vzcy4KLSAgICAgICAgLy8gSWYgd2UgYXJlIHByb2Nlc3Mgc3dhcHBpbmcgaW4gcmVzcG9u c2UgdG8gYSBzZXJ2ZXIgcmVkaXJlY3QgdGhlbiB0aGF0IG5vdGlmaWNhdGlvbiB3aWxsIG5vdCBj b21lIGZyb20gdGhlIG5ldyBXZWJDb250ZW50IHByb2Nlc3MuCi0gICAgICAgIC8vIEluIHRoaXMg Y2FzZSB3ZSBoYXZlIHRoZSBVSVByb2Nlc3Mgc3ludGhlc2l6ZSB0aGUgcmVkaXJlY3Qgbm90aWZp Y2F0aW9uIGF0IHRoZSBhcHByb3ByaWF0ZSB0aW1lLgotICAgICAgICBpZiAoaXNTZXJ2ZXJSZWRp cmVjdCkgewotICAgICAgICAgICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkuZGlkU3Rh cnRQcm92aXNpb25hbExvYWQocmVxdWVzdC51cmwoKSk7Ci0gICAgICAgICAgICBkaWRSZWNlaXZl U2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZShtX21haW5GcmFtZS0+ZnJh bWVJRCgpLCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUocmVxdWVzdCksIHsgfSk7Ci0gICAgICAgIH0K LSAgICB9OwotCi0gICAgaWYgKCFtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkuY29uZmlndXJhdGlv bigpLnByb2Nlc3NTd2Fwc09uV2luZG93T3BlbldpdGhPcGVuZXIoKSB8fCAhaXNQYWdlT3BlbmVk QnlET01TaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSB8fCAhbWFpbkZyYW1lSURJblByZXZp b3VzUHJvY2VzcykgewotICAgICAgICAvLyBUaGVyZSBpcyBubyB3YXkgd2UnbGwgYmUgYWJsZSB0 byByZXR1cm4gdG8gdGhlIHBhZ2UgaW4gdGhlIHByZXZpb3VzIHBhZ2Ugc28gY2xvc2UgaXQuCi0g ICAgICAgIGlmICghZGlkU3VzcGVuZFByZXZpb3VzUGFnZSkKLSAgICAgICAgICAgIHByZXZpb3Vz UHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9wYWdlSUQpOwotICAg ICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgbV9tYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRs ZXIgPSBbdGhpcywgcHJldmlvdXNQcm9jZXNzID0gV1RGTW92ZShwcmV2aW91c1Byb2Nlc3MpLCBt YWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzID0gKm1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nl c3NdKGNvbnN0IEdsb2JhbFdpbmRvd0lkZW50aWZpZXImIHdpbmRvd0lkZW50aWZpZXIpIHsKLSAg ICAgICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKLSAgICAgICAgR2xvYmFsRnJhbWVJZGVudGlmaWVy IG5hdmlnYXRlZEZyYW1lSWRlbnRpZmllckluTmV3UHJvY2VzcyB7IHBhZ2VJRCgpLCBtX21haW5G cmFtZS0+ZnJhbWVJRCgpIH07Ci0gICAgICAgIHByZXZpb3VzUHJvY2Vzcy0+c2VuZChNZXNzYWdl czo6V2ViUGFnZTo6RnJhbWVCZWNhbWVSZW1vdGUobWFpbkZyYW1lSURJblByZXZpb3VzUHJvY2Vz cywgbmF2aWdhdGVkRnJhbWVJZGVudGlmaWVySW5OZXdQcm9jZXNzLCB3aW5kb3dJZGVudGlmaWVy KSwgcGFnZUlEKCkpOwotICAgIH07CisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5sb2FkUmVx dWVzdChuYXZpZ2F0aW9uLCBSZXNvdXJjZVJlcXVlc3QgeyBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1 ZXN0KCkgfSwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkQWxs b3dFeHRlcm5hbFNjaGVtZXMsIG51bGxwdHIsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiB9 CiAKIGJvb2wgV2ViUGFnZVByb3h5Ojppc1BhZ2VPcGVuZWRCeURPTVNob3dpbmdJbml0aWFsRW1w dHlEb2N1bWVudCgpIGNvbnN0CkBAIC0zNjg3LDI1ICszNjY0LDIwIEBAIHZvaWQgV2ViUGFnZVBy b3h5OjpkaWRDcmVhdGVNYWluRnJhbWUodWludDY0X3QgZnJhbWVJRCkKIAogICAgIFBhZ2VDbGll bnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKLSAgICBNRVNTQUdFX0NIRUNL KCFtX21haW5GcmFtZSk7Ci0gICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MtPmNhbkNyZWF0ZUZy YW1lKGZyYW1lSUQpKTsKKyAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgIW1fbWFp bkZyYW1lKTsKKyAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgbV9wcm9jZXNzLT5j YW5DcmVhdGVGcmFtZShmcmFtZUlEKSk7CiAKICAgICBtX21haW5GcmFtZSA9IFdlYkZyYW1lUHJv eHk6OmNyZWF0ZSgqdGhpcywgZnJhbWVJRCk7CiAKICAgICAvLyBBZGQgdGhlIGZyYW1lIHRvIHRo ZSBwcm9jZXNzIHdpZGUgbWFwLgogICAgIG1fcHJvY2Vzcy0+ZnJhbWVDcmVhdGVkKGZyYW1lSUQs ICptX21haW5GcmFtZSk7Ci0KLSAgICBpZiAobV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIpIHsK LSAgICAgICAgbV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIoKTsKLSAgICAgICAgbV9tYWluRnJh bWVDcmVhdGlvbkhhbmRsZXIgPSBudWxscHRyOwotICAgIH0KIH0KIAogdm9pZCBXZWJQYWdlUHJv eHk6OmRpZENyZWF0ZVN1YmZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCiB7CiAgICAgUGFnZUNsaWVu dFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAotICAgIE1FU1NBR0VfQ0hFQ0so bV9tYWluRnJhbWUpOworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBtX21haW5G cmFtZSk7CiAKICAgICAvLyBUaGUgRGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvblN5bmMg SVBDIGlzIHN5bmNocm9ub3VzIGFuZCBtYXkgdGhlcmVmb3JlIGdldCBwcm9jZXNzZWQgYmVmb3Jl IHRoZSBEaWRDcmVhdGVTdWJmcmFtZSBvbmUuCiAgICAgLy8gV2hlbiB0aGlzIGhhcHBlbnMsIGRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25TeW5jKCkgY2FsbHMgZGlkQ3JlYXRlU3ViZnJh bWUoKSBhbmQgd2UgbmVlZCB0byBpZ25vcmUgdGhlIERpZENyZWF0ZVN1YmZyYW1lCkBAIC0zNzEz LDcgKzM2ODUsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlU3ViZnJhbWUodWludDY0 X3QgZnJhbWVJRCkKICAgICBpZiAobV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MtPmNhbkNyZWF0ZUZyYW1l KGZyYW1lSUQpKTsKKyAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgbV9wcm9jZXNz LT5jYW5DcmVhdGVGcmFtZShmcmFtZUlEKSk7CiAgICAgCiAgICAgYXV0byBzdWJGcmFtZSA9IFdl YkZyYW1lUHJveHk6OmNyZWF0ZSgqdGhpcywgZnJhbWVJRCk7CiAKQEAgLTM3MjMsMTAgKzM2OTUs NiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlU3ViZnJhbWUodWludDY0X3QgZnJhbWVJ RCkKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVdpbmRvdyh1aW50NjRfdCBmcmFtZUlE LCBHbG9iYWxXaW5kb3dJZGVudGlmaWVyJiYgd2luZG93SWRlbnRpZmllcikKIHsKLSAgICBpZiAo bV9tYWluRnJhbWUgJiYgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSA9PSBmcmFtZUlEKSB7Ci0gICAg ICAgIGlmIChhdXRvIG1haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlciA9IFdURk1vdmUobV9t YWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIpKQotICAgICAgICAgICAgbWFpbkZyYW1lV2lu ZG93Q3JlYXRpb25IYW5kbGVyKHdpbmRvd0lkZW50aWZpZXIpOwotICAgIH0KIH0KIAogZG91Ymxl IFdlYlBhZ2VQcm94eTo6ZXN0aW1hdGVkUHJvZ3Jlc3MoKSBjb25zdApAQCAtMzc3OSwzMyArMzc0 NywzNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRGVzdHJveU5hdmlnYXRpb24odWludDY0X3Qg bmF2aWdhdGlvbklEKQogewogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VD bGllbnQoKSk7CiAKKyAgICAvLyBPbiBwcm9jZXNzLXN3YXAsIHRoZSBwcmV2aW91cyBwcm9jZXNz IHRyaWVzIHRvIGRlc3Ryb3kgdGhlIG5hdmlnYXRpb24gYnV0IHRoZSBwcm92aXNpb25hbCBwcm9j ZXNzIGlzIGFjdHVhbGx5IHRha2luZyBvdmVyIHRoZSBuYXZpZ2F0aW9uLgorICAgIGlmIChtX3By b3Zpc2lvbmFsUGFnZSAmJiBtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkgPT0gbmF2 aWdhdGlvbklEKQorICAgICAgICByZXR1cm47CisKICAgICAvLyBGSVhNRTogTWVzc2FnZSBjaGVj ayB0aGUgbmF2aWdhdGlvbklELgogICAgIG1fbmF2aWdhdGlvblN0YXRlLT5kaWREZXN0cm95TmF2 aWdhdGlvbihuYXZpZ2F0aW9uSUQpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkU3RhcnRQ cm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0 aW9uSUQsIFVSTCYmIHVybCwgVVJMJiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJEYXRhJiB1 c2VyRGF0YSkKK3sKKyAgICBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKG1f cHJvY2VzcywgZnJhbWVJRCwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKHVybCksIFdURk1vdmUodW5y ZWFjaGFibGVVUkwpLCB1c2VyRGF0YSk7Cit9CisKK3ZvaWQgV2ViUGFnZVByb3h5OjpkaWRTdGFy dFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKFdlYlByb2Nlc3NQcm94eSYgcHJvY2Vzcywg dWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiB1cmwsIFVSTCYm IHVucmVhY2hhYmxlVVJMLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCiB7CiAgICAgUGFnZUNs aWVudFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAotICAgIFdlYkZyYW1lUHJv eHkqIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NI RUNLKGZyYW1lKTsKLSAgICBNRVNTQUdFX0NIRUNLX1VSTCh1cmwpOworICAgIFdlYkZyYW1lUHJv eHkqIGZyYW1lID0gcHJvY2Vzcy53ZWJGcmFtZShmcmFtZUlEKTsKKyAgICBNRVNTQUdFX0NIRUNL KHByb2Nlc3MsIGZyYW1lKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChwcm9jZXNzLCB1cmwpOwog CiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBtZXNzYWdlIGNoZWNrIHRoYXQgbmF2aWdhdGlvbklE IGlzIG5vdCB6ZXJvIGhlcmUsIGJ1dCBpdCdzIGN1cnJlbnRseSB6ZXJvIGZvciBzb21lIG5hdmln YXRpb25zIHRocm91Z2ggdGhlIHBhZ2UgY2FjaGUuCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlv bj4gbmF2aWdhdGlvbjsKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkgJiYgbmF2aWdhdGlv bklEKQogICAgICAgICBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlvbihu YXZpZ2F0aW9uSUQpOwogCi0gICAgLy8gSWYgdGhpcyBzZWVtaW5nbHkgbmV3IGxvYWQgaXMgYWN0 dWFsbHkgY29udGludWluZyBhIHNlcnZlciByZWRpcmVjdCBmb3IgYSBwcmV2aW91cyBuYXZpZ2F0 aW9uIGluIGEgbmV3IHByb2Nlc3MsCi0gICAgLy8gdGhlbiB3ZSBpZ25vcmUgdGhpcyBub3RpZmlj YXRpb24uCi0gICAgaWYgKG5hdmlnYXRpb24gJiYgbmF2aWdhdGlvbi0+Y3VycmVudFJlcXVlc3RJ c1JlZGlyZWN0KCkpIHsKLSAgICAgICAgYXV0byBuYXZpZ2F0aW9uUHJvY2Vzc0lkZW50aWZpZXIg PSBuYXZpZ2F0aW9uLT5jdXJyZW50UmVxdWVzdFByb2Nlc3NJZGVudGlmaWVyKCk7Ci0gICAgICAg IGlmIChuYXZpZ2F0aW9uUHJvY2Vzc0lkZW50aWZpZXIgJiYgKm5hdmlnYXRpb25Qcm9jZXNzSWRl bnRpZmllciAhPSBtX3Byb2Nlc3MtPmNvcmVQcm9jZXNzSWRlbnRpZmllcigpKQotICAgICAgICAg ICAgcmV0dXJuOwotICAgIH0KLQotICAgIExPRyhMb2FkaW5nLCAiV2ViUGFnZVByb3h5ICUiIFBS SXU2NCAiIGluIHByb2Nlc3MgcGlkICVpIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUg dG8gZnJhbWVJRCAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEICUiIFBSSXU2NCAiLCB1cmwgJXMi LCBtX3BhZ2VJRCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBmcmFtZUlELCBuYXZp Z2F0aW9uSUQsIHVybC5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKLSAgICBSRUxFQVNFX0xPR19J Rl9BTExPV0VEKExvYWRpbmcsICJkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOiB3ZWJQ SUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQsIG1fcHJv Y2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQsIGZyYW1lSUQpOworICAgIExPRyhM b2FkaW5nLCAiV2ViUGFnZVByb3h5ICUiIFBSSXU2NCAiIGluIHByb2Nlc3MgcGlkICVpIGRpZFN0 YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUgdG8gZnJhbWVJRCAlIiBQUkl1NjQgIiwgbmF2aWdh dGlvbklEICUiIFBSSXU2NCAiLCB1cmwgJXMiLCBtX3BhZ2VJRCwgcHJvY2Vzcy5wcm9jZXNzSWRl bnRpZmllcigpLCBmcmFtZUlELCBuYXZpZ2F0aW9uSUQsIHVybC5zdHJpbmcoKS51dGY4KCkuZGF0 YSgpKTsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJkaWRTdGFydFByb3Zp c2lvbmFsTG9hZEZvckZyYW1lOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZy YW1lSUQgPSAlIiBQUkl1NjQsIHByb2Nlc3MucHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQs IGZyYW1lSUQpOwogCiAgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFnZUxvYWRTdGF0ZS50cmFu c2FjdGlvbigpOwogCkBAIC0zODI0LDIxICszNzkzLDI2IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpk aWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90 IG5hCiAKICAgICBtX3BhZ2VMb2FkU3RhdGUuY29tbWl0Q2hhbmdlcygpOwogICAgIGlmIChtX2xv YWRlckNsaWVudCkKLSAgICAgICAgbV9sb2FkZXJDbGllbnQtPmRpZFN0YXJ0UHJvdmlzaW9uYWxM b2FkRm9yRnJhbWUoKnRoaXMsICpmcmFtZSwgbmF2aWdhdGlvbi5nZXQoKSwgbV9wcm9jZXNzLT50 cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVzZXJEYXRhLm9iamVjdCgpKS5nZXQoKSk7CisgICAg ICAgIG1fbG9hZGVyQ2xpZW50LT5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKCp0aGlz LCAqZnJhbWUsIG5hdmlnYXRpb24uZ2V0KCksIHByb2Nlc3MudHJhbnNmb3JtSGFuZGxlc1RvT2Jq ZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOwogICAgIGVsc2UgaWYgKGZyYW1lLT5pc01h aW5GcmFtZSgpKQotICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZFN0YXJ0UHJvdmlzaW9u YWxOYXZpZ2F0aW9uKCp0aGlzLCBuYXZpZ2F0aW9uLmdldCgpLCBtX3Byb2Nlc3MtPnRyYW5zZm9y bUhhbmRsZXNUb09iamVjdHModXNlckRhdGEub2JqZWN0KCkpLmdldCgpKTsKKyAgICAgICAgbV9u YXZpZ2F0aW9uQ2xpZW50LT5kaWRTdGFydFByb3Zpc2lvbmFsTmF2aWdhdGlvbigqdGhpcywgbmF2 aWdhdGlvbi5nZXQoKSwgcHJvY2Vzcy50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVzZXJEYXRh Lm9iamVjdCgpKS5nZXQoKSk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRSZWNlaXZlU2Vy dmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1 aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIGNvbnN0IFVz ZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92 aXNpb25hbExvYWRGb3JGcmFtZVNoYXJlZChtX3Byb2Nlc3MsIGZyYW1lSUQsIG5hdmlnYXRpb25J RCwgV1RGTW92ZShyZXF1ZXN0KSwgdXNlckRhdGEpOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6 ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWVTaGFyZWQo V2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzLCB1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZp Z2F0aW9uSUQsIFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIGNvbnN0IFVzZXJEYXRhJiB1c2Vy RGF0YSkKIHsKICAgICBMT0coTG9hZGluZywgIldlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVNlcnZl clJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUgdG8gZnJhbWVJRCAlIiBQUkl1NjQg IiwgbmF2aWdhdGlvbklEICUiIFBSSXU2NCAiLCB1cmwgJXMiLCBmcmFtZUlELCBuYXZpZ2F0aW9u SUQsIHJlcXVlc3QudXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7Ci0gICAgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlz aW9uYWxMb2FkRm9yRnJhbWU6IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJh bWVJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJ RCwgZnJhbWVJRCk7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiZGlkUmVj ZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6IHdlYlBJRCA9ICVp LCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCwgcHJvY2Vzcy5wcm9j ZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCwgZnJhbWVJRCk7CiAKICAgICBQYWdlQ2xpZW50UHJv dGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCi0gICAgV2ViRnJhbWVQcm94eSogZnJh bWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0VfQ0hFQ0soZnJh bWUpOwotICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHJlcXVlc3QudXJsKCkpOworICAgIFdlYkZyYW1l UHJveHkqIGZyYW1lID0gcHJvY2Vzcy53ZWJGcmFtZShmcmFtZUlEKTsKKyAgICBNRVNTQUdFX0NI RUNLKHByb2Nlc3MsIGZyYW1lKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChwcm9jZXNzLCByZXF1 ZXN0LnVybCgpKTsKIAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbWVzc2FnZSBjaGVjayB0aGF0 IG5hdmlnYXRpb25JRCBpcyBub3QgemVybyBoZXJlLCBidXQgaXQncyBjdXJyZW50bHkgemVybyBm b3Igc29tZSBuYXZpZ2F0aW9ucyB0aHJvdWdoIHRoZSBwYWdlIGNhY2hlLgogICAgIFJlZlB0cjxB UEk6Ok5hdmlnYXRpb24+IG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uSUQgPyBuYXZpZ2F0aW9uU3Rh dGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCkgOiBudWxscHRyOwpAQCAtMzg1NCw5ICszODI4 LDkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zp c2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGYKIAogICAgIG1fcGFnZUxvYWRTdGF0ZS5jb21t aXRDaGFuZ2VzKCk7CiAgICAgaWYgKG1fbG9hZGVyQ2xpZW50KQotICAgICAgICBtX2xvYWRlckNs aWVudC0+ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUo KnRoaXMsICpmcmFtZSwgZnJhbWUtPmlzTWFpbkZyYW1lKCkgPyBuYXZpZ2F0aW9uLmdldCgpIDog bnVsbHB0ciwgbV9wcm9jZXNzLT50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVzZXJEYXRhLm9i amVjdCgpKS5nZXQoKSk7CisgICAgICAgIG1fbG9hZGVyQ2xpZW50LT5kaWRSZWNlaXZlU2VydmVy UmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSgqdGhpcywgKmZyYW1lLCBmcmFtZS0+ aXNNYWluRnJhbWUoKSA/IG5hdmlnYXRpb24uZ2V0KCkgOiBudWxscHRyLCBwcm9jZXNzLnRyYW5z Zm9ybUhhbmRsZXNUb09iamVjdHModXNlckRhdGEub2JqZWN0KCkpLmdldCgpKTsKICAgICBlbHNl IGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSkKLSAgICAgICAgbV9uYXZpZ2F0aW9uQ2xpZW50LT5k aWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbE5hdmlnYXRpb24oKnRoaXMsIG5h dmlnYXRpb24uZ2V0KCksIG1fcHJvY2Vzcy0+dHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1c2Vy RGF0YS5vYmplY3QoKSkuZ2V0KCkpOworICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZFJl Y2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTmF2aWdhdGlvbigqdGhpcywgbmF2aWdh dGlvbi5nZXQoKSwgcHJvY2Vzcy50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVzZXJEYXRhLm9i amVjdCgpKS5nZXQoKSk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5Ojp3aWxsUGVyZm9ybUNsaWVu dFJlZGlyZWN0Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGRv dWJsZSBkZWxheSwgV2ViQ29yZTo6TG9ja0JhY2tGb3J3YXJkTGlzdCkKQEAgLTM4NjYsNyArMzg0 MCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp3aWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0Rm9yRnJh bWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU3RyCiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBw cm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9w cm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKKyAg ICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgZnJhbWUpOwogCiAgICAgaWYgKGZyYW1l LT5pc01haW5GcmFtZSgpKQogICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPndpbGxQZXJmb3Jt Q2xpZW50UmVkaXJlY3QoKnRoaXMsIHVybCwgZGVsYXkpOwpAQCAtMzg3OSwyMCArMzg1MywyNSBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3RGb3JGcmFtZSh1aW50 NjRfdCBmcmFtZUlEKQogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGll bnQoKSk7CiAKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUo ZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CisgICAgTUVTU0FHRV9DSEVDSyht X3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKIAogICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSkK ICAgICAgICAgbV9uYXZpZ2F0aW9uQ2xpZW50LT5kaWRDYW5jZWxDbGllbnRSZWRpcmVjdCgqdGhp cyk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpkaWRDaGFuZ2VQcm92aXNpb25hbFVSTEZvckZy YW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90LCBVUkwmJiB1cmwpCit2b2lkIFdlYlBhZ2VQ cm94eTo6ZGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1 aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmIHVybCkKK3sKKyAgICBkaWRDaGFuZ2VQcm92aXNp b25hbFVSTEZvckZyYW1lU2hhcmVkKG1fcHJvY2VzcywgZnJhbWVJRCwgbmF2aWdhdGlvbklELCBX VEZNb3ZlKHVybCkpOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ2hhbmdlUHJvdmlzaW9u YWxVUkxGb3JGcmFtZVNoYXJlZChXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIHVpbnQ2NF90IGZy YW1lSUQsIHVpbnQ2NF90LCBVUkwmJiB1cmwpCiB7CiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBw cm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAotICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9w cm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKLSAg ICBNRVNTQUdFX0NIRUNLKGZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLnN0YXRlKCkgPT0gRnJhbWVM b2FkU3RhdGU6OlN0YXRlOjpQcm92aXNpb25hbCk7Ci0gICAgTUVTU0FHRV9DSEVDS19VUkwodXJs KTsKKyAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IHByb2Nlc3Mud2ViRnJhbWUoZnJhbWVJRCk7 CisgICAgTUVTU0FHRV9DSEVDSyhwcm9jZXNzLCBmcmFtZSk7CisgICAgTUVTU0FHRV9DSEVDSyhw cm9jZXNzLCBmcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5zdGF0ZSgpID09IEZyYW1lTG9hZFN0YXRl OjpTdGF0ZTo6UHJvdmlzaW9uYWwpOworICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHByb2Nlc3MsIHVy bCk7CiAKICAgICBhdXRvIHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9u KCk7CiAKQEAgLTM5MDYsMTYgKzM4ODUsMjYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZENoYW5n ZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QsIFUKIAog dm9pZCBXZWJQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRf dCBmcmFtZUlELCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4s IHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29u c3QgUmVzb3VyY2VFcnJvciYgZXJyb3IsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKIHsKLSAg ICBMT0coTG9hZGluZywgIihMb2FkaW5nKSBXZWJQYWdlUHJveHkgJSIgUFJJdTY0ICIgaW4gd2Vi IHByb2Nlc3MgcGlkICVpIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSB0byBwcm92aXNp b25hbFVSTCAlcyIsIG1fcGFnZUlELCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIHBy b3Zpc2lvbmFsVVJMLnV0ZjgoKS5kYXRhKCkpOwotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQo UHJvY2VzcywgImRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZTogd2ViUElEID0gJWksIHBh Z2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIGRvbWFpbiA9ICVzLCBj b2RlID0gJWQiLCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlELCBmcmFt ZUlELCBlcnJvci5kb21haW4oKS51dGY4KCkuZGF0YSgpLCBlcnJvci5lcnJvckNvZGUoKSk7Cisg ICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlICYmIG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9u SUQoKSA9PSBuYXZpZ2F0aW9uSUQpIHsKKyAgICAgICAgLy8gVGhlIGxvYWQgZGlkIG5vdCBmYWls LCBpdCBpcyBtZXJlbHkgaGFwcGVuaW5nIGluIGEgbmV3IHByb3Zpc2lvbmFsIHByb2Nlc3MuCisg ICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJh bWVTaGFyZWQobV9wcm9jZXNzLCBmcmFtZUlELCBmcmFtZVNlY3VyaXR5T3JpZ2luLCBuYXZpZ2F0 aW9uSUQsIHByb3Zpc2lvbmFsVVJMLCBlcnJvciwgdXNlckRhdGEpOworfQorCit2b2lkIFdlYlBh Z2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKFdlYlByb2Nlc3NQ cm94eSYgcHJvY2VzcywgdWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2VjdXJpdHlPcmlnaW5EYXRh JiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmlu ZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yLCBjb25zdCBVc2Vy RGF0YSYgdXNlckRhdGEpCit7CisgICAgTE9HKExvYWRpbmcsICIoTG9hZGluZykgV2ViUGFnZVBy b3h5ICUiIFBSSXU2NCAiIGluIHdlYiBwcm9jZXNzIHBpZCAlaSBkaWRGYWlsUHJvdmlzaW9uYWxM b2FkRm9yRnJhbWUgdG8gcHJvdmlzaW9uYWxVUkwgJXMiLCBtX3BhZ2VJRCwgcHJvY2Vzcy5wcm9j ZXNzSWRlbnRpZmllcigpLCBwcm92aXNpb25hbFVSTC51dGY4KCkuZGF0YSgpKTsKKyAgICBSRUxF QVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3MsICJkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJh bWU6IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2 NCAiLCBkb21haW4gPSAlcywgY29kZSA9ICVkIiwgcHJvY2Vzcy5wcm9jZXNzSWRlbnRpZmllcigp LCBtX3BhZ2VJRCwgZnJhbWVJRCwgZXJyb3IuZG9tYWluKCkudXRmOCgpLmRhdGEoKSwgZXJyb3Iu ZXJyb3JDb2RlKCkpOwogCiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNs aWVudCgpKTsKIAotICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFt ZShmcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKKyAgICBXZWJGcmFtZVByb3h5 KiBmcmFtZSA9IHByb2Nlc3Mud2ViRnJhbWUoZnJhbWVJRCk7CisgICAgTUVTU0FHRV9DSEVDSyht X3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKIAogICAgIGlmIChtX2NvbnRyb2xsZWRCeUF1dG9tYXRp b24pIHsKLSAgICAgICAgaWYgKGF1dG8qIGF1dG9tYXRpb25TZXNzaW9uID0gcHJvY2VzcygpLnBy b2Nlc3NQb29sKCkuYXV0b21hdGlvblNlc3Npb24oKSkKKyAgICAgICAgaWYgKGF1dG8qIGF1dG9t YXRpb25TZXNzaW9uID0gcHJvY2Vzcy5wcm9jZXNzUG9vbCgpLmF1dG9tYXRpb25TZXNzaW9uKCkp CiAgICAgICAgICAgICBhdXRvbWF0aW9uU2Vzc2lvbi0+bmF2aWdhdGlvbk9jY3VycmVkRm9yRnJh bWUoKmZyYW1lKTsKICAgICB9CiAKQEAgLTM5NDAsMTUgKzM5MjksMTkgQEAgdm9pZCBXZWJQYWdl UHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBj b25zdCBTZWN1cmkKICAgICBtX2ZhaWxpbmdQcm92aXNpb25hbExvYWRVUkwgPSBwcm92aXNpb25h bFVSTDsKIAogICAgIGlmIChtX2xvYWRlckNsaWVudCkKLSAgICAgICAgbV9sb2FkZXJDbGllbnQt PmRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZSgqdGhpcywgKmZyYW1lLCBu YXZpZ2F0aW9uLmdldCgpLCBlcnJvciwgbV9wcm9jZXNzLT50cmFuc2Zvcm1IYW5kbGVzVG9PYmpl Y3RzKHVzZXJEYXRhLm9iamVjdCgpKS5nZXQoKSk7CisgICAgICAgIG1fbG9hZGVyQ2xpZW50LT5k aWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWUoKnRoaXMsICpmcmFtZSwgbmF2 aWdhdGlvbi5nZXQoKSwgZXJyb3IsIHByb2Nlc3MudHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1 c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOwogICAgIGVsc2UgaWYgKGZyYW1lLT5pc01haW5GcmFt ZSgpKQotICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZEZhaWxQcm92aXNpb25hbE5hdmln YXRpb25XaXRoRXJyb3IoKnRoaXMsICpmcmFtZSwgbmF2aWdhdGlvbi5nZXQoKSwgZXJyb3IsIG1f cHJvY2Vzcy0+dHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0 KCkpOworICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZEZhaWxQcm92aXNpb25hbE5hdmln YXRpb25XaXRoRXJyb3IoKnRoaXMsICpmcmFtZSwgbmF2aWdhdGlvbi5nZXQoKSwgZXJyb3IsIHBy b2Nlc3MudHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkp OwogICAgIGVsc2UgewotICAgICAgICAgICAgLy8gRklYTUU6IEdldCB0aGUgbWFpbiBmcmFtZSdz IGN1cnJlbnQgbmF2aWdhdGlvbi4KLSAgICAgICAgICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ZGlk RmFpbFByb3Zpc2lvbmFsTG9hZEluU3ViZnJhbWVXaXRoRXJyb3IoKnRoaXMsICpmcmFtZSwgZnJh bWVTZWN1cml0eU9yaWdpbiwgbnVsbHB0ciwgZXJyb3IsIG1fcHJvY2Vzcy0+dHJhbnNmb3JtSGFu ZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOworICAgICAgICAvLyBGSVhN RTogR2V0IHRoZSBtYWluIGZyYW1lJ3MgY3VycmVudCBuYXZpZ2F0aW9uLgorICAgICAgICBtX25h dmlnYXRpb25DbGllbnQtPmRpZEZhaWxQcm92aXNpb25hbExvYWRJblN1YmZyYW1lV2l0aEVycm9y KCp0aGlzLCAqZnJhbWUsIGZyYW1lU2VjdXJpdHlPcmlnaW4sIG51bGxwdHIsIGVycm9yLCBwcm9j ZXNzLnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHModXNlckRhdGEub2JqZWN0KCkpLmdldCgpKTsK ICAgICB9CiAKICAgICBtX2ZhaWxpbmdQcm92aXNpb25hbExvYWRVUkwgPSB7IH07CisKKyAgICAv LyBJZiB0aGUgcHJvdmlzaW9uYWwgcGFnZSdzIGxvYWQgZmFpbHMgdGhlbiB3ZSBkZXN0cm95IHRo ZSBwcm92aXNpb25hbCBwYWdlLgorICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZSAmJiBtX3Byb3Zp c2lvbmFsUGFnZS0+bWFpbkZyYW1lKCkgPT0gZnJhbWUpCisgICAgICAgIG1fcHJvdmlzaW9uYWxQ YWdlID0gbnVsbHB0cjsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmNsZWFyTG9hZERlcGVuZGVu dENhbGxiYWNrcygpCkBAIC0zOTY5LDcgKzM5NjIsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlk Q29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25J RAogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKICAg ICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0g ICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CisgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0 KCksIGZyYW1lKTsKIAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbWVzc2FnZSBjaGVjayB0aGF0 IG5hdmlnYXRpb25JRCBpcyBub3QgemVybyBoZXJlLCBidXQgaXQncyBjdXJyZW50bHkgemVybyBm b3Igc29tZSBuYXZpZ2F0aW9ucyB0aHJvdWdoIHRoZSBwYWdlIGNhY2hlLgogICAgIFJlZlB0cjxB UEk6Ok5hdmlnYXRpb24+IG5hdmlnYXRpb247CkBAIC00MDYzLDcgKzQwNTYsNyBAQCB2b2lkIFdl YlBhZ2VQcm94eTo6ZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJ RCwgdWludDY0X3QgbmF2aQogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VD bGllbnQoKSk7CiAKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJh bWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CisgICAgTUVTU0FHRV9DSEVD SyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKIAogICAgIGlmIChtX2NvbnRyb2xsZWRCeUF1dG9t YXRpb24pIHsKICAgICAgICAgaWYgKGF1dG8qIGF1dG9tYXRpb25TZXNzaW9uID0gcHJvY2Vzcygp LnByb2Nlc3NQb29sKCkuYXV0b21hdGlvblNlc3Npb24oKSkKQEAgLTQwODcsNyArNDA4MCw3IEBA IHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGaW5pc2hMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJ RCwgdWludDY0X3QgbmF2aWdhdGlvbklECiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90ZWN0 b3IocGFnZUNsaWVudCgpKTsKIAogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9wcm9jZXNz LT53ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKKyAgICBNRVNT QUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgZnJhbWUpOwogCiAgICAgLy8gRklYTUU6IFdlIHNo b3VsZCBtZXNzYWdlIGNoZWNrIHRoYXQgbmF2aWdhdGlvbklEIGlzIG5vdCB6ZXJvIGhlcmUsIGJ1 dCBpdCdzIGN1cnJlbnRseSB6ZXJvIGZvciBzb21lIG5hdmlnYXRpb25zIHRocm91Z2ggdGhlIHBh Z2UgY2FjaGUuCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gbmF2aWdhdGlvbjsKQEAgLTQx MzIsNyArNDEyNSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGYWlsTG9hZEZvckZyYW1lKHVp bnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwKICAgICBQYWdlQ2xpZW50UHJv dGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCiAgICAgV2ViRnJhbWVQcm94eSogZnJh bWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0VfQ0hFQ0soZnJh bWUpOworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBmcmFtZSk7CiAKICAgICAv LyBGSVhNRTogV2Ugc2hvdWxkIG1lc3NhZ2UgY2hlY2sgdGhhdCBuYXZpZ2F0aW9uSUQgaXMgbm90 IHplcm8gaGVyZSwgYnV0IGl0J3MgY3VycmVudGx5IHplcm8gZm9yIHNvbWUgbmF2aWdhdGlvbnMg dGhyb3VnaCB0aGUgcGFnZSBjYWNoZS4KICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBuYXZp Z2F0aW9uOwpAQCAtNDE3NCw4ICs0MTY3LDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFNhbWVE b2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdAogICAg IFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKICAgICBXZWJG cmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVT U0FHRV9DSEVDSyhmcmFtZSk7Ci0gICAgTUVTU0FHRV9DSEVDS19VUkwodXJsKTsKKyAgICBNRVNT QUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgZnJhbWUpOworICAgIE1FU1NBR0VfQ0hFQ0tfVVJM KG1fcHJvY2Vzcy5nZXQoKSwgdXJsKTsKIAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbWVzc2Fn ZSBjaGVjayB0aGF0IG5hdmlnYXRpb25JRCBpcyBub3QgemVybyBoZXJlLCBidXQgaXQncyBjdXJy ZW50bHkgemVybyBmb3Igc29tZSBuYXZpZ2F0aW9ucyB0aHJvdWdoIHRoZSBwYWdlIGNhY2hlLgog ICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IG5hdmlnYXRpb247CkBAIC00MjI3LDcgKzQyMjAs NyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWUodWludDY0X3Qg ZnJhbWVJRCwgY29uc3QgU3RyaW5nJiB0aXRsZQogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJv dGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJv Y2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CisgICAg TUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKIAogICAgIGF1dG8gdHJhbnNh Y3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKIApAQCAtNDI1Myw3ICs0MjQ2 LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZv ckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnMKICAgICBQYWdlQ2xpZW50UHJvdGVjdG9yIHBy b3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBtX3By b2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOworICAg IE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBmcmFtZSk7CiAKICAgICBpZiAobV9sb2Fk ZXJDbGllbnQpCiAgICAgICAgIG1fbG9hZGVyQ2xpZW50LT5kaWRGaXJzdFZpc3VhbGx5Tm9uRW1w dHlMYXlvdXRGb3JGcmFtZSgqdGhpcywgKmZyYW1lLCBtX3Byb2Nlc3MtPnRyYW5zZm9ybUhhbmRs ZXNUb09iamVjdHModXNlckRhdGEub2JqZWN0KCkpLmdldCgpKTsKQEAgLTQyODQsNyArNDI3Nyw3 IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWREaXNwbGF5SW5zZWN1cmVDb250ZW50Rm9yRnJhbWUo dWludDY0X3QgZnJhbWVJRCwgY29uc3QgVXNlCiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90 ZWN0b3IocGFnZUNsaWVudCgpKTsKIAogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9wcm9j ZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKKyAgICBN RVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgZnJhbWUpOwogCiAgICAgYXV0byB0cmFuc2Fj dGlvbiA9IG1fcGFnZUxvYWRTdGF0ZS50cmFuc2FjdGlvbigpOwogICAgIG1fcGFnZUxvYWRTdGF0 ZS5kaWREaXNwbGF5T3JSdW5JbnNlY3VyZUNvbnRlbnQodHJhbnNhY3Rpb24pOwpAQCAtNDI5OCw3 ICs0MjkxLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJ1bkluc2VjdXJlQ29udGVudEZvckZy YW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFVzZXJEYXQKICAgICBQYWdlQ2xpZW50UHJvdGVj dG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUg PSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUp OworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBmcmFtZSk7CiAKICAgICBhdXRv IHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CiAgICAgbV9wYWdl TG9hZFN0YXRlLmRpZERpc3BsYXlPclJ1bkluc2VjdXJlQ29udGVudCh0cmFuc2FjdGlvbik7CkBA IC00MzIxLDcgKzQzMTQsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZnJhbWVEaWRCZWNvbWVGcmFt ZVNldCh1aW50NjRfdCBmcmFtZUlELCBib29sIHZhbHVlKQogICAgIFBhZ2VDbGllbnRQcm90ZWN0 b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9 IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7 CisgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKIAogICAgIGZyYW1l LT5zZXRJc0ZyYW1lU2V0KHZhbHVlKTsKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpCkBA IC00MzM3LDE1ICs0MzMwLDIwIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpiZWdpblNhZmVCcm93c2lu Z0NoZWNrKGNvbnN0IFVSTCYsIGJvb2wsIFdlYkZyYW1lUG9saWN5TGlzdGVuCiAKIHZvaWQgV2Vi UGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmModWludDY0X3Qg ZnJhbWVJRCwgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiYgZnJhbWVTZWN1cml0eU9yaWdp biwgdWludDY0X3QgbmF2aWdhdGlvbklELCBOYXZpZ2F0aW9uQWN0aW9uRGF0YSYmIG5hdmlnYXRp b25BY3Rpb25EYXRhLCBGcmFtZUluZm9EYXRhJiYgZnJhbWVJbmZvRGF0YSwgdWludDY0X3Qgb3Jp Z2luYXRpbmdQYWdlSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxS ZXF1ZXN0LCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBJUEM6OkZvcm1EYXRh UmVmZXJlbmNlJiYgcmVxdWVzdEJvZHksIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmJiByZWRp cmVjdFJlc3BvbnNlLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEsIHVpbnQ2NF90IGxpc3RlbmVy SUQpCiB7Ci0gICAgYXV0byogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwot ICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOworICAgIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb25Bc3luY1NoYXJlZChtX3Byb2Nlc3MsIGZyYW1lSUQsIFdURk1vdmUoZnJhbWVTZWN1cml0 eU9yaWdpbiksIG5hdmlnYXRpb25JRCwgV1RGTW92ZShuYXZpZ2F0aW9uQWN0aW9uRGF0YSksIFdU Rk1vdmUoZnJhbWVJbmZvRGF0YSksIG9yaWdpbmF0aW5nUGFnZUlELCBvcmlnaW5hbFJlcXVlc3Qs IFdURk1vdmUocmVxdWVzdCksIFdURk1vdmUocmVxdWVzdEJvZHkpLCBXVEZNb3ZlKHJlZGlyZWN0 UmVzcG9uc2UpLCB1c2VyRGF0YSwgbGlzdGVuZXJJRCk7Cit9CisKK3ZvaWQgV2ViUGFnZVByb3h5 OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmNTaGFyZWQoV2ViUHJvY2Vzc1By b3h5JiBwcm9jZXNzLCB1aW50NjRfdCBmcmFtZUlELCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRh dGEmJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIE5hdmlnYXRp b25BY3Rpb25EYXRhJiYgbmF2aWdhdGlvbkFjdGlvbkRhdGEsIEZyYW1lSW5mb0RhdGEmJiBmcmFt ZUluZm9EYXRhLCB1aW50NjRfdCBvcmlnaW5hdGluZ1BhZ2VJRCwgY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiBvcmlnaW5hbFJlcXVlc3QsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYm IHJlcXVlc3QsIElQQzo6Rm9ybURhdGFSZWZlcmVuY2UmJiByZXF1ZXN0Qm9keSwgV2ViQ29yZTo6 UmVzb3VyY2VSZXNwb25zZSYmIHJlZGlyZWN0UmVzcG9uc2UsIGNvbnN0IFVzZXJEYXRhJiB1c2Vy RGF0YSwgdWludDY0X3QgbGlzdGVuZXJJRCkKK3sKKyAgICBhdXRvKiBmcmFtZSA9IHByb2Nlc3Mu d2ViRnJhbWUoZnJhbWVJRCk7CisgICAgTUVTU0FHRV9DSEVDSyhwcm9jZXNzLCBmcmFtZSk7CiAK LSAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKCpmcmFtZSwgV1RGTW92ZShmcmFt ZVNlY3VyaXR5T3JpZ2luKSwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb25E YXRhKSwgV1RGTW92ZShmcmFtZUluZm9EYXRhKSwgb3JpZ2luYXRpbmdQYWdlSUQsIG9yaWdpbmFs UmVxdWVzdCwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShyZXF1ZXN0Qm9keSksIFdURk1vdmUo cmVkaXJlY3RSZXNwb25zZSksIHVzZXJEYXRhLCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRl KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVy SURdIChhdXRvLi4uIGFyZ3MpIHsKLSAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlOjpEaWRSZWNlaXZlUG9saWN5RGVjaXNpb24oZnJhbWVJRCwgbGlzdGVuZXJJRCwgYXJn cy4uLiksIG1fcGFnZUlEKTsKKyAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKHBy b2Nlc3MsICpmcmFtZSwgV1RGTW92ZShmcmFtZVNlY3VyaXR5T3JpZ2luKSwgbmF2aWdhdGlvbklE LCBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb25EYXRhKSwgV1RGTW92ZShmcmFtZUluZm9EYXRhKSwg b3JpZ2luYXRpbmdQYWdlSUQsIG9yaWdpbmFsUmVxdWVzdCwgV1RGTW92ZShyZXF1ZXN0KSwgV1RG TW92ZShyZXF1ZXN0Qm9keSksIFdURk1vdmUocmVkaXJlY3RSZXNwb25zZSksIHVzZXJEYXRhLCBQ b2xpY3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJl ZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIHByb2Nlc3MgPSBtYWtlUmVmKHByb2Nlc3Mp XSAoYXV0by4uLiBhcmdzKSB7CisgICAgICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OkRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4u KSwgbV9wYWdlSUQpOwogICAgIH0pKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBv bGljeUZvck5hdmlnYXRpb25BY3Rpb24oV2ViRnJhbWVQcm94eSYgZnJhbWUsIFdlYkNvcmU6OlNl Y3VyaXR5T3JpZ2luRGF0YSYmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRp b25JRCwgTmF2aWdhdGlvbkFjdGlvbkRhdGEmJiBuYXZpZ2F0aW9uQWN0aW9uRGF0YSwgRnJhbWVJ bmZvRGF0YSYmIG9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0YSwgdWludDY0X3Qgb3JpZ2luYXRpbmdQ YWdlSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0LCBX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBJUEM6OkZvcm1EYXRhUmVmZXJlbmNl JiYgcmVxdWVzdEJvZHksIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmJiByZWRpcmVjdFJlc3Bv bnNlLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEsIFJlZjxQb2xpY3lEZWNpc2lvblNlbmRlcj4m JiBzZW5kZXIpCit2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFj dGlvbihXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIFdlYkZyYW1lUHJveHkmIGZyYW1lLCBXZWJD b3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBu YXZpZ2F0aW9uSUQsIE5hdmlnYXRpb25BY3Rpb25EYXRhJiYgbmF2aWdhdGlvbkFjdGlvbkRhdGEs IEZyYW1lSW5mb0RhdGEmJiBvcmlnaW5hdGluZ0ZyYW1lSW5mb0RhdGEsIHVpbnQ2NF90IG9yaWdp bmF0aW5nUGFnZUlELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVx dWVzdCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgSVBDOjpGb3JtRGF0YVJl ZmVyZW5jZSYmIHJlcXVlc3RCb2R5LCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYgcmVkaXJl Y3RSZXNwb25zZSwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhLCBSZWY8UG9saWN5RGVjaXNpb25T ZW5kZXI+JiYgc2VuZGVyKQogewogICAgIExPRyhMb2FkaW5nLCAiV2ViUGFnZVByb3h5OjpkZWNp ZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uIC0gT3JpZ2luYWwgVVJMICVzLCBjdXJyZW50IHRh cmdldCBVUkwgJXMiLCBvcmlnaW5hbFJlcXVlc3QudXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEo KSwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKIApAQCAtNDM2MCw4ICs0 MzU4LDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rp b24oV2ViRnJhbWVQcm94eSYgZnJhbWUsIFdlYkNvcmUKICAgICBpZiAoIWZyb21BUEkpCiAgICAg ICAgIG1fcGFnZUxvYWRTdGF0ZS5jbGVhclBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9u KTsKIAotICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHJlcXVlc3QudXJsKCkpOwotICAgIE1FU1NBR0Vf Q0hFQ0tfVVJMKG9yaWdpbmFsUmVxdWVzdC51cmwoKSk7CisgICAgTUVTU0FHRV9DSEVDS19VUkwo cHJvY2VzcywgcmVxdWVzdC51cmwoKSk7CisgICAgTUVTU0FHRV9DSEVDS19VUkwocHJvY2Vzcywg b3JpZ2luYWxSZXF1ZXN0LnVybCgpKTsKIAogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IG5h dmlnYXRpb247CiAgICAgaWYgKG5hdmlnYXRpb25JRCkKQEAgLTQzODcsNyArNDM4NSw3IEBAIHZv aWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdlYkZyYW1l UHJveHkmIGZyYW1lLCBXZWJDb3JlCiAgICAgfQogCiAgICAgdWludDY0X3QgbmV3TmF2aWdhdGlv bklEID0gbmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCk7Ci0gICAgbmF2aWdhdGlvbi0+c2V0Q3Vy cmVudFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3QpLCBtX3Byb2Nlc3MtPmNvcmVQcm9j ZXNzSWRlbnRpZmllcigpKTsKKyAgICBuYXZpZ2F0aW9uLT5zZXRDdXJyZW50UmVxdWVzdChSZXNv dXJjZVJlcXVlc3QocmVxdWVzdCksIHByb2Nlc3MuY29yZVByb2Nlc3NJZGVudGlmaWVyKCkpOwog ICAgIG5hdmlnYXRpb24tPnNldExhc3ROYXZpZ2F0aW9uQWN0aW9uKG5hdmlnYXRpb25BY3Rpb25E YXRhKTsKICAgICBuYXZpZ2F0aW9uLT5zZXRPcmlnaW5hdGluZ0ZyYW1lSW5mbyhvcmlnaW5hdGlu Z0ZyYW1lSW5mb0RhdGEpOwogICAgIG5hdmlnYXRpb24tPnNldERlc3RpbmF0aW9uRnJhbWVTZWN1 cml0eU9yaWdpbihmcmFtZVNlY3VyaXR5T3JpZ2luKTsKQEAgLTQ0NDYsNyArNDQ0NCw3IEBAIHZv aWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdlYkZyYW1l UHJveHkmIGZyYW1lLCBXZWJDb3JlCiAgICAgICAgIGJlZ2luU2FmZUJyb3dzaW5nQ2hlY2socmVx dWVzdC51cmwoKSwgZnJhbWUuaXNNYWluRnJhbWUoKSwgbGlzdGVuZXIpOwogCiAgICAgQVBJOjpO YXZpZ2F0aW9uKiBtYWluRnJhbWVOYXZpZ2F0aW9uID0gZnJhbWUuaXNNYWluRnJhbWUoKSA/IG5h dmlnYXRpb24uZ2V0KCkgOiBudWxscHRyOwotICAgIFdlYkZyYW1lUHJveHkqIG9yaWdpbmF0aW5n RnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKG9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0YS5mcmFt ZUlEKTsKKyAgICBXZWJGcmFtZVByb3h5KiBvcmlnaW5hdGluZ0ZyYW1lID0gcHJvY2Vzcy53ZWJG cmFtZShvcmlnaW5hdGluZ0ZyYW1lSW5mb0RhdGEuZnJhbWVJRCk7CiAKICNpZiBFTkFCTEUoUkVT T1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQogICAgIGlmIChhdXRvKiByZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUgPSB3ZWJzaXRlRGF0YVN0b3JlKCkucmVzb3VyY2VMb2FkU3RhdGlzdGljcygpKQpA QCAtNDQ1NSwyMSArNDQ1MywyMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9y TmF2aWdhdGlvbkFjdGlvbihXZWJGcmFtZVByb3h5JiBmcmFtZSwgV2ViQ29yZQogI2VuZGlmCiAK ICAgICBpZiAobV9wb2xpY3lDbGllbnQpCi0gICAgICAgIG1fcG9saWN5Q2xpZW50LT5kZWNpZGVQ b2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKCp0aGlzLCAmZnJhbWUsIFdURk1vdmUobmF2aWdhdGlv bkFjdGlvbkRhdGEpLCBvcmlnaW5hdGluZ0ZyYW1lLCBvcmlnaW5hbFJlcXVlc3QsIFdURk1vdmUo cmVxdWVzdCksIFdURk1vdmUobGlzdGVuZXIpLCBtX3Byb2Nlc3MtPnRyYW5zZm9ybUhhbmRsZXNU b09iamVjdHModXNlckRhdGEub2JqZWN0KCkpLmdldCgpKTsKKyAgICAgICAgbV9wb2xpY3lDbGll bnQtPmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oKnRoaXMsICZmcmFtZSwgV1RGTW92 ZShuYXZpZ2F0aW9uQWN0aW9uRGF0YSksIG9yaWdpbmF0aW5nRnJhbWUsIG9yaWdpbmFsUmVxdWVz dCwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShsaXN0ZW5lciksIHByb2Nlc3MudHJhbnNmb3Jt SGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOwogICAgIGVsc2Ugewog ICAgICAgICBhdXRvIGRlc3RpbmF0aW9uRnJhbWVJbmZvID0gQVBJOjpGcmFtZUluZm86OmNyZWF0 ZShmcmFtZSwgZnJhbWVTZWN1cml0eU9yaWdpbi5zZWN1cml0eU9yaWdpbigpKTsKICAgICAgICAg UmVmUHRyPEFQSTo6RnJhbWVJbmZvPiBzb3VyY2VGcmFtZUluZm87CiAgICAgICAgIGlmICghZnJv bUFQSSAmJiBvcmlnaW5hdGluZ0ZyYW1lID09ICZmcmFtZSkKICAgICAgICAgICAgIHNvdXJjZUZy YW1lSW5mbyA9IGRlc3RpbmF0aW9uRnJhbWVJbmZvLmNvcHlSZWYoKTsKICAgICAgICAgZWxzZSBp ZiAoIWZyb21BUEkpCi0gICAgICAgICAgICBzb3VyY2VGcmFtZUluZm8gPSBBUEk6OkZyYW1lSW5m bzo6Y3JlYXRlKG9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0YSwgb3JpZ2luYXRpbmdQYWdlSUQgPyBt X3Byb2Nlc3MtPndlYlBhZ2Uob3JpZ2luYXRpbmdQYWdlSUQpIDogbnVsbHB0cik7CisgICAgICAg ICAgICBzb3VyY2VGcmFtZUluZm8gPSBBUEk6OkZyYW1lSW5mbzo6Y3JlYXRlKG9yaWdpbmF0aW5n RnJhbWVJbmZvRGF0YSwgb3JpZ2luYXRpbmdQYWdlSUQgPyBwcm9jZXNzLndlYlBhZ2Uob3JpZ2lu YXRpbmdQYWdlSUQpIDogbnVsbHB0cik7CiAKLSAgICAgICAgYXV0byB1c2VySW5pdGlhdGVkQWN0 aXZpdHkgPSBtX3Byb2Nlc3MtPnVzZXJJbml0aWF0ZWRBY3Rpdml0eShuYXZpZ2F0aW9uQWN0aW9u RGF0YS51c2VyR2VzdHVyZVRva2VuSWRlbnRpZmllcik7CisgICAgICAgIGF1dG8gdXNlckluaXRp YXRlZEFjdGl2aXR5ID0gcHJvY2Vzcy51c2VySW5pdGlhdGVkQWN0aXZpdHkobmF2aWdhdGlvbkFj dGlvbkRhdGEudXNlckdlc3R1cmVUb2tlbklkZW50aWZpZXIpOwogICAgICAgICBib29sIHNob3Vs ZE9wZW5BcHBMaW5rcyA9ICFtX3Nob3VsZFN1cHByZXNzQXBwTGlua3NJbk5leHROYXZpZ2F0aW9u UG9saWN5RGVjaXNpb24gJiYgZGVzdGluYXRpb25GcmFtZUluZm8tPmlzTWFpbkZyYW1lKCkgJiYg IWhvc3RzQXJlRXF1YWwoVVJMKHsgfSwgbV9tYWluRnJhbWUtPnVybCgpKSwgcmVxdWVzdC51cmwo KSkgJiYgbmF2aWdhdGlvbkFjdGlvbkRhdGEubmF2aWdhdGlvblR5cGUgIT0gV2ViQ29yZTo6TmF2 aWdhdGlvblR5cGU6OkJhY2tGb3J3YXJkOwogCiAgICAgICAgIGF1dG8gbmF2aWdhdGlvbkFjdGlv biA9IEFQSTo6TmF2aWdhdGlvbkFjdGlvbjo6Y3JlYXRlKFdURk1vdmUobmF2aWdhdGlvbkFjdGlv bkRhdGEpLCBzb3VyY2VGcmFtZUluZm8uZ2V0KCksIGRlc3RpbmF0aW9uRnJhbWVJbmZvLnB0cigp LCBXVEY6Om51bGxvcHQsIFdURk1vdmUocmVxdWVzdCksIG9yaWdpbmFsUmVxdWVzdC51cmwoKSwg c2hvdWxkT3BlbkFwcExpbmtzLCBXVEZNb3ZlKHVzZXJJbml0aWF0ZWRBY3Rpdml0eSksIG1haW5G cmFtZU5hdmlnYXRpb24pOwogCi0gICAgICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ZGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbigqdGhpcywgV1RGTW92ZShuYXZpZ2F0aW9uQWN0aW9uKSwg V1RGTW92ZShsaXN0ZW5lciksIG1fcHJvY2Vzcy0+dHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1 c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOworICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oKnRoaXMsIFdURk1vdmUobmF2aWdhdGlvbkFj dGlvbiksIFdURk1vdmUobGlzdGVuZXIpLCBwcm9jZXNzLnRyYW5zZm9ybUhhbmRsZXNUb09iamVj dHModXNlckRhdGEub2JqZWN0KCkpLmdldCgpKTsKICAgICB9CiAKICAgICBtX3Nob3VsZFN1cHBy ZXNzQXBwTGlua3NJbk5leHROYXZpZ2F0aW9uUG9saWN5RGVjaXNpb24gPSBmYWxzZTsKQEAgLTQ1 MjMsNyArNDUyMSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0 aW9uQWN0aW9uU3luYyh1aW50NjRfdCBmcmFtZUlELCBib29sIGlzCiAgICAgICAgIFJFTEVBU0Vf QVNTRVJUKGZyYW1lKTsKICAgICB9CiAKLSAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uKCpmcmFtZSwgV1RGTW92ZShmcmFtZVNlY3VyaXR5T3JpZ2luKSwgbmF2aWdhdGlvbklELCBX VEZNb3ZlKG5hdmlnYXRpb25BY3Rpb25EYXRhKSwgV1RGTW92ZShmcmFtZUluZm9EYXRhKSwgb3Jp Z2luYXRpbmdQYWdlSUQsIG9yaWdpbmFsUmVxdWVzdCwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92 ZShyZXF1ZXN0Qm9keSksIFdURk1vdmUocmVkaXJlY3RSZXNwb25zZSksIHVzZXJEYXRhLCBzZW5k ZXIuY29weVJlZigpKTsKKyAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKG1fcHJv Y2VzcywgKmZyYW1lLCBXVEZNb3ZlKGZyYW1lU2VjdXJpdHlPcmlnaW4pLCBuYXZpZ2F0aW9uSUQs IFdURk1vdmUobmF2aWdhdGlvbkFjdGlvbkRhdGEpLCBXVEZNb3ZlKGZyYW1lSW5mb0RhdGEpLCBv cmlnaW5hdGluZ1BhZ2VJRCwgb3JpZ2luYWxSZXF1ZXN0LCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZN b3ZlKHJlcXVlc3RCb2R5KSwgV1RGTW92ZShyZWRpcmVjdFJlc3BvbnNlKSwgdXNlckRhdGEsIHNl bmRlci5jb3B5UmVmKCkpOwogCiAgICAgLy8gSWYgdGhlIGNsaWVudCBkaWQgbm90IHJlc3BvbmQg c3luY2hyb25vdXNseSwgcHJvY2VlZCB3aXRoIHRoZSBsb2FkLgogICAgIHNlbmRlci0+c2VuZChX ZWJQb2xpY3lBY3Rpb246OlVzZSwgbmF2aWdhdGlvbklELCBEb3dubG9hZElEKCksIFdURjo6bnVs bG9wdCk7CkBAIC00NTM0LDggKzQ1MzIsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9s aWN5Rm9yTmV3V2luZG93QWN0aW9uKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaQogICAg IFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKICAgICBXZWJG cmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVT U0FHRV9DSEVDSyhmcmFtZSk7Ci0gICAgTUVTU0FHRV9DSEVDS19VUkwocmVxdWVzdC51cmwoKSk7 CisgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKKyAgICBNRVNTQUdF X0NIRUNLX1VSTChtX3Byb2Nlc3MuZ2V0KCksIHJlcXVlc3QudXJsKCkpOwogCiAgICAgYXV0byBs aXN0ZW5lciA9IG1ha2VSZWYoZnJhbWUtPnNldFVwUG9saWN5TGlzdGVuZXJQcm94eShbdGhpcywg cHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBsaXN0ZW5lcklELCBmcmFtZUlEXSAoV2Vi UG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbiwgQVBJOjpXZWJzaXRlUG9saWNpZXMqLCBQcm9jZXNz U3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFJlZlB0 cjxTYWZlQnJvd3NpbmdXYXJuaW5nPiYmIHNhZmVCcm93c2luZ1dhcm5pbmcpIG11dGFibGUgewog ICAgICAgICAvLyBGSVhNRTogQXNzZXJ0IHRoZSBBUEk6OldlYnNpdGVQb2xpY2llcyogaXMgbnVs bHB0ciBoZXJlIG9uY2UgY2xpZW50cyBvZiBXS0ZyYW1lUG9saWN5TGlzdGVuZXJVc2VXaXRoUG9s aWNpZXMgZ28gYXdheS4KQEAgLTQ1NjQsMzEgKzQ1NjIsMzYgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OmRlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbih1aW50NjRfdCBmcmFtZUlELCBjb25zdCBT ZWN1cmkKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlKHVp bnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9y aWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNw b25zZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBib29sIGNhblNob3dNSU1FVHlw ZSwgdWludDY0X3QgbGlzdGVuZXJJRCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAg IGRlY2lkZVBvbGljeUZvclJlc3BvbnNlU2hhcmVkKG1fcHJvY2VzcywgZnJhbWVJRCwgZnJhbWVT ZWN1cml0eU9yaWdpbiwgbmF2aWdhdGlvbklELCByZXNwb25zZSwgcmVxdWVzdCwgY2FuU2hvd01J TUVUeXBlLCBsaXN0ZW5lcklELCB1c2VyRGF0YSk7Cit9CisKK3ZvaWQgV2ViUGFnZVByb3h5Ojpk ZWNpZGVQb2xpY3lGb3JSZXNwb25zZVNoYXJlZChXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIHVp bnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9y aWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNw b25zZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBib29sIGNhblNob3dNSU1FVHlw ZSwgdWludDY0X3QgbGlzdGVuZXJJRCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQogewogICAg IFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKICAgICBtX2Rl Y2lkZVBvbGljeUZvclJlc3BvbnNlUmVxdWVzdCA9IHJlcXVlc3Q7CiAKLSAgICBXZWJGcmFtZVBy b3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9D SEVDSyhmcmFtZSk7Ci0gICAgTUVTU0FHRV9DSEVDS19VUkwocmVxdWVzdC51cmwoKSk7Ci0gICAg TUVTU0FHRV9DSEVDS19VUkwocmVzcG9uc2UudXJsKCkpOworICAgIFdlYkZyYW1lUHJveHkqIGZy YW1lID0gcHJvY2Vzcy53ZWJGcmFtZShmcmFtZUlEKTsKKyAgICBNRVNTQUdFX0NIRUNLKHByb2Nl c3MsIGZyYW1lKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChwcm9jZXNzLCByZXF1ZXN0LnVybCgp KTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChwcm9jZXNzLCByZXNwb25zZS51cmwoKSk7CiAKICAg ICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvbklEID8gbV9u YXZpZ2F0aW9uU3RhdGUtPm5hdmlnYXRpb24obmF2aWdhdGlvbklEKSA6IG51bGxwdHI7Ci0gICAg YXV0byBsaXN0ZW5lciA9IG1ha2VSZWYoZnJhbWUtPnNldFVwUG9saWN5TGlzdGVuZXJQcm94eShb dGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklE LCBuYXZpZ2F0aW9uID0gV1RGTW92ZShuYXZpZ2F0aW9uKV0gKFdlYlBvbGljeUFjdGlvbiBwb2xp Y3lBY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNs aWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBSZWZQdHI8U2FmZUJyb3dzaW5nV2Fy bmluZz4mJiBzYWZlQnJvd3NpbmdXYXJuaW5nKSBtdXRhYmxlIHsKKyAgICBhdXRvIGxpc3RlbmVy ID0gbWFrZVJlZihmcmFtZS0+c2V0VXBQb2xpY3lMaXN0ZW5lclByb3h5KFt0aGlzLCBwcm90ZWN0 ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIG5hdmlnYXRpb24g PSBXVEZNb3ZlKG5hdmlnYXRpb24pLCBwcm9jZXNzID0gbWFrZVJlZihwcm9jZXNzKV0gKFdlYlBv bGljeUFjdGlvbiBwb2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwgUHJvY2Vzc1N3 YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBSZWZQdHI8 U2FmZUJyb3dzaW5nV2FybmluZz4mJiBzYWZlQnJvd3NpbmdXYXJuaW5nKSBtdXRhYmxlIHsKICAg ICAgICAgLy8gRklYTUU6IEFzc2VydCB0aGUgQVBJOjpXZWJzaXRlUG9saWNpZXMqIGlzIG51bGxw dHIgaGVyZSBvbmNlIGNsaWVudHMgb2YgV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNlV2l0aFBvbGlj aWVzIGdvIGF3YXkuCiAgICAgICAgIFJFTEVBU0VfQVNTRVJUKHByb2Nlc3NTd2FwUmVxdWVzdGVk QnlDbGllbnQgPT0gUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDo6Tm8pOwogICAgICAgICBB U1NFUlRfVU5VU0VEKHNhZmVCcm93c2luZ1dhcm5pbmcsICFzYWZlQnJvd3NpbmdXYXJuaW5nKTsK LSAgICAgICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24sIG5hdmlnYXRpb24u Z2V0KCksIFdURjo6bnVsbG9wdCwgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShbdGhpcywg cHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGZyYW1lSUQsIGxpc3RlbmVy SURdIChhdXRvLi4uIGFyZ3MpIHsKLSAgICAgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdl czo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQs IGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CisgICAgICAgIHJlY2VpdmVkUG9saWN5RGVjaXNpb24ocG9s aWN5QWN0aW9uLCBuYXZpZ2F0aW9uLmdldCgpLCBXVEY6Om51bGxvcHQsIFBvbGljeURlY2lzaW9u U2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRo aXMpLCBmcmFtZUlELCBsaXN0ZW5lcklELCBwcm9jZXNzID0gV1RGTW92ZShwcm9jZXNzKV0gKGF1 dG8uLi4gYXJncykgeworICAgICAgICAgICAgcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4p LCBtX3BhZ2VJRCk7CiAgICAgICAgIH0pKTsKICAgICB9LCBTaG91bGRFeHBlY3RTYWZlQnJvd3Np bmdSZXN1bHQ6Ok5vKSk7CiAKICAgICBpZiAobV9wb2xpY3lDbGllbnQpCi0gICAgICAgIG1fcG9s aWN5Q2xpZW50LT5kZWNpZGVQb2xpY3lGb3JSZXNwb25zZSgqdGhpcywgKmZyYW1lLCByZXNwb25z ZSwgcmVxdWVzdCwgY2FuU2hvd01JTUVUeXBlLCBXVEZNb3ZlKGxpc3RlbmVyKSwgbV9wcm9jZXNz LT50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVzZXJEYXRhLm9iamVjdCgpKS5nZXQoKSk7Cisg ICAgICAgIG1fcG9saWN5Q2xpZW50LT5kZWNpZGVQb2xpY3lGb3JSZXNwb25zZSgqdGhpcywgKmZy YW1lLCByZXNwb25zZSwgcmVxdWVzdCwgY2FuU2hvd01JTUVUeXBlLCBXVEZNb3ZlKGxpc3RlbmVy KSwgcHJvY2Vzcy50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVzZXJEYXRhLm9iamVjdCgpKS5n ZXQoKSk7CiAgICAgZWxzZSB7CiAgICAgICAgIGF1dG8gbmF2aWdhdGlvblJlc3BvbnNlID0gQVBJ OjpOYXZpZ2F0aW9uUmVzcG9uc2U6OmNyZWF0ZShBUEk6OkZyYW1lSW5mbzo6Y3JlYXRlKCpmcmFt ZSwgZnJhbWVTZWN1cml0eU9yaWdpbi5zZWN1cml0eU9yaWdpbigpKS5nZXQoKSwgcmVxdWVzdCwg cmVzcG9uc2UsIGNhblNob3dNSU1FVHlwZSk7Ci0gICAgICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvblJlc3BvbnNlKCp0aGlzLCBXVEZNb3ZlKG5hdmlnYXRp b25SZXNwb25zZSksIFdURk1vdmUobGlzdGVuZXIpLCBtX3Byb2Nlc3MtPnRyYW5zZm9ybUhhbmRs ZXNUb09iamVjdHModXNlckRhdGEub2JqZWN0KCkpLmdldCgpKTsKKyAgICAgICAgbV9uYXZpZ2F0 aW9uQ2xpZW50LT5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2UoKnRoaXMsIFdURk1v dmUobmF2aWdhdGlvblJlc3BvbnNlKSwgV1RGTW92ZShsaXN0ZW5lciksIHByb2Nlc3MudHJhbnNm b3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOwogICAgIH0KIH0K IApAQCAtNDU5Nyw3ICs0NjAwLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnVuYWJsZVRvSW1wbGVt ZW50UG9saWN5KHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFJlc291cmNlRXJyb3IKICAgICBQYWdl Q2xpZW50UHJvdGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCiAgICAgV2ViRnJhbWVQ cm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0Vf Q0hFQ0soZnJhbWUpOworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBmcmFtZSk7 CiAKICAgICBpZiAoIW1fcG9saWN5Q2xpZW50KQogICAgICAgICByZXR1cm47CkBAIC00NjA5LDEw ICs0NjEyLDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp1bmFibGVUb0ltcGxlbWVudFBvbGljeSh1 aW50NjRfdCBmcmFtZUlELCBjb25zdCBSZXNvdXJjZUVycm9yCiB2b2lkIFdlYlBhZ2VQcm94eTo6 d2lsbFN1Ym1pdEZvcm0odWludDY0X3QgZnJhbWVJRCwgdWludDY0X3Qgc291cmNlRnJhbWVJRCwg Y29uc3QgVmVjdG9yPHN0ZDo6cGFpcjxTdHJpbmcsIFN0cmluZz4+JiB0ZXh0RmllbGRWYWx1ZXMs IHVpbnQ2NF90IGxpc3RlbmVySUQsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKIHsKICAgICBX ZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAg TUVTU0FHRV9DSEVDSyhmcmFtZSk7CisgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCks IGZyYW1lKTsKIAogICAgIFdlYkZyYW1lUHJveHkqIHNvdXJjZUZyYW1lID0gbV9wcm9jZXNzLT53 ZWJGcmFtZShzb3VyY2VGcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNLKHNvdXJjZUZyYW1lKTsK KyAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgc291cmNlRnJhbWUpOwogCiAgICAg bV9mb3JtQ2xpZW50LT53aWxsU3VibWl0Rm9ybSgqdGhpcywgKmZyYW1lLCAqc291cmNlRnJhbWUs IHRleHRGaWVsZFZhbHVlcywgbV9wcm9jZXNzLT50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVz ZXJEYXRhLm9iamVjdCgpKS5nZXQoKSwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0 aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRF0oKSB7CiAgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChN ZXNzYWdlczo6V2ViUGFnZTo6Q29udGludWVXaWxsU3VibWl0Rm9ybShmcmFtZUlELCBsaXN0ZW5l cklEKSwgbV9wYWdlSUQpOwpAQCAtNDYyNiwzOSArNDYyOSw0OSBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6Y29udGVudFJ1bGVMaXN0Tm90aWZpY2F0aW9uKFVSTCYmIHVybCwgVmVjdG9yPFN0cmluZz4m JiBpZGVudAogICAgIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZE5hdmlnYXRlV2l0aE5hdmlnYXRp b25EYXRhKGNvbnN0IFdlYk5hdmlnYXRpb25EYXRhU3RvcmUmIHN0b3JlLCB1aW50NjRfdCBmcmFt ZUlEKSAKIHsKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJkaWROYXZpZ2F0 ZVdpdGhOYXZpZ2F0aW9uRGF0YTogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9w cm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCk7CisgICAgZGlkTmF2aWdhdGVX aXRoTmF2aWdhdGlvbkRhdGFTaGFyZWQobV9wcm9jZXNzLCBzdG9yZSwgZnJhbWVJRCk7Cit9CisK K3ZvaWQgV2ViUGFnZVByb3h5OjpkaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YVNoYXJlZChX ZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIGNvbnN0IFdlYk5hdmlnYXRpb25EYXRhU3RvcmUmIHN0 b3JlLCB1aW50NjRfdCBmcmFtZUlEKQoreworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9h ZGluZywgImRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhU2hhcmVkOiB3ZWJQSUQgPSAlaSwg cGFnZUlEID0gJSIgUFJJdTY0LCBwcm9jZXNzLnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlE KTsKIAogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAK LSAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7 Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZS0+cGFn ZSgpID09IHRoaXMpOworICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gcHJvY2Vzcy53ZWJGcmFt ZShmcmFtZUlEKTsKKyAgICBNRVNTQUdFX0NIRUNLKHByb2Nlc3MsIGZyYW1lKTsKKyAgICBNRVNT QUdFX0NIRUNLKHByb2Nlc3MsIGZyYW1lLT5wYWdlKCkgPT0gdGhpcyk7CiAKICAgICBpZiAoZnJh bWUtPmlzTWFpbkZyYW1lKCkpCiAgICAgICAgIG1faGlzdG9yeUNsaWVudC0+ZGlkTmF2aWdhdGVX aXRoTmF2aWdhdGlvbkRhdGEoKnRoaXMsIHN0b3JlKTsKLSAgICBwcm9jZXNzKCkucHJvY2Vzc1Bv b2woKS5oaXN0b3J5Q2xpZW50KCkuZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGEocHJvY2Vz cygpLnByb2Nlc3NQb29sKCksICp0aGlzLCBzdG9yZSwgKmZyYW1lKTsKKyAgICBwcm9jZXNzLnBy b2Nlc3NQb29sKCkuaGlzdG9yeUNsaWVudCgpLmRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRh KHByb2Nlc3MucHJvY2Vzc1Bvb2woKSwgKnRoaXMsIHN0b3JlLCAqZnJhbWUpOwogfQogCiB2b2lk IFdlYlBhZ2VQcm94eTo6ZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0KGNvbnN0IFN0cmluZyYgc291 cmNlVVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIGRlc3RpbmF0aW9uVVJMU3RyaW5nLCB1aW50NjRf dCBmcmFtZUlEKQogewotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImRpZFBl cmZvcm1DbGllbnRSZWRpcmVjdDogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBm cmFtZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFn ZUlELCBmcmFtZUlEKTsKKyAgICBkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3RTaGFyZWQobV9wcm9j ZXNzLCBzb3VyY2VVUkxTdHJpbmcsIGRlc3RpbmF0aW9uVVJMU3RyaW5nLCBmcmFtZUlEKTsKK30K Kwordm9pZCBXZWJQYWdlUHJveHk6OmRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdFNoYXJlZChXZWJQ cm9jZXNzUHJveHkmIHByb2Nlc3MsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMU3RyaW5nLCBjb25z dCBTdHJpbmcmIGRlc3RpbmF0aW9uVVJMU3RyaW5nLCB1aW50NjRfdCBmcmFtZUlEKQoreworICAg IFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImRpZFBlcmZvcm1DbGllbnRSZWRpcmVj dFNoYXJlZDogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIg UFJJdTY0LCBwcm9jZXNzLnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlELCBmcmFtZUlEKTsK IAogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKICAg ICBpZiAoc291cmNlVVJMU3RyaW5nLmlzRW1wdHkoKSB8fCBkZXN0aW5hdGlvblVSTFN0cmluZy5p c0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKICAgICAKLSAgICBXZWJGcmFtZVByb3h5KiBmcmFt ZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFt ZSk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZS0+cGFnZSgpID09IHRoaXMpOwotICAgIE1FU1NB R0VfQ0hFQ0tfVVJMKHNvdXJjZVVSTFN0cmluZyk7Ci0gICAgTUVTU0FHRV9DSEVDS19VUkwoZGVz dGluYXRpb25VUkxTdHJpbmcpOworICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gcHJvY2Vzcy53 ZWJGcmFtZShmcmFtZUlEKTsKKyAgICBNRVNTQUdFX0NIRUNLKHByb2Nlc3MsIGZyYW1lKTsKKyAg ICBNRVNTQUdFX0NIRUNLKHByb2Nlc3MsIGZyYW1lLT5wYWdlKCkgPT0gdGhpcyk7CisgICAgTUVT U0FHRV9DSEVDS19VUkwocHJvY2Vzcywgc291cmNlVVJMU3RyaW5nKTsKKyAgICBNRVNTQUdFX0NI RUNLX1VSTChwcm9jZXNzLCBkZXN0aW5hdGlvblVSTFN0cmluZyk7CiAKICAgICBpZiAoZnJhbWUt PmlzTWFpbkZyYW1lKCkpIHsKICAgICAgICAgbV9oaXN0b3J5Q2xpZW50LT5kaWRQZXJmb3JtQ2xp ZW50UmVkaXJlY3QoKnRoaXMsIHNvdXJjZVVSTFN0cmluZywgZGVzdGluYXRpb25VUkxTdHJpbmcp OwogICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdCgq dGhpcywgc291cmNlVVJMU3RyaW5nLCBkZXN0aW5hdGlvblVSTFN0cmluZyk7CiAgICAgfQotICAg IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLmhpc3RvcnlDbGllbnQoKS5kaWRQZXJmb3JtQ2xpZW50 UmVkaXJlY3QocHJvY2VzcygpLnByb2Nlc3NQb29sKCksICp0aGlzLCBzb3VyY2VVUkxTdHJpbmcs IGRlc3RpbmF0aW9uVVJMU3RyaW5nLCAqZnJhbWUpOworICAgIHByb2Nlc3MucHJvY2Vzc1Bvb2wo KS5oaXN0b3J5Q2xpZW50KCkuZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0KHByb2Nlc3MucHJvY2Vz c1Bvb2woKSwgKnRoaXMsIHNvdXJjZVVSTFN0cmluZywgZGVzdGluYXRpb25VUkxTdHJpbmcsICpm cmFtZSk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRQZXJmb3JtU2VydmVyUmVkaXJlY3Qo Y29uc3QgU3RyaW5nJiBzb3VyY2VVUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgZGVzdGluYXRpb25V UkxTdHJpbmcsIHVpbnQ2NF90IGZyYW1lSUQpCkBAIC00NjcxLDExICs0Njg0LDExIEBAIHZvaWQg V2ViUGFnZVByb3h5OjpkaWRQZXJmb3JtU2VydmVyUmVkaXJlY3QoY29uc3QgU3RyaW5nJiBzb3Vy Y2VVUkxTdHJpbmcsIGNvbnN0CiAgICAgICAgIHJldHVybjsKICAgICAKICAgICBXZWJGcmFtZVBy b3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9D SEVDSyhmcmFtZSk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZS0+cGFnZSgpID09IHRoaXMpOwor ICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBmcmFtZSk7CisgICAgTUVTU0FHRV9D SEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lLT5wYWdlKCkgPT0gdGhpcyk7CiAKLSAgICBNRVNT QUdFX0NIRUNLX1VSTChzb3VyY2VVUkxTdHJpbmcpOwotICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKGRl c3RpbmF0aW9uVVJMU3RyaW5nKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChtX3Byb2Nlc3MuZ2V0 KCksIHNvdXJjZVVSTFN0cmluZyk7CisgICAgTUVTU0FHRV9DSEVDS19VUkwobV9wcm9jZXNzLmdl dCgpLCBkZXN0aW5hdGlvblVSTFN0cmluZyk7CiAKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1l KCkpCiAgICAgICAgIG1faGlzdG9yeUNsaWVudC0+ZGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0KCp0 aGlzLCBzb3VyY2VVUkxTdHJpbmcsIGRlc3RpbmF0aW9uVVJMU3RyaW5nKTsKQEAgLTQ2ODcsMTAg KzQ3MDAsMTAgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFVwZGF0ZUhpc3RvcnlUaXRsZShjb25z dCBTdHJpbmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIHVybCwKICAgICBQYWdlQ2xpZW50UHJvdGVj dG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUg PSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUp OwotICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUtPnBhZ2UoKSA9PSB0aGlzKTsKKyAgICBNRVNTQUdF X0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgZnJhbWUpOworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9j ZXNzLmdldCgpLCBmcmFtZS0+cGFnZSgpID09IHRoaXMpOwogCi0gICAgTUVTU0FHRV9DSEVDS19V UkwodXJsKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChtX3Byb2Nlc3MuZ2V0KCksIHVybCk7CiAK ICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpCiAgICAgICAgIG1faGlzdG9yeUNsaWVudC0+ ZGlkVXBkYXRlSGlzdG9yeVRpdGxlKCp0aGlzLCB0aXRsZSwgdXJsKTsKQEAgLTQ3MDEsNyArNDcx NCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRVcGRhdGVIaXN0b3J5VGl0bGUoY29uc3QgU3Ry aW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiB1cmwsCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpjcmVh dGVOZXdQYWdlKGNvbnN0IEZyYW1lSW5mb0RhdGEmIG9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0YSwg dWludDY0X3Qgb3JpZ2luYXRpbmdQYWdlSUQsIFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFdp bmRvd0ZlYXR1cmVzJiYgd2luZG93RmVhdHVyZXMsIE5hdmlnYXRpb25BY3Rpb25EYXRhJiYgbmF2 aWdhdGlvbkFjdGlvbkRhdGEsIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkNyZWF0ZU5ld1BhZ2U6 OkRlbGF5ZWRSZXBseSYmIHJlcGx5KQogewotICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLT53 ZWJGcmFtZShvcmlnaW5hdGluZ0ZyYW1lSW5mb0RhdGEuZnJhbWVJRCkpOworICAgIE1FU1NBR0Vf Q0hFQ0sobV9wcm9jZXNzLmdldCgpLCBtX3Byb2Nlc3MtPndlYkZyYW1lKG9yaWdpbmF0aW5nRnJh bWVJbmZvRGF0YS5mcmFtZUlEKSk7CiAgICAgYXV0byBvcmlnaW5hdGluZ0ZyYW1lSW5mbyA9IEFQ STo6RnJhbWVJbmZvOjpjcmVhdGUob3JpZ2luYXRpbmdGcmFtZUluZm9EYXRhLCBtX3Byb2Nlc3Mt PndlYlBhZ2Uob3JpZ2luYXRpbmdQYWdlSUQpKTsKIAogICAgIGF1dG8gbWFpbkZyYW1lVVJMID0g bV9tYWluRnJhbWUtPnVybCgpOwpAQCAtNDcxNCw3ICs0NzI3LDcgQEAgdm9pZCBXZWJQYWdlUHJv eHk6OmNyZWF0ZU5ld1BhZ2UoY29uc3QgRnJhbWVJbmZvRGF0YSYgb3JpZ2luYXRpbmdGcmFtZUlu Zm9EYXRhLAogCiAgICAgICAgIG5ld1BhZ2UtPnNldE9wZW5lZEJ5RE9NKCk7CiAKLSAgICAgICAg cmVwbHkobmV3UGFnZS0+cGFnZUlEKCksIG5ld1BhZ2UtPmNyZWF0aW9uUGFyYW1ldGVycygpKTsK KyAgICAgICAgcmVwbHkobmV3UGFnZS0+cGFnZUlEKCksIG5ld1BhZ2UtPmNyZWF0aW9uUGFyYW1l dGVycyhtX3Byb2Nlc3MpKTsKIAogICAgICAgICBXZWJzaXRlRGF0YVN0b3JlOjpjbG9uZVNlc3Np b25EYXRhKCp0aGlzLCAqbmV3UGFnZSk7CiAgICAgICAgIG5ld1BhZ2UtPm1fc2hvdWxkU3VwcHJl c3NBcHBMaW5rc0luTmV4dE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbiA9IGhvc3RzQXJlRXF1YWwo VVJMKHsgfSwgbWFpbkZyYW1lVVJMKSwgcmVxdWVzdC51cmwoKSk7CkBAIC00NzY2LDcgKzQ3Nzks NyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Y2xvc2VQYWdlKGJvb2wgc3RvcFJlc3BvbnNpdmVuZXNz VGltZXIpCiB2b2lkIFdlYlBhZ2VQcm94eTo6cnVuSmF2YVNjcmlwdEFsZXJ0KHVpbnQ2NF90IGZy YW1lSUQsIGNvbnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYgc2VjdXJpdHlPcmlnaW4sIGNvbnN0IFN0 cmluZyYgbWVzc2FnZSwgTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UnVuSmF2YVNjcmlwdEFsZXJ0 OjpEZWxheWVkUmVwbHkmJiByZXBseSkKIHsKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1f cHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7Cisg ICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKIAogI2lmIFBMQVRGT1JN KElPU19GQU1JTFkpCiAgICAgZXhpdEZ1bGxzY3JlZW5JbW1lZGlhdGVseSgpOwpAQCAtNDc4NSw3 ICs0Nzk4LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJ1bkphdmFTY3JpcHRBbGVydCh1aW50NjRf dCBmcmFtZUlELCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEKIHZvaWQgV2ViUGFnZVByb3h5Ojpy dW5KYXZhU2NyaXB0Q29uZmlybSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cml0eU9yaWdp bkRhdGEmIHNlY3VyaXR5T3JpZ2luLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OlJ1bkphdmFTY3JpcHRDb25maXJtOjpEZWxheWVkUmVwbHkmJiByZXBseSkK IHsKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJ RCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CisgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nl c3MuZ2V0KCksIGZyYW1lKTsKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgZXhpdEZ1 bGxzY3JlZW5JbW1lZGlhdGVseSgpOwpAQCAtNDgwNSw3ICs0ODE4LDcgQEAgdm9pZCBXZWJQYWdl UHJveHk6OnJ1bkphdmFTY3JpcHRDb25maXJtKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3Vy aXR5T3JpZ2luRGEKIHZvaWQgV2ViUGFnZVByb3h5OjpydW5KYXZhU2NyaXB0UHJvbXB0KHVpbnQ2 NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYgc2VjdXJpdHlPcmlnaW4sIGNv bnN0IFN0cmluZyYgbWVzc2FnZSwgY29uc3QgU3RyaW5nJiBkZWZhdWx0VmFsdWUsIE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OlJ1bkphdmFTY3JpcHRQcm9tcHQ6OkRlbGF5ZWRSZXBseSYmIHJlcGx5 KQogewogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFt ZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKKyAgICBNRVNTQUdFX0NIRUNLKG1fcHJv Y2Vzcy5nZXQoKSwgZnJhbWUpOwogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBleGl0 RnVsbHNjcmVlbkltbWVkaWF0ZWx5KCk7CkBAIC00ODU2LDEwICs0ODY5LDEwIEBAIHZvaWQgV2Vi UGFnZVByb3h5Ojpwcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5nKCkKICNpZiBFTkFCTEUoTkVUU0NB UEVfUExVR0lOX0FQSSkKIHZvaWQgV2ViUGFnZVByb3h5Ojp1bmF2YWlsYWJsZVBsdWdpbkJ1dHRv bkNsaWNrZWQodWludDMyX3Qgb3BhcXVlUGx1Z2luVW5hdmFpbGFiaWxpdHlSZWFzb24sIGNvbnN0 IFN0cmluZyYgbWltZVR5cGUsIGNvbnN0IFN0cmluZyYgcGx1Z2luVVJMU3RyaW5nLCBjb25zdCBT dHJpbmcmIHBsdWdpbnNwYWdlQXR0cmlidXRlVVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIGZyYW1l VVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIHBhZ2VVUkxTdHJpbmcpCiB7Ci0gICAgTUVTU0FHRV9D SEVDS19VUkwocGx1Z2luVVJMU3RyaW5nKTsKLSAgICBNRVNTQUdFX0NIRUNLX1VSTChwbHVnaW5z cGFnZUF0dHJpYnV0ZVVSTFN0cmluZyk7Ci0gICAgTUVTU0FHRV9DSEVDS19VUkwoZnJhbWVVUkxT dHJpbmcpOwotICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHBhZ2VVUkxTdHJpbmcpOworICAgIE1FU1NB R0VfQ0hFQ0tfVVJMKG1fcHJvY2Vzcy5nZXQoKSwgcGx1Z2luVVJMU3RyaW5nKTsKKyAgICBNRVNT QUdFX0NIRUNLX1VSTChtX3Byb2Nlc3MuZ2V0KCksIHBsdWdpbnNwYWdlQXR0cmlidXRlVVJMU3Ry aW5nKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lVVJMU3Ry aW5nKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChtX3Byb2Nlc3MuZ2V0KCksIHBhZ2VVUkxTdHJp bmcpOwogCiAgICAgU3RyaW5nIG5ld01pbWVUeXBlID0gbWltZVR5cGU7CiAgICAgUGx1Z2luTW9k dWxlSW5mbyBwbHVnaW4gPSBtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkucGx1Z2luSW5mb1N0b3Jl KCkuZmluZFBsdWdpbihuZXdNaW1lVHlwZSwgVVJMKFVSTCgpLCBwbHVnaW5VUkxTdHJpbmcpKTsK QEAgLTQ5ODUsNyArNDk5OCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpyb290Vmlld1RvQWNjZXNz aWJpbGl0eVNjcmVlbihjb25zdCBJbnRSZWN0JiB2aWV3UmVjdCwgSW50UmVjCiB2b2lkIFdlYlBh Z2VQcm94eTo6cnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsKHVpbnQ2NF90IGZyYW1lSUQsIGNv bnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYgc2VjdXJpdHlPcmlnaW4sIGNvbnN0IFN0cmluZyYgbWVz c2FnZSwgTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVs OjpEZWxheWVkUmVwbHkmJiByZXBseSkKIHsKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1f cHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7Cisg ICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKIAogICAgIC8vIFBlciDC pzE4IFVzZXIgUHJvbXB0cyBpbiB0aGUgV2ViRHJpdmVyIHNwZWMsICJVc2VyIHByb21wdHMgdGhh dCBhcmUgc3Bhd25lZCBmcm9tIGJlZm9yZXVubG9hZAogICAgIC8vIGV2ZW50IGhhbmRsZXJzLCBh cmUgZGlzbWlzc2VkIGltcGxpY2l0bHkgdXBvbiBuYXZpZ2F0aW9uIG9yIGNsb3NlIHdpbmRvdywg cmVnYXJkbGVzcyBvZiB0aGUKQEAgLTUwMzAsNyArNTA0Myw3IEBAIHZvaWQgV2ViUGFnZVByb3h5 OjpydW5PcGVuUGFuZWwodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2VjdXJpdHlPcmlnaW5EYXRh JiBmcmFtCiAgICAgfQogCiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndl YkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOworICAgIE1FU1NBR0Vf Q0hFQ0sobV9wcm9jZXNzLmdldCgpLCBmcmFtZSk7CiAKICAgICBSZWY8QVBJOjpPcGVuUGFuZWxQ YXJhbWV0ZXJzPiBwYXJhbWV0ZXJzID0gQVBJOjpPcGVuUGFuZWxQYXJhbWV0ZXJzOjpjcmVhdGUo c2V0dGluZ3MpOwogICAgIG1fb3BlblBhbmVsUmVzdWx0TGlzdGVuZXIgPSBXZWJPcGVuUGFuZWxS ZXN1bHRMaXN0ZW5lclByb3h5OjpjcmVhdGUodGhpcyk7CkBAIC01MDY3LDcgKzUwODAsNyBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6cHJpbnRGcmFtZSh1aW50NjRfdCBmcmFtZUlEKQogICAgIG1faXNQ ZXJmb3JtaW5nRE9NUHJpbnRPcGVyYXRpb24gPSB0cnVlOwogCiAgICAgV2ViRnJhbWVQcm94eSog ZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0VfQ0hFQ0so ZnJhbWUpOworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBmcmFtZSk7CiAKICAg ICBtX3VpQ2xpZW50LT5wcmludEZyYW1lKCp0aGlzLCAqZnJhbWUpOwogCkBAIC01MzU1LDE0ICs1 MzY4LDE5IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpiYWNrRm9yd2FyZEFkZEl0ZW0oQmFja0Zvcndh cmRMaXN0SXRlbVN0YXRlJiYgaXRlbVN0YXRlKQogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6YmFj a0ZvcndhcmRHb1RvSXRlbShjb25zdCBCYWNrRm9yd2FyZEl0ZW1JZGVudGlmaWVyJiBpdGVtSUQs IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSkKK3sKKyAg ICBiYWNrRm9yd2FyZEdvVG9JdGVtU2hhcmVkKG1fcHJvY2VzcywgaXRlbUlELCBzYW5kYm94RXh0 ZW5zaW9uSGFuZGxlKTsKK30KKwordm9pZCBXZWJQYWdlUHJveHk6OmJhY2tGb3J3YXJkR29Ub0l0 ZW1TaGFyZWQoV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzLCBjb25zdCBCYWNrRm9yd2FyZEl0ZW1J ZGVudGlmaWVyJiBpdGVtSUQsIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYgc2FuZGJveEV4dGVu c2lvbkhhbmRsZSkKIHsKICAgICBXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBpdGVtID0gbV9iYWNr Rm9yd2FyZExpc3QtPml0ZW1Gb3JJRChpdGVtSUQpOwogICAgIGlmICghaXRlbSkKICAgICAgICAg cmV0dXJuOwogCi0gICAgYm9vbCBjcmVhdGVkRXh0ZW5zaW9uID0gbWF5YmVJbml0aWFsaXplU2Fu ZGJveEV4dGVuc2lvbkhhbmRsZShVUkwoVVJMKCksIGl0ZW0tPnVybCgpKSwgc2FuZGJveEV4dGVu c2lvbkhhbmRsZSk7CisgICAgYm9vbCBjcmVhdGVkRXh0ZW5zaW9uID0gbWF5YmVJbml0aWFsaXpl U2FuZGJveEV4dGVuc2lvbkhhbmRsZShwcm9jZXNzLCBVUkwoVVJMKCksIGl0ZW0tPnVybCgpKSwg c2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7CiAgICAgaWYgKGNyZWF0ZWRFeHRlbnNpb24pCi0gICAg ICAgIHdpbGxBY3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5zaW9uKCk7CisgICAg ICAgIHdpbGxBY3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5zaW9uKHByb2Nlc3Mp OwogICAgIG1fYmFja0ZvcndhcmRMaXN0LT5nb1RvSXRlbSgqaXRlbSk7CiB9CiAKQEAgLTU4NDEs NyArNTg1OSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpnZXRHdWVzc2VzRm9yV29yZChjb25zdCBT dHJpbmcmIHdvcmQsIGNvbnN0IFN0cmluZyYgY29udGV4dCwKIAogdm9pZCBXZWJQYWdlUHJveHk6 OmxlYXJuV29yZChjb25zdCBTdHJpbmcmIHdvcmQpCiB7Ci0gICAgTUVTU0FHRV9DSEVDSyhtX3Bl bmRpbmdMZWFybk9ySWdub3JlV29yZE1lc3NhZ2VDb3VudCk7CisgICAgTUVTU0FHRV9DSEVDSyht X3Byb2Nlc3MuZ2V0KCksIG1fcGVuZGluZ0xlYXJuT3JJZ25vcmVXb3JkTWVzc2FnZUNvdW50KTsK ICAgICAtLW1fcGVuZGluZ0xlYXJuT3JJZ25vcmVXb3JkTWVzc2FnZUNvdW50OwogCiAgICAgVGV4 dENoZWNrZXI6OmxlYXJuV29yZChzcGVsbERvY3VtZW50VGFnKCksIHdvcmQpOwpAQCAtNTg0OSw3 ICs1ODY3LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxlYXJuV29yZChjb25zdCBTdHJpbmcmIHdv cmQpCiAKIHZvaWQgV2ViUGFnZVByb3h5OjppZ25vcmVXb3JkKGNvbnN0IFN0cmluZyYgd29yZCkK IHsKLSAgICBNRVNTQUdFX0NIRUNLKG1fcGVuZGluZ0xlYXJuT3JJZ25vcmVXb3JkTWVzc2FnZUNv dW50KTsKKyAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgbV9wZW5kaW5nTGVhcm5P cklnbm9yZVdvcmRNZXNzYWdlQ291bnQpOwogICAgIC0tbV9wZW5kaW5nTGVhcm5Pcklnbm9yZVdv cmRNZXNzYWdlQ291bnQ7CiAKICAgICBUZXh0Q2hlY2tlcjo6aWdub3JlV29yZChzcGVsbERvY3Vt ZW50VGFnKCksIHdvcmQpOwpAQCAtNTk1MCw5ICs1OTY4LDkgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OmRpZFJlY2VpdmVFdmVudCh1aW50MzJfdCBvcGFxdWVUeXBlLCBib29sIGhhbmRsZWQpCiAgICAg ICAgIExPRyhNb3VzZUhhbmRsaW5nLCAiV2ViUGFnZVByb3h5OjpkaWRSZWNlaXZlRXZlbnQ6ICVz IChxdWV1ZSBzaXplICV6dSkiLCB3ZWJNb3VzZUV2ZW50VHlwZVN0cmluZyh0eXBlKSwgbV9tb3Vz ZUV2ZW50UXVldWUuc2l6ZSgpKTsKIAogICAgICAgICAvLyBSZXRpcmUgdGhlIGxhc3Qgc2VudCBl dmVudCBub3cgdGhhdCBXZWJQcm9jZXNzIGlzIGRvbmUgaGFuZGxpbmcgaXQuCi0gICAgICAgIE1F U1NBR0VfQ0hFQ0soIW1fbW91c2VFdmVudFF1ZXVlLmlzRW1wdHkoKSk7CisgICAgICAgIE1FU1NB R0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCAhbV9tb3VzZUV2ZW50UXVldWUuaXNFbXB0eSgpKTsK ICAgICAgICAgTmF0aXZlV2ViTW91c2VFdmVudCBldmVudCA9IG1fbW91c2VFdmVudFF1ZXVlLnRh a2VGaXJzdCgpOwotICAgICAgICBNRVNTQUdFX0NIRUNLKHR5cGUgPT0gZXZlbnQudHlwZSgpKTsK KyAgICAgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIHR5cGUgPT0gZXZlbnQudHlw ZSgpKTsKIAogICAgICAgICBpZiAoIW1fbW91c2VFdmVudFF1ZXVlLmlzRW1wdHkoKSkgewogICAg ICAgICAgICAgTE9HKE1vdXNlSGFuZGxpbmcsICIgVUlQcm9jZXNzOiBoYW5kbGluZyBhIHF1ZXVl ZCBtb3VzZSBldmVudCBmcm9tIGRpZFJlY2VpdmVFdmVudCIpOwpAQCAtNTk2Nyw3ICs1OTg1LDcg QEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVFdmVudCh1aW50MzJfdCBvcGFxdWVUeXBl LCBib29sIGhhbmRsZWQpCiAgICAgfQogCiAgICAgY2FzZSBXZWJFdmVudDo6V2hlZWw6IHsKLSAg ICAgICAgTUVTU0FHRV9DSEVDSyghbV9jdXJyZW50bHlQcm9jZXNzZWRXaGVlbEV2ZW50cy5pc0Vt cHR5KCkpOworICAgICAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgIW1fY3VycmVu dGx5UHJvY2Vzc2VkV2hlZWxFdmVudHMuaXNFbXB0eSgpKTsKIAogICAgICAgICBzdGQ6OnVuaXF1 ZV9wdHI8VmVjdG9yPE5hdGl2ZVdlYldoZWVsRXZlbnQ+PiBvbGRlc3RDb2FsZXNjZWRFdmVudCA9 IG1fY3VycmVudGx5UHJvY2Vzc2VkV2hlZWxFdmVudHMudGFrZUZpcnN0KCk7CiAKQEAgLTU5ODgs MTAgKzYwMDYsMTAgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVFdmVudCh1aW50MzJf dCBvcGFxdWVUeXBlLCBib29sIGhhbmRsZWQpCiAgICAgY2FzZSBXZWJFdmVudDo6Q2hhcjogewog ICAgICAgICBMT0coS2V5SGFuZGxpbmcsICJXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVFdmVudDog JXMgKHF1ZXVlIGVtcHR5ICVkKSIsIHdlYktleWJvYXJkRXZlbnRUeXBlU3RyaW5nKHR5cGUpLCBt X2tleUV2ZW50UXVldWUuaXNFbXB0eSgpKTsKIAotICAgICAgICBNRVNTQUdFX0NIRUNLKCFtX2tl eUV2ZW50UXVldWUuaXNFbXB0eSgpKTsKKyAgICAgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3Mu Z2V0KCksICFtX2tleUV2ZW50UXVldWUuaXNFbXB0eSgpKTsKICAgICAgICAgTmF0aXZlV2ViS2V5 Ym9hcmRFdmVudCBldmVudCA9IG1fa2V5RXZlbnRRdWV1ZS50YWtlRmlyc3QoKTsKIAotICAgICAg ICBNRVNTQUdFX0NIRUNLKHR5cGUgPT0gZXZlbnQudHlwZSgpKTsKKyAgICAgICAgTUVTU0FHRV9D SEVDSyhtX3Byb2Nlc3MuZ2V0KCksIHR5cGUgPT0gZXZlbnQudHlwZSgpKTsKIAogICAgICAgICBi b29sIGNhblByb2Nlc3NNb3JlS2V5RXZlbnRzID0gIW1fa2V5RXZlbnRRdWV1ZS5pc0VtcHR5KCk7 CiAgICAgICAgIGlmIChjYW5Qcm9jZXNzTW9yZUtleUV2ZW50cykgewpAQCAtNjAxOCwxMCArNjAz NiwxMCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZUV2ZW50KHVpbnQzMl90IG9wYXF1 ZVR5cGUsIGJvb2wgaGFuZGxlZCkKICAgICBjYXNlIFdlYkV2ZW50OjpHZXN0dXJlU3RhcnQ6CiAg ICAgY2FzZSBXZWJFdmVudDo6R2VzdHVyZUNoYW5nZToKICAgICBjYXNlIFdlYkV2ZW50OjpHZXN0 dXJlRW5kOiB7Ci0gICAgICAgIE1FU1NBR0VfQ0hFQ0soIW1fZ2VzdHVyZUV2ZW50UXVldWUuaXNF bXB0eSgpKTsKKyAgICAgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksICFtX2dlc3R1 cmVFdmVudFF1ZXVlLmlzRW1wdHkoKSk7CiAgICAgICAgIE5hdGl2ZVdlYkdlc3R1cmVFdmVudCBl dmVudCA9IG1fZ2VzdHVyZUV2ZW50UXVldWUudGFrZUZpcnN0KCk7CiAKLSAgICAgICAgTUVTU0FH RV9DSEVDSyh0eXBlID09IGV2ZW50LnR5cGUoKSk7CisgICAgICAgIE1FU1NBR0VfQ0hFQ0sobV9w cm9jZXNzLmdldCgpLCB0eXBlID09IGV2ZW50LnR5cGUoKSk7CiAKICAgICAgICAgaWYgKCFoYW5k bGVkKQogICAgICAgICAgICAgcGFnZUNsaWVudCgpLmdlc3R1cmVFdmVudFdhc05vdEhhbmRsZWRC eVdlYkNvcmUoZXZlbnQpOwpAQCAtNjA0MCwxMCArNjA1OCwxMCBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6ZGlkUmVjZWl2ZUV2ZW50KHVpbnQzMl90IG9wYXF1ZVR5cGUsIGJvb2wgaGFuZGxlZCkKICAg ICBjYXNlIFdlYkV2ZW50OjpUb3VjaE1vdmU6CiAgICAgY2FzZSBXZWJFdmVudDo6VG91Y2hFbmQ6 CiAgICAgY2FzZSBXZWJFdmVudDo6VG91Y2hDYW5jZWw6IHsKLSAgICAgICAgTUVTU0FHRV9DSEVD SyghbV90b3VjaEV2ZW50UXVldWUuaXNFbXB0eSgpKTsKKyAgICAgICAgTUVTU0FHRV9DSEVDSyht X3Byb2Nlc3MuZ2V0KCksICFtX3RvdWNoRXZlbnRRdWV1ZS5pc0VtcHR5KCkpOwogICAgICAgICBR dWV1ZWRUb3VjaEV2ZW50cyBxdWV1ZWRFdmVudHMgPSBtX3RvdWNoRXZlbnRRdWV1ZS50YWtlRmly c3QoKTsKIAotICAgICAgICBNRVNTQUdFX0NIRUNLKHR5cGUgPT0gcXVldWVkRXZlbnRzLmZvcndh cmRlZEV2ZW50LnR5cGUoKSk7CisgICAgICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgp LCB0eXBlID09IHF1ZXVlZEV2ZW50cy5mb3J3YXJkZWRFdmVudC50eXBlKCkpOwogCiAgICAgICAg IHBhZ2VDbGllbnQoKS5kb25lV2l0aFRvdWNoRXZlbnQocXVldWVkRXZlbnRzLmZvcndhcmRlZEV2 ZW50LCBoYW5kbGVkKTsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBxdWV1ZWRFdmVu dHMuZGVmZXJyZWRUb3VjaEV2ZW50cy5zaXplKCk7ICsraSkgewpAQCAtNjE3MSw3ICs2MTg5LDcg QEAgdm9pZCBXZWJQYWdlUHJveHk6OnVuc2lnbmVkQ2FsbGJhY2sodWludDY0X3QgcmVzdWx0LCBD YWxsYmFja0lEIGNhbGxiYWNrSUQpCiAKIHZvaWQgV2ViUGFnZVByb3h5OjplZGl0aW5nUmFuZ2VD YWxsYmFjayhjb25zdCBFZGl0aW5nUmFuZ2UmIHJhbmdlLCBDYWxsYmFja0lEIGNhbGxiYWNrSUQp CiB7Ci0gICAgTUVTU0FHRV9DSEVDSyhyYW5nZS5pc1ZhbGlkKCkpOworICAgIE1FU1NBR0VfQ0hF Q0sobV9wcm9jZXNzLmdldCgpLCByYW5nZS5pc1ZhbGlkKCkpOwogCiAgICAgYXV0byBjYWxsYmFj ayA9IG1fY2FsbGJhY2tzLnRha2U8RWRpdGluZ1JhbmdlQ2FsbGJhY2s+KGNhbGxiYWNrSUQpOwog ICAgIGlmICghY2FsbGJhY2spIHsKQEAgLTYyNzIsNyArNjI5MCw3IEBAIHZvaWQgV2ViUGFnZVBy b3h5Ojpsb2dTY3JvbGxpbmdFdmVudCh1aW50MzJfdCBldmVudFR5cGUsIE1vbm90b25pY1RpbWUg dGltZXN0YW1wCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpyZWN0Rm9yQ2hhcmFjdGVyUmFuZ2VDYWxs YmFjayhjb25zdCBJbnRSZWN0JiByZWN0LCBjb25zdCBFZGl0aW5nUmFuZ2UmIGFjdHVhbFJhbmdl LCBDYWxsYmFja0lEIGNhbGxiYWNrSUQpCiB7Ci0gICAgTUVTU0FHRV9DSEVDSyhhY3R1YWxSYW5n ZS5pc1ZhbGlkKCkpOworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBhY3R1YWxS YW5nZS5pc1ZhbGlkKCkpOwogCiAgICAgYXV0byBjYWxsYmFjayA9IG1fY2FsbGJhY2tzLnRha2U8 UmVjdEZvckNoYXJhY3RlclJhbmdlQ2FsbGJhY2s+KGNhbGxiYWNrSUQpOwogICAgIGlmICghY2Fs bGJhY2spIHsKQEAgLTYzMDUsNyArNjMyMyw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpmb2N1c2Vk RnJhbWVDaGFuZ2VkKHVpbnQ2NF90IGZyYW1lSUQpCiAgICAgfQogCiAgICAgV2ViRnJhbWVQcm94 eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0VfQ0hF Q0soZnJhbWUpOworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBmcmFtZSk7CiAK ICAgICBtX2ZvY3VzZWRGcmFtZSA9IGZyYW1lOwogfQpAQCAtNjMxOCw3ICs2MzM2LDcgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmZyYW1lU2V0TGFyZ2VzdEZyYW1lQ2hhbmdlZCh1aW50NjRfdCBmcmFt ZUlEKQogICAgIH0KIAogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJG cmFtZShmcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKKyAgICBNRVNTQUdFX0NI RUNLKG1fcHJvY2Vzcy5nZXQoKSwgZnJhbWUpOwogCiAgICAgbV9mcmFtZVNldExhcmdlc3RGcmFt ZSA9IGZyYW1lOwogfQpAQCAtNjQwMyw2ICs2NDIxLDEzIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpw cm9jZXNzRGlkVGVybWluYXRlKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbiByZWFzb24pCiAgICAg c3RvcEFsbFVSTFNjaGVtZVRhc2tzKCk7CiB9CiAKK3ZvaWQgV2ViUGFnZVByb3h5Ojpwcm92aXNp b25hbFByb2Nlc3NEaWRUZXJtaW5hdGUoKQoreworICAgIEFTU0VSVChtX3Byb3Zpc2lvbmFsUGFn ZSk7CisgICAgbV9wcm92aXNpb25hbFBhZ2UtPmNhbmNlbCgpOworICAgIG1fcHJvdmlzaW9uYWxQ YWdlID0gbnVsbHB0cjsKK30KKwogc3RhdGljIGJvb2wgc2hvdWxkUmVsb2FkQWZ0ZXJQcm9jZXNz VGVybWluYXRpb24oUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uIHJlYXNvbikKIHsKICAgICBzd2l0 Y2ggKHJlYXNvbikgewpAQCAtNjQ5MCw4ICs2NTE1LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnBy b2Nlc3NXaWxsQmVjb21lRm9yZWdyb3VuZCgpCiB2b2lkIFdlYlBhZ2VQcm94eTo6cmVzZXRTdGF0 ZShSZXNldFN0YXRlUmVhc29uIHJlc2V0U3RhdGVSZWFzb24pCiB7CiAgICAgbV9tYWluRnJhbWUg PSBudWxscHRyOwotICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyID0gbnVsbHB0cjsKLSAg ICBtX21haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlciA9IG51bGxwdHI7CiAKICNpZiBQTEFU Rk9STShDT0NPQSkKICAgICBtX3Njcm9sbGluZ1BlcmZvcm1hbmNlRGF0YSA9IG51bGxwdHI7CkBA IC02NjgwLDcgKzY3MDMsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVzZXRTdGF0ZUFmdGVyUHJv Y2Vzc0V4aXRlZChQcm9jZXNzVGVybWluYXRpb25SZWFzb24gdGVybWluYQogICAgIG1fcHJvY2Vz cy0+cHJvY2Vzc1Rlcm1pbmF0ZWQoKTsKIH0KIAotV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyBX ZWJQYWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycygpCitXZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKFdlYlByb2Nlc3NQcm94eSYgcHJv Y2VzcykKIHsKICAgICBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHBhcmFtZXRlcnM7CiAKQEAg LTY3ODIsOSArNjgwNSwxMyBAQCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94 eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKCkKICAgICBwYXJhbWV0ZXJzLmFwcGxpY2F0aW9uTWFuaWZl c3QgPSBtX2NvbmZpZ3VyYXRpb24tPmFwcGxpY2F0aW9uTWFuaWZlc3QoKSA/IE9wdGlvbmFsPFdl YkNvcmU6OkFwcGxpY2F0aW9uTWFuaWZlc3Q+KG1fY29uZmlndXJhdGlvbi0+YXBwbGljYXRpb25N YW5pZmVzdCgpLT5hcHBsaWNhdGlvbk1hbmlmZXN0KCkpIDogV1RGOjpudWxsb3B0OwogI2VuZGlm CiAKKyNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCisgICAgcGFyYW1ldGVycy5oYXNSZWdpc3Rl cmVkU2VydmljZVdvcmtlcnMgPSBwcm9jZXNzLnByb2Nlc3NQb29sKCkubWF5SGF2ZVJlZ2lzdGVy ZWRTZXJ2aWNlV29ya2VycyhtX3dlYnNpdGVEYXRhU3RvcmUpOworI2VuZGlmCisKICAgICBwYXJh bWV0ZXJzLm5lZWRzRm9udEF0dHJpYnV0ZXMgPSBtX25lZWRzRm9udEF0dHJpYnV0ZXM7CiAKLSAg ICBtX3Byb2Nlc3MtPmFkZFdlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5KG1fdXNlckNvbnRl bnRDb250cm9sbGVyLCBwYXJhbWV0ZXJzKTsKKyAgICBwcm9jZXNzLmFkZFdlYlVzZXJDb250ZW50 Q29udHJvbGxlclByb3h5KG1fdXNlckNvbnRlbnRDb250cm9sbGVyLCBwYXJhbWV0ZXJzKTsKIAog ICAgIHJldHVybiBwYXJhbWV0ZXJzOwogfQpAQCAtNjg1NSw3ICs2ODgyLDcgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OmV4Y2VlZGVkRGF0YWJhc2VRdW90YSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBT dHJpbmcmIG9yaWdpbkkKICAgICBFeGNlZWRlZERhdGFiYXNlUXVvdGFSZWNvcmRzOjpSZWNvcmQq IHJlY29yZCA9IHJlY29yZHMubmV4dCgpOwogICAgIHdoaWxlIChyZWNvcmQpIHsKICAgICAgICAg V2ViRnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKHJlY29yZC0+ZnJhbWVJ RCk7Ci0gICAgICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOworICAgICAgICBNRVNTQUdFX0NIRUNL KG1fcHJvY2Vzcy5nZXQoKSwgZnJhbWUpOwogCiAgICAgICAgIGF1dG8gb3JpZ2luID0gQVBJOjpT ZWN1cml0eU9yaWdpbjo6Y3JlYXRlKFNlY3VyaXR5T3JpZ2luRGF0YTo6ZnJvbURhdGFiYXNlSWRl bnRpZmllcihyZWNvcmQtPm9yaWdpbklkZW50aWZpZXIpLT5zZWN1cml0eU9yaWdpbigpKTsKICAg ICAgICAgbV91aUNsaWVudC0+ZXhjZWVkZWREYXRhYmFzZVF1b3RhKHRoaXMsIGZyYW1lLCBvcmln aW4ucHRyKCksIHJlY29yZC0+ZGF0YWJhc2VOYW1lLCByZWNvcmQtPmRpc3BsYXlOYW1lLCByZWNv cmQtPmN1cnJlbnRRdW90YSwgcmVjb3JkLT5jdXJyZW50T3JpZ2luVXNhZ2UsIHJlY29yZC0+Y3Vy cmVudERhdGFiYXNlVXNhZ2UsIHJlY29yZC0+ZXhwZWN0ZWRVc2FnZSwgV1RGTW92ZShyZWNvcmQt PnJlcGx5KSk7CkBAIC02ODcyLDcgKzY4OTksNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVhY2hl ZEFwcGxpY2F0aW9uQ2FjaGVPcmlnaW5RdW90YShjb25zdCBTdHJpbmcmIG9yaWdpbklkZW50aQog dm9pZCBXZWJQYWdlUHJveHk6OnJlcXVlc3RHZW9sb2NhdGlvblBlcm1pc3Npb25Gb3JGcmFtZSh1 aW50NjRfdCBnZW9sb2NhdGlvbklELCB1aW50NjRfdCBmcmFtZUlELCBTdHJpbmcgb3JpZ2luSWRl bnRpZmllcikKIHsKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJh bWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CisgICAgTUVTU0FHRV9DSEVD SyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKIAogICAgIC8vIEZJWE1FOiBHZW9sb2NhdGlvbiBz aG91bGQgcHJvYmFibHkgYmUgdXNpbmcgdG9TdHJpbmcoKSBhcyBpdHMgc3RyaW5nIHJlcHJlc2Vu dGF0aW9uIGluc3RlYWQgb2YgZGF0YWJhc2VJZGVudGlmaWVyKCkuCiAgICAgYXV0byBvcmlnaW4g PSBBUEk6OlNlY3VyaXR5T3JpZ2luOjpjcmVhdGUoU2VjdXJpdHlPcmlnaW5EYXRhOjpmcm9tRGF0 YWJhc2VJZGVudGlmaWVyKG9yaWdpbklkZW50aWZpZXIpLT5zZWN1cml0eU9yaWdpbigpKTsKQEAg LTY5MTEsNyArNjkzOCw3IEBAIFVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5 JiBXZWJQYWdlUHJveHk6OnVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0CiB2b2lkIFdlYlBhZ2VQ cm94eTo6cmVxdWVzdFVzZXJNZWRpYVBlcm1pc3Npb25Gb3JGcmFtZSh1aW50NjRfdCB1c2VyTWVk aWFJRCwgdWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRh JiAgdXNlck1lZGlhRG9jdW1lbnRPcmlnaW5EYXRhLCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9y aWdpbkRhdGEmIHRvcExldmVsRG9jdW1lbnRPcmlnaW5EYXRhLCBjb25zdCBXZWJDb3JlOjpNZWRp YVN0cmVhbVJlcXVlc3QmIHJlcXVlc3QpCiB7CiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKLSAg ICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCkpOworICAgIE1FU1NB R0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpKTsK IAogICAgIHVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlcigpLnJlcXVlc3RVc2VyTWVk aWFQZXJtaXNzaW9uRm9yRnJhbWUodXNlck1lZGlhSUQsIGZyYW1lSUQsIHVzZXJNZWRpYURvY3Vt ZW50T3JpZ2luRGF0YS5zZWN1cml0eU9yaWdpbigpLCB0b3BMZXZlbERvY3VtZW50T3JpZ2luRGF0 YS5zZWN1cml0eU9yaWdpbigpLCByZXF1ZXN0KTsKICNlbHNlCkBAIC02OTI3LDcgKzY5NTQsNyBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6ZW51bWVyYXRlTWVkaWFEZXZpY2VzRm9yRnJhbWUodWludDY0 X3QgdXNlck1lZGlhSUQsIHVpbnQ2NF90CiB7CiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKICAg ICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0g ICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CisgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0 KCksIGZyYW1lKTsKIAogICAgIHVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlcigpLmVu dW1lcmF0ZU1lZGlhRGV2aWNlc0ZvckZyYW1lKHVzZXJNZWRpYUlELCBmcmFtZUlELCB1c2VyTWVk aWFEb2N1bWVudE9yaWdpbkRhdGEuc2VjdXJpdHlPcmlnaW4oKSwgdG9wTGV2ZWxEb2N1bWVudE9y aWdpbkRhdGEuc2VjdXJpdHlPcmlnaW4oKSk7CiAjZWxzZQpAQCAtODE0MywxNyArODE3MCwyMiBA QCBXZWJVUkxTY2hlbWVIYW5kbGVyKiBXZWJQYWdlUHJveHk6OnVybFNjaGVtZUhhbmRsZXJGb3JT Y2hlbWUoY29uc3QgU3RyaW5nJiBzY2hlbQogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6c3RhcnRV UkxTY2hlbWVUYXNrKFVSTFNjaGVtZVRhc2tQYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKK3sKKyAg ICBzdGFydFVSTFNjaGVtZVRhc2tTaGFyZWQobV9wcm9jZXNzLCBXVEZNb3ZlKHBhcmFtZXRlcnMp KTsKK30KKwordm9pZCBXZWJQYWdlUHJveHk6OnN0YXJ0VVJMU2NoZW1lVGFza1NoYXJlZChXZWJQ cm9jZXNzUHJveHkmIHByb2Nlc3MsIFVSTFNjaGVtZVRhc2tQYXJhbWV0ZXJzJiYgcGFyYW1ldGVy cykKIHsKICAgICBhdXRvIGl0ZXJhdG9yID0gbV91cmxTY2hlbWVIYW5kbGVyc0J5SWRlbnRpZmll ci5maW5kKHBhcmFtZXRlcnMuaGFuZGxlcklkZW50aWZpZXIpOwotICAgIE1FU1NBR0VfQ0hFQ0so aXRlcmF0b3IgIT0gbV91cmxTY2hlbWVIYW5kbGVyc0J5SWRlbnRpZmllci5lbmQoKSk7CisgICAg TUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGl0ZXJhdG9yICE9IG1fdXJsU2NoZW1lSGFu ZGxlcnNCeUlkZW50aWZpZXIuZW5kKCkpOwogCi0gICAgaXRlcmF0b3ItPnZhbHVlLT5zdGFydFRh c2soKnRoaXMsIHBhcmFtZXRlcnMudGFza0lkZW50aWZpZXIsIFdURk1vdmUocGFyYW1ldGVycy5y ZXF1ZXN0KSwgbnVsbHB0cik7CisgICAgaXRlcmF0b3ItPnZhbHVlLT5zdGFydFRhc2soKnRoaXMs IHByb2Nlc3MsIHBhcmFtZXRlcnMudGFza0lkZW50aWZpZXIsIFdURk1vdmUocGFyYW1ldGVycy5y ZXF1ZXN0KSwgbnVsbHB0cik7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpzdG9wVVJMU2NoZW1l VGFzayh1aW50NjRfdCBoYW5kbGVySWRlbnRpZmllciwgdWludDY0X3QgdGFza0lkZW50aWZpZXIp CiB7CiAgICAgYXV0byBpdGVyYXRvciA9IG1fdXJsU2NoZW1lSGFuZGxlcnNCeUlkZW50aWZpZXIu ZmluZChoYW5kbGVySWRlbnRpZmllcik7Ci0gICAgTUVTU0FHRV9DSEVDSyhpdGVyYXRvciAhPSBt X3VybFNjaGVtZUhhbmRsZXJzQnlJZGVudGlmaWVyLmVuZCgpKTsKKyAgICBNRVNTQUdFX0NIRUNL KG1fcHJvY2Vzcy5nZXQoKSwgaXRlcmF0b3IgIT0gbV91cmxTY2hlbWVIYW5kbGVyc0J5SWRlbnRp Zmllci5lbmQoKSk7CiAKICAgICBpdGVyYXRvci0+dmFsdWUtPnN0b3BUYXNrKCp0aGlzLCB0YXNr SWRlbnRpZmllcik7CiB9CkBAIC04MTYxLDkgKzgxOTMsOSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 c3RvcFVSTFNjaGVtZVRhc2sodWludDY0X3QgaGFuZGxlcklkZW50aWZpZXIsIHVpbnQ2NF90IHRh c2tJZAogdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRTeW5jaHJvbm91c1VSTFNjaGVtZVRhc2soVVJM U2NoZW1lVGFza1BhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzLCBNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjpMb2FkU3luY2hyb25vdXNVUkxTY2hlbWVUYXNrOjpEZWxheWVkUmVwbHkmJiByZXBseSkKIHsK ICAgICBhdXRvIGl0ZXJhdG9yID0gbV91cmxTY2hlbWVIYW5kbGVyc0J5SWRlbnRpZmllci5maW5k KHBhcmFtZXRlcnMuaGFuZGxlcklkZW50aWZpZXIpOwotICAgIE1FU1NBR0VfQ0hFQ0soaXRlcmF0 b3IgIT0gbV91cmxTY2hlbWVIYW5kbGVyc0J5SWRlbnRpZmllci5lbmQoKSk7CisgICAgTUVTU0FH RV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGl0ZXJhdG9yICE9IG1fdXJsU2NoZW1lSGFuZGxlcnNC eUlkZW50aWZpZXIuZW5kKCkpOwogCi0gICAgaXRlcmF0b3ItPnZhbHVlLT5zdGFydFRhc2soKnRo aXMsIHBhcmFtZXRlcnMudGFza0lkZW50aWZpZXIsIFdURk1vdmUocGFyYW1ldGVycy5yZXF1ZXN0 KSwgV1RGTW92ZShyZXBseSkpOworICAgIGl0ZXJhdG9yLT52YWx1ZS0+c3RhcnRUYXNrKCp0aGlz LCBtX3Byb2Nlc3MsIHBhcmFtZXRlcnMudGFza0lkZW50aWZpZXIsIFdURk1vdmUocGFyYW1ldGVy cy5yZXF1ZXN0KSwgV1RGTW92ZShyZXBseSkpOwogfQogCiAjaWYgRU5BQkxFKFJFU09VUkNFX0xP QURfU1RBVElTVElDUykKQEAgLTg1MDIsMTIgKzg1MzQsMTIgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OnVwZGF0ZUN1cnJlbnRNb2RpZmllclN0YXRlKCkKICNlbmRpZgogfQogCi1ib29sIFdlYlBhZ2VQ cm94eTo6Y2hlY2tVUkxSZWNlaXZlZEZyb21DdXJyZW50T3JQcmV2aW91c1dlYlByb2Nlc3MoY29u c3QgU3RyaW5nJiB1cmxTdHJpbmcpCitib29sIFdlYlBhZ2VQcm94eTo6Y2hlY2tVUkxSZWNlaXZl ZEZyb21DdXJyZW50T3JQcmV2aW91c1dlYlByb2Nlc3MoV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNz LCBjb25zdCBTdHJpbmcmIHVybFN0cmluZykKIHsKLSAgICByZXR1cm4gY2hlY2tVUkxSZWNlaXZl ZEZyb21DdXJyZW50T3JQcmV2aW91c1dlYlByb2Nlc3MoVVJMKFVSTCgpLCB1cmxTdHJpbmcpKTsK KyAgICByZXR1cm4gY2hlY2tVUkxSZWNlaXZlZEZyb21DdXJyZW50T3JQcmV2aW91c1dlYlByb2Nl c3MocHJvY2VzcywgVVJMKFVSTCgpLCB1cmxTdHJpbmcpKTsKIH0KIAotYm9vbCBXZWJQYWdlUHJv eHk6OmNoZWNrVVJMUmVjZWl2ZWRGcm9tQ3VycmVudE9yUHJldmlvdXNXZWJQcm9jZXNzKGNvbnN0 IFVSTCYgdXJsKQorYm9vbCBXZWJQYWdlUHJveHk6OmNoZWNrVVJMUmVjZWl2ZWRGcm9tQ3VycmVu dE9yUHJldmlvdXNXZWJQcm9jZXNzKFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcywgY29uc3QgVVJM JiB1cmwpCiB7CiAgICAgaWYgKCF1cmwuaXNMb2NhbEZpbGUoKSkKICAgICAgICAgcmV0dXJuIHRy dWU7CkBAIC04NTI0LDcgKzg1NTYsNyBAQCBib29sIFdlYlBhZ2VQcm94eTo6Y2hlY2tVUkxSZWNl aXZlZEZyb21DdXJyZW50T3JQcmV2aW91c1dlYlByb2Nlc3MoY29uc3QgVVJMJiB1cgogICAgIGlm IChzdGQ6OmZpbmRfaWYobV9wcmV2aW91c2x5VmlzaXRlZFBhdGhzLmJlZ2luKCksIGxvY2FsUGF0 aHNFbmQsIHN0YXJ0c1dpdGhVUkxQYXRoKSAhPSBsb2NhbFBhdGhzRW5kKQogICAgICAgICByZXR1 cm4gdHJ1ZTsKIAotICAgIHJldHVybiBtX3Byb2Nlc3MtPmNoZWNrVVJMUmVjZWl2ZWRGcm9tV2Vi UHJvY2Vzcyh1cmwpOworICAgIHJldHVybiBwcm9jZXNzLmNoZWNrVVJMUmVjZWl2ZWRGcm9tV2Vi UHJvY2Vzcyh1cmwpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6YWRkUHJldmlvdXNseVZpc2l0 ZWRQYXRoKGNvbnN0IFN0cmluZyYgcGF0aCkKQEAgLTg1MzIsMTAgKzg1NjQsMTAgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmFkZFByZXZpb3VzbHlWaXNpdGVkUGF0aChjb25zdCBTdHJpbmcmIHBhdGgp CiAgICAgbV9wcmV2aW91c2x5VmlzaXRlZFBhdGhzLmFkZChwYXRoKTsKIH0KIAotdm9pZCBXZWJQ YWdlUHJveHk6OndpbGxBY3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5zaW9uKCkK K3ZvaWQgV2ViUGFnZVByb3h5Ojp3aWxsQWNxdWlyZVVuaXZlcnNhbEZpbGVSZWFkU2FuZGJveEV4 dGVuc2lvbihXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MpCiB7CiAgICAgbV9tYXlIYXZlVW5pdmVy c2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5zaW9uID0gdHJ1ZTsKLSAgICBwcm9jZXNzKCkud2lsbEFj cXVpcmVVbml2ZXJzYWxGaWxlUmVhZFNhbmRib3hFeHRlbnNpb24oKTsKKyAgICBwcm9jZXNzLndp bGxBY3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5zaW9uKCk7CiB9CiAKIHZvaWQg V2ViUGFnZVByb3h5OjpzaW11bGF0ZURldmljZU9yaWVudGF0aW9uQ2hhbmdlKGRvdWJsZSBhbHBo YSwgZG91YmxlIGJldGEsIGRvdWJsZSBnYW1tYSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgKaW5kZXggZGU5ODY5NGFhMzcuLmFmYzg3Y2E4OTMxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMjI1LDYgKzIyNSw3IEBAIGNsYXNzIE5hdGl2ZVdl YktleWJvYXJkRXZlbnQ7CiBjbGFzcyBOYXRpdmVXZWJNb3VzZUV2ZW50OwogY2xhc3MgTmF0aXZl V2ViV2hlZWxFdmVudDsKIGNsYXNzIFBhZ2VDbGllbnQ7CitjbGFzcyBQcm92aXNpb25hbFBhZ2VQ cm94eTsKIGNsYXNzIFJlbW90ZUxheWVyVHJlZUhvc3Q7CiBjbGFzcyBSZW1vdGVMYXllclRyZWVT Y3JvbGxpbmdQZXJmb3JtYW5jZURhdGE7CiBjbGFzcyBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlv bjsKQEAgLTM3OSw2ICszODAsNyBAQCBwdWJsaWM6CiAKICAgICBib29sIGFkZHNWaXNpdGVkTGlu a3MoKSBjb25zdCB7IHJldHVybiBtX2FkZHNWaXNpdGVkTGlua3M7IH0KICAgICB2b2lkIHNldEFk ZHNWaXNpdGVkTGlua3MoYm9vbCBhZGRzVmlzaXRlZExpbmtzKSB7IG1fYWRkc1Zpc2l0ZWRMaW5r cyA9IGFkZHNWaXNpdGVkTGlua3M7IH0KKyAgICBWaXNpdGVkTGlua1N0b3JlJiB2aXNpdGVkTGlu a1N0b3JlKCkgeyByZXR1cm4gbV92aXNpdGVkTGlua1N0b3JlOyB9CiAKICAgICB2b2lkIGV4aXRG dWxsc2NyZWVuSW1tZWRpYXRlbHkoKTsKICAgICB2b2lkIGZ1bGxzY3JlZW5NYXlSZXR1cm5Ub0lu bGluZSgpOwpAQCAtNDU4LDggKzQ2MCw4IEBAIHB1YmxpYzoKICAgICBBUEk6Okljb25Mb2FkaW5n Q2xpZW50JiBpY29uTG9hZGluZ0NsaWVudCgpIHsgcmV0dXJuICptX2ljb25Mb2FkaW5nQ2xpZW50 OyB9CiAgICAgdm9pZCBzZXRJY29uTG9hZGluZ0NsaWVudChzdGQ6OnVuaXF1ZV9wdHI8QVBJOjpJ Y29uTG9hZGluZ0NsaWVudD4mJik7CiAKLSAgICBlbnVtIGNsYXNzIElzU3dhcEZyb21TdXNwZW5k ZWQgeyBObywgWWVzIH07Ci0gICAgdm9pZCBpbml0aWFsaXplV2ViUGFnZShJc1N3YXBGcm9tU3Vz cGVuZGVkID0gSXNTd2FwRnJvbVN1c3BlbmRlZDo6Tm8pOworICAgIHZvaWQgaW5pdGlhbGl6ZVdl YlBhZ2UoKTsKKyAgICB2b2lkIHNldERyYXdpbmdBcmVhKHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5n QXJlYVByb3h5PiYmKTsKIAogICAgIFdlYWtQdHI8U2VjS2V5UHJveHlTdG9yZT4gc2VjS2V5UHJv eHlTdG9yZShjb25zdCBXZWJDb3JlOjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSYpOwogICAgICAg ICAKQEAgLTk5Nyw2ICs5OTksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBwcm9jZXNzRGlkQmVjb21l VW5yZXNwb25zaXZlKCk7CiAgICAgdm9pZCBwcm9jZXNzRGlkQmVjb21lUmVzcG9uc2l2ZSgpOwog ICAgIHZvaWQgcHJvY2Vzc0RpZFRlcm1pbmF0ZShQcm9jZXNzVGVybWluYXRpb25SZWFzb24pOwor ICAgIHZvaWQgcHJvdmlzaW9uYWxQcm9jZXNzRGlkVGVybWluYXRlKCk7CiAgICAgdm9pZCBkaXNw YXRjaFByb2Nlc3NEaWRUZXJtaW5hdGUoUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uKTsKICAgICB2 b2lkIHdpbGxDaGFuZ2VQcm9jZXNzSXNSZXNwb25zaXZlKCk7CiAgICAgdm9pZCBkaWRDaGFuZ2VQ cm9jZXNzSXNSZXNwb25zaXZlKCk7CkBAIC0xMDU4LDcgKzEwNjEsNyBAQCBwdWJsaWM6CiAgICAg dm9pZCBkaWRDaG9vc2VGaWxlc0Zvck9wZW5QYW5lbChjb25zdCBWZWN0b3I8U3RyaW5nPiYpOwog ICAgIHZvaWQgZGlkQ2FuY2VsRm9yT3BlblBhbmVsKCk7CiAKLSAgICBXZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzIGNyZWF0aW9uUGFyYW1ldGVycygpOworICAgIFdlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnMgY3JlYXRpb25QYXJhbWV0ZXJzKFdlYlByb2Nlc3NQcm94eSYpOwogCiAgICAgdm9pZCBo YW5kbGVEb3dubG9hZFJlcXVlc3QoRG93bmxvYWRQcm94eSopOwogCkBAIC0xNDE1LDYgKzE0MTgs MjggQEAgcHVibGljOgogICAgIEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyJiBlZGl0YWJsZUltYWdl Q29udHJvbGxlcigpIHsgcmV0dXJuICptX2VkaXRhYmxlSW1hZ2VDb250cm9sbGVyOyB9CiAjZW5k aWYKIAorICAgIFByb3Zpc2lvbmFsUGFnZVByb3h5KiBwcm92aXNpb25hbFBhZ2VQcm94eSgpIGNv bnN0IHsgcmV0dXJuIG1fcHJvdmlzaW9uYWxQYWdlLmdldCgpOyB9CisgICAgdm9pZCBjb21taXRQ cm92aXNpb25hbFBhZ2UodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBj b25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVy LCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8m LCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2Vj dXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2VyRGF0YSYpOwor CisgICAgLy8gTG9naWMgc2hhcmVkIGJldHdlZW4gdGhlIFdlYlBhZ2VQcm94eSBhbmQgdGhlIFBy b3Zpc2lvbmFsUGFnZVByb3h5LgorICAgIHZvaWQgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JG cmFtZVNoYXJlZChXZWJQcm9jZXNzUHJveHkmLCB1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBu YXZpZ2F0aW9uSUQsIFVSTCYmLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEm KTsKKyAgICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZVNoYXJlZChXZWJQcm9j ZXNzUHJveHkmLCB1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdp bkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3Qg U3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIGNv bnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92 aXNpb25hbExvYWRGb3JGcmFtZVNoYXJlZChXZWJQcm9jZXNzUHJveHkmLCB1aW50NjRfdCBmcmFt ZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBj b25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0U2hhcmVk KFdlYlByb2Nlc3NQcm94eSYsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMU3RyaW5nLCBjb25zdCBT dHJpbmcmIGRlc3RpbmF0aW9uVVJMU3RyaW5nLCB1aW50NjRfdCBmcmFtZUlEKTsKKyAgICB2b2lk IGRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhU2hhcmVkKFdlYlByb2Nlc3NQcm94eSYsIGNv bnN0IFdlYk5hdmlnYXRpb25EYXRhU3RvcmUmLCB1aW50NjRfdCBmcmFtZUlEKTsKKyAgICB2b2lk IGRpZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWVTaGFyZWQoV2ViUHJvY2Vzc1Byb3h5Jiwg dWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJik7CisgICAgdm9p ZCBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmNTaGFyZWQoV2ViUHJvY2Vzc1By b3h5JiwgdWludDY0X3QgZnJhbWVJRCwgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiYgZnJh bWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBOYXZpZ2F0aW9uQWN0aW9u RGF0YSYmLCBGcmFtZUluZm9EYXRhJiYsIHVpbnQ2NF90IG9yaWdpbmF0aW5nUGFnZUlELCBjb25z dCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVxdWVzdCwgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiYsIElQQzo6Rm9ybURhdGFSZWZlcmVuY2UmJiByZXF1ZXN0Qm9keSwgV2Vi Q29yZTo6UmVzb3VyY2VSZXNwb25zZSYmIHJlZGlyZWN0UmVzcG9uc2UsIGNvbnN0IFVzZXJEYXRh JiwgdWludDY0X3QgbGlzdGVuZXJJRCk7CisgICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JSZXNwb25z ZVNoYXJlZChXZWJQcm9jZXNzUHJveHkmLCB1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3Jl OjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmln YXRpb25JRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYsIGNvbnN0IFdlYkNvcmU6 OlJlc291cmNlUmVxdWVzdCYsIGJvb2wgY2FuU2hvd01JTUVUeXBlLCB1aW50NjRfdCBsaXN0ZW5l cklELCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgc3RhcnRVUkxTY2hlbWVUYXNrU2hhcmVk KFdlYlByb2Nlc3NQcm94eSYsIFVSTFNjaGVtZVRhc2tQYXJhbWV0ZXJzJiYpOworICAgIHZvaWQg bG9hZERhdGFXaXRoTmF2aWdhdGlvblNoYXJlZChXZWJQcm9jZXNzUHJveHkmLCBBUEk6Ok5hdmln YXRpb24mLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBl LCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2Jq ZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRp b25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKKyAgICB2b2lkIGxv YWRSZXF1ZXN0V2l0aE5hdmlnYXRpb25TaGFyZWQoV2ViUHJvY2Vzc1Byb3h5JiwgQVBJOjpOYXZp Z2F0aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlNob3VsZE9wZW5F eHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxk VHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0g V1RGOjpudWxsb3B0KTsKKyAgICB2b2lkIGJhY2tGb3J3YXJkR29Ub0l0ZW1TaGFyZWQoV2ViUHJv Y2Vzc1Byb3h5JiwgY29uc3QgV2ViQ29yZTo6QmFja0ZvcndhcmRJdGVtSWRlbnRpZmllciYsIFNh bmRib3hFeHRlbnNpb246OkhhbmRsZSYpOworCisgICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIK KyAgICAvLyBJbXBsZW1lbnRlZCBpbiBnZW5lcmF0ZWQgV2ViUGFnZVByb3h5TWVzc2FnZVJlY2Vp dmVyLmNwcAorICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBD OjpEZWNvZGVyJikgb3ZlcnJpZGU7CisgICAgdm9pZCBkaWRSZWNlaXZlU3luY01lc3NhZ2UoSVBD OjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJiwgc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rl cj4mKSBvdmVycmlkZTsKKwogcHJpdmF0ZToKICAgICBXZWJQYWdlUHJveHkoUGFnZUNsaWVudCYs IFdlYlByb2Nlc3NQcm94eSYsIHVpbnQ2NF90IHBhZ2VJRCwgUmVmPEFQSTo6UGFnZUNvbmZpZ3Vy YXRpb24+JiYpOwogICAgIHZvaWQgcGxhdGZvcm1Jbml0aWFsaXplKCk7CkBAIC0xNDM5LDEyICsx NDY0LDYgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgc2V0VXNlckFnZW50KFN0cmluZyYmKTsKIAot ICAgIC8vIElQQzo6TWVzc2FnZVJlY2VpdmVyCi0gICAgLy8gSW1wbGVtZW50ZWQgaW4gZ2VuZXJh dGVkIFdlYlBhZ2VQcm94eU1lc3NhZ2VSZWNlaXZlci5jcHAKLSAgICB2b2lkIGRpZFJlY2VpdmVN ZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIG92ZXJyaWRlOwotICAgIHZv aWQgZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYs IHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+Jikgb3ZlcnJpZGU7Ci0KLQogICAgIC8vIElQ Qzo6TWVzc2FnZVNlbmRlcgogICAgIGJvb2wgc2VuZE1lc3NhZ2Uoc3RkOjp1bmlxdWVfcHRyPElQ Qzo6RW5jb2Rlcj4sIE9wdGlvblNldDxJUEM6OlNlbmRPcHRpb24+KSBvdmVycmlkZTsKICAgICBJ UEM6OkNvbm5lY3Rpb24qIG1lc3NhZ2VTZW5kZXJDb25uZWN0aW9uKCkgb3ZlcnJpZGU7CkBAIC0x NDk2LDcgKzE1MTUsNyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBkaWREZXN0cm95TmF2aWdhdGlv bih1aW50NjRfdCBuYXZpZ2F0aW9uSUQpOwogCi0gICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uKFdlYkZyYW1lUHJveHkmLCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEm JiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIE5hdmlnYXRpb25B Y3Rpb25EYXRhJiYsIEZyYW1lSW5mb0RhdGEmJiwgdWludDY0X3Qgb3JpZ2luYXRpbmdQYWdlSUQs IGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0LCBXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QmJiwgSVBDOjpGb3JtRGF0YVJlZmVyZW5jZSYmIHJlcXVlc3RCb2R5 LCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYgcmVkaXJlY3RSZXNwb25zZSwgY29uc3QgVXNl ckRhdGEmLCBSZWY8UG9saWN5RGVjaXNpb25TZW5kZXI+JiYpOworICAgIHZvaWQgZGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXZWJQcm9jZXNzUHJveHkmLCBXZWJGcmFtZVByb3h5Jiwg V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0 X3QgbmF2aWdhdGlvbklELCBOYXZpZ2F0aW9uQWN0aW9uRGF0YSYmLCBGcmFtZUluZm9EYXRhJiYs IHVpbnQ2NF90IG9yaWdpbmF0aW5nUGFnZUlELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QmIG9yaWdpbmFsUmVxdWVzdCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIElQQzo6Rm9y bURhdGFSZWZlcmVuY2UmJiByZXF1ZXN0Qm9keSwgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYm IHJlZGlyZWN0UmVzcG9uc2UsIGNvbnN0IFVzZXJEYXRhJiwgUmVmPFBvbGljeURlY2lzaW9uU2Vu ZGVyPiYmKTsKICAgICB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYyh1 aW50NjRfdCBmcmFtZUlELCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmJiBmcmFtZVNlY3Vy aXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIE5hdmlnYXRpb25BY3Rpb25EYXRhJiYs IEZyYW1lSW5mb0RhdGEmJiwgdWludDY0X3Qgb3JpZ2luYXRpbmdQYWdlSUQsIGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0LCBXZWJDb3JlOjpSZXNvdXJjZVJl cXVlc3QmJiwgSVBDOjpGb3JtRGF0YVJlZmVyZW5jZSYmIHJlcXVlc3RCb2R5LCBXZWJDb3JlOjpS ZXNvdXJjZVJlc3BvbnNlJiYgcmVkaXJlY3RSZXNwb25zZSwgY29uc3QgVXNlckRhdGEmLCB1aW50 NjRfdCBsaXN0ZW5lcklEKTsKICAgICB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rp b25TeW5jKHVpbnQ2NF90IGZyYW1lSUQsIGJvb2wgaXNNYWluRnJhbWUsIFdlYkNvcmU6OlNlY3Vy aXR5T3JpZ2luRGF0YSYmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25J RCwgTmF2aWdhdGlvbkFjdGlvbkRhdGEmJiwgRnJhbWVJbmZvRGF0YSYmLCB1aW50NjRfdCBvcmln aW5hdGluZ1BhZ2VJRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBvcmlnaW5hbFJl cXVlc3QsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBJUEM6OkZvcm1EYXRhUmVmZXJlbmNl JiYgcmVxdWVzdEJvZHksIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmJiByZWRpcmVjdFJlc3Bv bnNlLCBjb25zdCBVc2VyRGF0YSYsIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb25TeW5jOjpEZWxheWVkUmVwbHkmJik7CiAgICAgdm9pZCBkZWNp ZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24odWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29y ZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCBOYXZpZ2F0aW9uQWN0 aW9uRGF0YSYmLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgY29uc3QgU3RyaW5nJiBmcmFt ZU5hbWUsIHVpbnQ2NF90IGxpc3RlbmVySUQsIGNvbnN0IFVzZXJEYXRhJik7CkBAIC0xNTc1LDE4 ICsxNTk0LDE2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRDYW5TaG9ydENpcmN1aXRIb3Jpem9u dGFsV2hlZWxFdmVudHMoYm9vbCBjYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMp IHsgbV9jYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMgPSBjYW5TaG9ydENpcmN1 aXRIb3Jpem9udGFsV2hlZWxFdmVudHM7IH0KIAogICAgIHZvaWQgcmVhdHRhY2hUb1dlYlByb2Nl c3MoKTsKLSAgICB2b2lkIHN3YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiwg c3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiwgSXNTd2FwRnJvbVN1c3BlbmRl ZCk7CisgICAgdm9pZCBzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIHN0 ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmLCBSZWZQdHI8V2ViRnJhbWVQcm94eT4m JiBtYWluRnJhbWUpOwogICAgIHZvaWQgZGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAo KTsKICAgICB2b2lkIGRpZFN1c3BlbmRBZnRlclByb2Nlc3NTd2FwKCk7CiAKLSAgICB2b2lkIGZp bmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhJc1N3YXBGcm9tU3VzcGVuZGVkID0gSXNTd2FwRnJv bVN1c3BlbmRlZDo6Tm8pOworICAgIGVudW0gY2xhc3MgU2hvdWxkSW5pdGlhbGl6ZVdlYlBhZ2Ug eyBObywgWWVzIH07CisgICAgdm9pZCBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoU2hvdWxk SW5pdGlhbGl6ZVdlYlBhZ2UgPSBTaG91bGRJbml0aWFsaXplV2ViUGFnZTo6WWVzKTsKIAogICAg IFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IHJlYXR0YWNoVG9XZWJQcm9jZXNzRm9yUmVsb2FkKCk7 CiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRl bShXZWJCYWNrRm9yd2FyZExpc3RJdGVtJik7CiAKLSAgICB2b2lkIGxvYWREYXRhV2l0aE5hdmln YXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiwgY29uc3Qg U3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBi YXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXNDb250 aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVsbG9w dCk7Ci0gICAgdm9pZCBsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYs IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxV UkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFdlYkNvcmU6OlNob3VsZFRyZWF0QXND b250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdURjo6bnVs bG9wdCk7Ci0KICAgICB2b2lkIHJlcXVlc3ROb3RpZmljYXRpb25QZXJtaXNzaW9uKHVpbnQ2NF90 IG5vdGlmaWNhdGlvbklELCBjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZyk7CiAgICAgdm9pZCBz aG93Tm90aWZpY2F0aW9uKGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmluZyYgYm9keSwg Y29uc3QgU3RyaW5nJiBpY29uVVJMLCBjb25zdCBTdHJpbmcmIHRhZywgY29uc3QgU3RyaW5nJiBs YW5nLCBXZWJDb3JlOjpOb3RpZmljYXRpb25EaXJlY3Rpb24sIGNvbnN0IFN0cmluZyYgb3JpZ2lu U3RyaW5nLCB1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CiAgICAgdm9pZCBjYW5jZWxOb3RpZmlj YXRpb24odWludDY0X3Qgbm90aWZpY2F0aW9uSUQpOwpAQCAtMTc0NSw3ICsxNzYyLDcgQEAgcHJp dmF0ZToKICAgICB2b2lkIHNldFBsdWdpbkNvbXBsZXhUZXh0SW5wdXRTdGF0ZSh1aW50NjRfdCBw bHVnaW5Db21wbGV4VGV4dElucHV0SWRlbnRpZmllciwgdWludDY0X3QgY29tcGxleFRleHRJbnB1 dFN0YXRlKTsKICNlbmRpZgogCi0gICAgYm9vbCBtYXliZUluaXRpYWxpemVTYW5kYm94RXh0ZW5z aW9uSGFuZGxlKGNvbnN0IFVSTCYsIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYpOworICAgIGJv b2wgbWF5YmVJbml0aWFsaXplU2FuZGJveEV4dGVuc2lvbkhhbmRsZShXZWJQcm9jZXNzUHJveHkm LCBjb25zdCBVUkwmLCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUmKTsKIAogI2lmIFVTRShBVVRP TUFUSUNfVEVYVF9SRVBMQUNFTUVOVCkKICAgICB2b2lkIHRvZ2dsZVNtYXJ0SW5zZXJ0RGVsZXRl KCk7CkBAIC0xODY0LDkgKzE4ODEsOSBAQCBwcml2YXRlOgogICAgIHZvaWQgc3RvcFVSTFNjaGVt ZVRhc2sodWludDY0X3QgaGFuZGxlcklkZW50aWZpZXIsIHVpbnQ2NF90IHRhc2tJZGVudGlmaWVy KTsKICAgICB2b2lkIGxvYWRTeW5jaHJvbm91c1VSTFNjaGVtZVRhc2soVVJMU2NoZW1lVGFza1Bh cmFtZXRlcnMmJiwgTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6TG9hZFN5bmNocm9ub3VzVVJMU2No ZW1lVGFzazo6RGVsYXllZFJlcGx5JiYpOwogCi0gICAgYm9vbCBjaGVja1VSTFJlY2VpdmVkRnJv bUN1cnJlbnRPclByZXZpb3VzV2ViUHJvY2Vzcyhjb25zdCBTdHJpbmcmKTsKLSAgICBib29sIGNo ZWNrVVJMUmVjZWl2ZWRGcm9tQ3VycmVudE9yUHJldmlvdXNXZWJQcm9jZXNzKGNvbnN0IFVSTCYp OwotICAgIHZvaWQgd2lsbEFjcXVpcmVVbml2ZXJzYWxGaWxlUmVhZFNhbmRib3hFeHRlbnNpb24o KTsKKyAgICBib29sIGNoZWNrVVJMUmVjZWl2ZWRGcm9tQ3VycmVudE9yUHJldmlvdXNXZWJQcm9j ZXNzKFdlYlByb2Nlc3NQcm94eSYsIGNvbnN0IFN0cmluZyYpOworICAgIGJvb2wgY2hlY2tVUkxS ZWNlaXZlZEZyb21DdXJyZW50T3JQcmV2aW91c1dlYlByb2Nlc3MoV2ViUHJvY2Vzc1Byb3h5Jiwg Y29uc3QgVVJMJik7CisgICAgdm9pZCB3aWxsQWNxdWlyZVVuaXZlcnNhbEZpbGVSZWFkU2FuZGJv eEV4dGVuc2lvbihXZWJQcm9jZXNzUHJveHkmKTsKIAogICAgIHZvaWQgaGFuZGxlQXV0b0ZpbGxC dXR0b25DbGljayhjb25zdCBVc2VyRGF0YSYpOwogCkBAIC0xOTUyLDggKzE5NjksNiBAQCBwcml2 YXRlOgogICAgIFJlZjxXZWJzaXRlRGF0YVN0b3JlPiBtX3dlYnNpdGVEYXRhU3RvcmU7CiAKICAg ICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9tYWluRnJhbWU7Ci0gICAgRnVuY3Rpb248dm9pZCgp PiBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlcjsKLSAgICBGdW5jdGlvbjx2b2lkKGNvbnN0IFdl YkNvcmU6Okdsb2JhbFdpbmRvd0lkZW50aWZpZXImKT4gbV9tYWluRnJhbWVXaW5kb3dDcmVhdGlv bkhhbmRsZXI7CiAKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9mb2N1c2VkRnJhbWU7CiAg ICAgUmVmUHRyPFdlYkZyYW1lUHJveHk+IG1fZnJhbWVTZXRMYXJnZXN0RnJhbWU7CkBAIC0yMzI0 LDYgKzIzMzksOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9uZWVkc0ZvbnRBdHRyaWJ1dGVzIHsg ZmFsc2UgfTsKICAgICBib29sIG1fbWF5SGF2ZVVuaXZlcnNhbEZpbGVSZWFkU2FuZGJveEV4dGVu c2lvbiB7IGZhbHNlIH07CiAKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJvdmlzaW9uYWxQYWdlUHJv eHk+IG1fcHJvdmlzaW9uYWxQYWdlOworCiAjaWYgSEFWRShQRU5DSUxLSVQpCiAgICAgc3RkOjp1 bmlxdWVfcHRyPEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyPiBtX2VkaXRhYmxlSW1hZ2VDb250cm9s bGVyOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNw cAppbmRleCBkYjFmZDU4YjkzZC4uNmJlOWRjMzk5ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAtMzQsNiArMzQsNyBAQAogI2luY2x1ZGUgIkxv Z2dpbmcuaCIKICNpbmNsdWRlICJQbHVnaW5JbmZvU3RvcmUuaCIKICNpbmNsdWRlICJQbHVnaW5Q cm9jZXNzTWFuYWdlci5oIgorI2luY2x1ZGUgIlByb3Zpc2lvbmFsUGFnZVByb3h5LmgiCiAjaW5j bHVkZSAiVGV4dENoZWNrZXIuaCIKICNpbmNsdWRlICJUZXh0Q2hlY2tlclN0YXRlLmgiCiAjaW5j bHVkZSAiVUlNZXNzYWdlUG9ydENoYW5uZWxQcm92aWRlci5oIgpAQCAtNTg0LDYgKzU4NSwxNSBA QCBib29sIFdlYlByb2Nlc3NQcm94eTo6ZnVsbEtleWJvYXJkQWNjZXNzRW5hYmxlZCgpCiB9CiAj ZW5kaWYKIAorYm9vbCBXZWJQcm9jZXNzUHJveHk6Omhhc1Byb3Zpc2lvbmFsUGFnZVdpdGhJRCh1 aW50NjRfdCBwYWdlSUQpIGNvbnN0Cit7CisgICAgZm9yIChhdXRvKiBwcm92aXNpb25hbFBhZ2Ug OiBtX3Byb3Zpc2lvbmFsUGFnZXMpIHsKKyAgICAgICAgaWYgKHByb3Zpc2lvbmFsUGFnZS0+cGFn ZSgpLnBhZ2VJRCgpID09IHBhZ2VJRCkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgIH0K KyAgICByZXR1cm4gZmFsc2U7Cit9CisKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojp1cGRhdGVCYWNr Rm9yd2FyZEl0ZW0oY29uc3QgQmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlJiBpdGVtU3RhdGUpCiB7 CiAgICAgaWYgKGF1dG8qIGl0ZW0gPSBXZWJCYWNrRm9yd2FyZExpc3RJdGVtOjppdGVtRm9ySUQo aXRlbVN0YXRlLmlkZW50aWZpZXIpKSB7CkBAIC01OTEsNyArNjAxLDcgQEAgdm9pZCBXZWJQcm9j ZXNzUHJveHk6OnVwZGF0ZUJhY2tGb3J3YXJkSXRlbShjb25zdCBCYWNrRm9yd2FyZExpc3RJdGVt U3RhdGUmIGl0ZW0KICAgICAgICAgLy8gdGhlIGJhY2svZm9yd2FyZCBpdGVtcyBwYWdlLgogICAg ICAgICAvLyBlLmcuIFRoZSBvbGQgd2ViIHByb2Nlc3MgaXMgbmF2aWdhdGluZyB0byBhYm91dDpi bGFuayBmb3Igc3VzcGVuc2lvbi4KICAgICAgICAgLy8gV2UgaWdub3JlIHRoZXNlIHVwZGF0ZXMu Ci0gICAgICAgIGlmIChtX3BhZ2VNYXAuY29udGFpbnMoaXRlbS0+cGFnZUlEKCkpKQorICAgICAg ICBpZiAobV9wYWdlTWFwLmNvbnRhaW5zKGl0ZW0tPnBhZ2VJRCgpKSB8fCBoYXNQcm92aXNpb25h bFBhZ2VXaXRoSUQoaXRlbS0+cGFnZUlEKCkpKQogICAgICAgICAgICAgaXRlbS0+c2V0UGFnZVN0 YXRlKGl0ZW1TdGF0ZS5wYWdlU3RhdGUpOwogICAgIH0KIH0KQEAgLTY5NCw2ICs3MDQsNyBAQCB2 b2lkIFdlYlByb2Nlc3NQcm94eTo6cHJvY2Vzc0RpZFRlcm1pbmF0ZU9yRmFpbGVkVG9MYXVuY2go KQogICAgICAgICB3ZWJDb25uZWN0aW9uLT5kaWRDbG9zZSgpOwogCiAgICAgYXV0byBwYWdlcyA9 IGNvcHlUb1ZlY3Rvck9mPFJlZlB0cjxXZWJQYWdlUHJveHk+PihtX3BhZ2VNYXAudmFsdWVzKCkp OworICAgIGF1dG8gcHJvdmlzaW9uYWxQYWdlcyA9IFdURjo6bWFwKG1fcHJvdmlzaW9uYWxQYWdl cywgW10oYXV0byogcHJvdmlzaW9uYWxQYWdlKSB7IHJldHVybiBtYWtlV2Vha1B0cihwcm92aXNp b25hbFBhZ2UpOyB9KTsKIAogICAgIHNodXREb3duKCk7CiAKQEAgLTcwOCw2ICs3MTksMTEgQEAg dm9pZCBXZWJQcm9jZXNzUHJveHk6OnByb2Nlc3NEaWRUZXJtaW5hdGVPckZhaWxlZFRvTGF1bmNo KCkKIAogICAgIGZvciAoYXV0byYgcGFnZSA6IHBhZ2VzKQogICAgICAgICBwYWdlLT5wcm9jZXNz RGlkVGVybWluYXRlKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbjo6Q3Jhc2gpOworCisgICAgZm9y IChhdXRvJiBwcm92aXNpb25hbFBhZ2UgOiBwcm92aXNpb25hbFBhZ2VzKSB7CisgICAgICAgIGlm IChwcm92aXNpb25hbFBhZ2UpCisgICAgICAgICAgICBwcm92aXNpb25hbFBhZ2UtPnByb2Nlc3NE aWRUZXJtaW5hdGUoKTsKKyAgICB9CiB9CiAKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaWRSZWNl aXZlSW52YWxpZE1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBJUEM6OlN0cmlu Z1JlZmVyZW5jZSBtZXNzYWdlUmVjZWl2ZXJOYW1lLCBJUEM6OlN0cmluZ1JlZmVyZW5jZSBtZXNz YWdlTmFtZSkKQEAgLTc4MCw2ICs3OTYsMTIgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OmRpZEZp bmlzaExhdW5jaGluZyhQcm9jZXNzTGF1bmNoZXIqIGxhdW5jaGVyLCBJUEM6OkNvbm5lY3QKICAg ICAgICAgcGFnZS0+cHJvY2Vzc0RpZEZpbmlzaExhdW5jaGluZygpOwogICAgIH0KIAorICAgIGZv ciAoYXV0byogcHJvdmlzaW9uYWxQYWdlIDogbV9wcm92aXNpb25hbFBhZ2VzKSB7CisgICAgICAg IEFTU0VSVCh0aGlzID09ICZwcm92aXNpb25hbFBhZ2UtPnByb2Nlc3MoKSk7CisgICAgICAgIHBy b3Zpc2lvbmFsUGFnZS0+cHJvY2Vzc0RpZEZpbmlzaExhdW5jaGluZygpOworICAgIH0KKworCiAg ICAgUkVMRUFTRV9BU1NFUlQoIW1fd2ViQ29ubmVjdGlvbik7CiAgICAgbV93ZWJDb25uZWN0aW9u ID0gV2ViQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6Y3JlYXRlKHRoaXMpOwogCkBAIC04NzMsNyAr ODk1LDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6Om1heWJlU2h1dERvd24oKQogCiBib29sIFdl YlByb2Nlc3NQcm94eTo6Y2FuVGVybWluYXRlQ2hpbGRQcm9jZXNzKCkKIHsKLSAgICBpZiAoIW1f cGFnZU1hcC5pc0VtcHR5KCkgfHwgbV9wcm9jZXNzUG9vbC0+aGFzU3VzcGVuZGVkUGFnZUZvcigq dGhpcykpCisgICAgaWYgKCFtX3BhZ2VNYXAuaXNFbXB0eSgpIHx8IG1fcHJvY2Vzc1Bvb2wtPmhh c1N1c3BlbmRlZFBhZ2VGb3IoKnRoaXMpIHx8ICFtX3Byb3Zpc2lvbmFsUGFnZXMuaXNFbXB0eSgp KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAoIW1fcHJvY2Vzc1Bvb2wtPnNob3Vs ZFRlcm1pbmF0ZSh0aGlzKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlByb2Nlc3NQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5 LmgKaW5kZXggNzVmNjVhN2Y3ZWIuLjUwNDI2MzBkZTM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUHJveHkuaApAQCAtNzAsNiArNzAsNyBAQCBuYW1lc3BhY2UgV2ViS2l0 IHsKIGNsYXNzIE5ldHdvcmtQcm9jZXNzUHJveHk7CiBjbGFzcyBPYmpDT2JqZWN0R3JhcGg7CiBj bGFzcyBQYWdlQ2xpZW50OworY2xhc3MgUHJvdmlzaW9uYWxQYWdlUHJveHk7CiBjbGFzcyBVc2Vy TWVkaWFDYXB0dXJlTWFuYWdlclByb3h5OwogY2xhc3MgVmlzaXRlZExpbmtTdG9yZTsKIGNsYXNz IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW07CkBAIC0xMjQsNiArMTI1LDkgQEAgcHVibGljOgogICAg IGVudW0gY2xhc3MgRW5kc1VzaW5nRGF0YVN0b3JlIDogYm9vbCB7IE5vLCBZZXMgfTsKICAgICB2 b2lkIHJlbW92ZVdlYlBhZ2UoV2ViUGFnZVByb3h5JiwgdWludDY0X3QgcGFnZUlELCBFbmRzVXNp bmdEYXRhU3RvcmUpOwogCisgICAgdm9pZCBhZGRQcm92aXNpb25hbFBhZ2VQcm94eShQcm92aXNp b25hbFBhZ2VQcm94eSYgcHJvdmlzaW9uYWxQYWdlKSB7IEFTU0VSVCghbV9wcm92aXNpb25hbFBh Z2VzLmNvbnRhaW5zKCZwcm92aXNpb25hbFBhZ2UpKTsgbV9wcm92aXNpb25hbFBhZ2VzLmFkZCgm cHJvdmlzaW9uYWxQYWdlKTsgfQorICAgIHZvaWQgcmVtb3ZlUHJvdmlzaW9uYWxQYWdlUHJveHko UHJvdmlzaW9uYWxQYWdlUHJveHkmIHByb3Zpc2lvbmFsUGFnZSkgeyBBU1NFUlQobV9wcm92aXNp b25hbFBhZ2VzLmNvbnRhaW5zKCZwcm92aXNpb25hbFBhZ2UpKTsgbV9wcm92aXNpb25hbFBhZ2Vz LnJlbW92ZSgmcHJvdmlzaW9uYWxQYWdlKTsgfQorCiAgICAgdHlwZW5hbWUgV2ViUGFnZVByb3h5 TWFwOjpWYWx1ZXNDb25zdEl0ZXJhdG9yUmFuZ2UgcGFnZXMoKSBjb25zdCB7IHJldHVybiBtX3Bh Z2VNYXAudmFsdWVzKCk7IH0KICAgICB1bnNpZ25lZCBwYWdlQ291bnQoKSBjb25zdCB7IHJldHVy biBtX3BhZ2VNYXAuc2l6ZSgpOyB9CiAgICAgdW5zaWduZWQgdmlzaWJsZVBhZ2VDb3VudCgpIGNv bnN0IHsgcmV0dXJuIG1fdmlzaWJsZVBhZ2VDb3VudGVyLnZhbHVlKCk7IH0KQEAgLTMzMCw2ICsz MzQsOCBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBsb2dEaWFnbm9zdGljTWVzc2FnZUZvclJlc291 cmNlTGltaXRUZXJtaW5hdGlvbihjb25zdCBTdHJpbmcmIGxpbWl0S2V5KTsKIAorICAgIGJvb2wg aGFzUHJvdmlzaW9uYWxQYWdlV2l0aElEKHVpbnQ2NF90IHBhZ2VJRCkgY29uc3Q7CisKICAgICBl bnVtIGNsYXNzIElzV2VhayB7IE5vLCBZZXMgfTsKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBj bGFzcyBXZWFrT3JTdHJvbmdQdHIgewogICAgIHB1YmxpYzoKQEAgLTM3Myw2ICszNzksNyBAQCBw cml2YXRlOgogCiAgICAgV2ViUGFnZVByb3h5TWFwIG1fcGFnZU1hcDsKICAgICBXZWJGcmFtZVBy b3h5TWFwIG1fZnJhbWVNYXA7CisgICAgSGFzaFNldDxQcm92aXNpb25hbFBhZ2VQcm94eSo+IG1f cHJvdmlzaW9uYWxQYWdlczsKICAgICBVc2VySW5pdGlhdGVkQWN0aW9uTWFwIG1fdXNlckluaXRp YXRlZEFjdGlvbk1hcDsKIAogICAgIEhhc2hTZXQ8VmlzaXRlZExpbmtTdG9yZSo+IG1fdmlzaXRl ZExpbmtTdG9yZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJVUkxT Y2hlbWVIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlVSTFNjaGVtZUhh bmRsZXIuY3BwCmluZGV4IGEwOWVkZDkxYWRiLi41YmE3ZmNlZjhlNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViVVJMU2NoZW1lSGFuZGxlci5jcHAKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViVVJMU2NoZW1lSGFuZGxlci5jcHAKQEAgLTQ4LDkgKzQ4LDkg QEAgV2ViVVJMU2NoZW1lSGFuZGxlcjo6fldlYlVSTFNjaGVtZUhhbmRsZXIoKQogICAgIEFTU0VS VChtX3Rhc2tzLmlzRW1wdHkoKSk7CiB9CiAKLXZvaWQgV2ViVVJMU2NoZW1lSGFuZGxlcjo6c3Rh cnRUYXNrKFdlYlBhZ2VQcm94eSYgcGFnZSwgdWludDY0X3QgdGFza0lkZW50aWZpZXIsIFJlc291 cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFN5bmNMb2FkQ29tcGxldGlvbkhhbmRsZXImJiBjb21wbGV0 aW9uSGFuZGxlcikKK3ZvaWQgV2ViVVJMU2NoZW1lSGFuZGxlcjo6c3RhcnRUYXNrKFdlYlBhZ2VQ cm94eSYgcGFnZSwgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzLCB1aW50NjRfdCB0YXNrSWRlbnRp ZmllciwgUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgU3luY0xvYWRDb21wbGV0aW9uSGFuZGxl ciYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGF1dG8gcmVzdWx0ID0gbV90YXNrcy5hZGQo dGFza0lkZW50aWZpZXIsIFdlYlVSTFNjaGVtZVRhc2s6OmNyZWF0ZSgqdGhpcywgcGFnZSwgdGFz a0lkZW50aWZpZXIsIFdURk1vdmUocmVxdWVzdCksIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp KSk7CisgICAgYXV0byByZXN1bHQgPSBtX3Rhc2tzLmFkZCh0YXNrSWRlbnRpZmllciwgV2ViVVJM U2NoZW1lVGFzazo6Y3JlYXRlKCp0aGlzLCBwYWdlLCBwcm9jZXNzLCB0YXNrSWRlbnRpZmllciwg V1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpKTsKICAgICBBU1NF UlQocmVzdWx0LmlzTmV3RW50cnkpOwogCiAgICAgYXV0byBwYWdlRW50cnkgPSBtX3Rhc2tzQnlQ YWdlSWRlbnRpZmllci5hZGQocGFnZS5wYWdlSUQoKSwgSGFzaFNldDx1aW50NjRfdD4oKSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJVUkxTY2hlbWVIYW5kbGVyLmgg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJVUkxTY2hlbWVIYW5kbGVyLmgKaW5kZXggYjc4 NGE1M2E0YjEuLmFjODEyZjI1YzE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJVUkxTY2hlbWVIYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi VVJMU2NoZW1lSGFuZGxlci5oCkBAIC00Miw2ICs0Miw3IEBAIGNsYXNzIFJlc291cmNlUmVxdWVz dDsKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBXZWJQYWdlUHJveHk7CitjbGFzcyBXZWJQ cm9jZXNzUHJveHk7CiAKIHVzaW5nIFN5bmNMb2FkQ29tcGxldGlvbkhhbmRsZXIgPSBDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmLCBjb25zdCBX ZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJik+OwogCkBA IC01Miw3ICs1Myw3IEBAIHB1YmxpYzoKIAogICAgIHVpbnQ2NF90IGlkZW50aWZpZXIoKSBjb25z dCB7IHJldHVybiBtX2lkZW50aWZpZXI7IH0KIAotICAgIHZvaWQgc3RhcnRUYXNrKFdlYlBhZ2VQ cm94eSYsIHVpbnQ2NF90IHRhc2tJZGVudGlmaWVyLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Qm JiwgU3luY0xvYWRDb21wbGV0aW9uSGFuZGxlciYmKTsKKyAgICB2b2lkIHN0YXJ0VGFzayhXZWJQ YWdlUHJveHkmLCBXZWJQcm9jZXNzUHJveHkmLCB1aW50NjRfdCB0YXNrSWRlbnRpZmllciwgV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFN5bmNMb2FkQ29tcGxldGlvbkhhbmRsZXImJik7CiAg ICAgdm9pZCBzdG9wVGFzayhXZWJQYWdlUHJveHkmLCB1aW50NjRfdCB0YXNrSWRlbnRpZmllcik7 CiAgICAgdm9pZCBzdG9wQWxsVGFza3NGb3JQYWdlKFdlYlBhZ2VQcm94eSYpOwogICAgIHZvaWQg dGFza0NvbXBsZXRlZChXZWJVUkxTY2hlbWVUYXNrJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJVUkxTY2hlbWVUYXNrLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlVSTFNjaGVtZVRhc2suY3BwCmluZGV4IGUxY2RlOGRjYjZhLi4xOWE2YmI4NGMzYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViVVJMU2NoZW1lVGFzay5jcHAK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViVVJMU2NoZW1lVGFzay5jcHAKQEAgLTM2 LDE0ICszNiwxNSBAQAogbmFtZXNwYWNlIFdlYktpdCB7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29y ZTsKIAotUmVmPFdlYlVSTFNjaGVtZVRhc2s+IFdlYlVSTFNjaGVtZVRhc2s6OmNyZWF0ZShXZWJV UkxTY2hlbWVIYW5kbGVyJiBoYW5kbGVyLCBXZWJQYWdlUHJveHkmIHBhZ2UsIHVpbnQ2NF90IHJl c291cmNlSWRlbnRpZmllciwgUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgU3luY0xvYWRDb21w bGV0aW9uSGFuZGxlciYmIHN5bmNDb21wbGV0aW9uSGFuZGxlcikKK1JlZjxXZWJVUkxTY2hlbWVU YXNrPiBXZWJVUkxTY2hlbWVUYXNrOjpjcmVhdGUoV2ViVVJMU2NoZW1lSGFuZGxlciYgaGFuZGxl ciwgV2ViUGFnZVByb3h5JiBwYWdlLCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIHVpbnQ2NF90 IHJlc291cmNlSWRlbnRpZmllciwgUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgU3luY0xvYWRD b21wbGV0aW9uSGFuZGxlciYmIHN5bmNDb21wbGV0aW9uSGFuZGxlcikKIHsKLSAgICByZXR1cm4g YWRvcHRSZWYoKm5ldyBXZWJVUkxTY2hlbWVUYXNrKGhhbmRsZXIsIHBhZ2UsIHJlc291cmNlSWRl bnRpZmllciwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShzeW5jQ29tcGxldGlvbkhhbmRsZXIp KSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgV2ViVVJMU2NoZW1lVGFzayhoYW5kbGVyLCBw YWdlLCBwcm9jZXNzLCByZXNvdXJjZUlkZW50aWZpZXIsIFdURk1vdmUocmVxdWVzdCksIFdURk1v dmUoc3luY0NvbXBsZXRpb25IYW5kbGVyKSkpOwogfQogCi1XZWJVUkxTY2hlbWVUYXNrOjpXZWJV UkxTY2hlbWVUYXNrKFdlYlVSTFNjaGVtZUhhbmRsZXImIGhhbmRsZXIsIFdlYlBhZ2VQcm94eSYg cGFnZSwgdWludDY0X3QgcmVzb3VyY2VJZGVudGlmaWVyLCBSZXNvdXJjZVJlcXVlc3QmJiByZXF1 ZXN0LCBTeW5jTG9hZENvbXBsZXRpb25IYW5kbGVyJiYgc3luY0NvbXBsZXRpb25IYW5kbGVyKQor V2ViVVJMU2NoZW1lVGFzazo6V2ViVVJMU2NoZW1lVGFzayhXZWJVUkxTY2hlbWVIYW5kbGVyJiBo YW5kbGVyLCBXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcywgdWlu dDY0X3QgcmVzb3VyY2VJZGVudGlmaWVyLCBSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBTeW5j TG9hZENvbXBsZXRpb25IYW5kbGVyJiYgc3luY0NvbXBsZXRpb25IYW5kbGVyKQogICAgIDogbV91 cmxTY2hlbWVIYW5kbGVyKGhhbmRsZXIpCiAgICAgLCBtX3BhZ2UoJnBhZ2UpCisgICAgLCBtX3By b2Nlc3MobWFrZVJlZihwcm9jZXNzKSkKICAgICAsIG1faWRlbnRpZmllcihyZXNvdXJjZUlkZW50 aWZpZXIpCiAgICAgLCBtX3BhZ2VJZGVudGlmaWVyKHBhZ2UucGFnZUlEKCkpCiAgICAgLCBtX3Jl cXVlc3QoV1RGTW92ZShyZXF1ZXN0KSkKQEAgLTY5LDcgKzcwLDcgQEAgYXV0byBXZWJVUkxTY2hl bWVUYXNrOjpkaWRQZXJmb3JtUmVkaXJlY3Rpb24oV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYm IHJlc3BvbnMKICAgICAgICAgbV9zeW5jUmVzcG9uc2UgPSByZXNwb25zZTsKIAogICAgIG1fcmVx dWVzdCA9IHJlcXVlc3Q7Ci0gICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpVUkxT Y2hlbWVUYXNrRGlkUGVyZm9ybVJlZGlyZWN0aW9uKG1fdXJsU2NoZW1lSGFuZGxlci0+aWRlbnRp ZmllcigpLCBtX2lkZW50aWZpZXIsIHJlc3BvbnNlLCByZXF1ZXN0KSk7CisgICAgbV9wcm9jZXNz LT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpVUkxTY2hlbWVUYXNrRGlkUGVyZm9ybVJlZGlyZWN0 aW9uKG1fdXJsU2NoZW1lSGFuZGxlci0+aWRlbnRpZmllcigpLCBtX2lkZW50aWZpZXIsIHJlc3Bv bnNlLCByZXF1ZXN0KSwgbV9wYWdlLT5wYWdlSUQoKSk7CiAKICAgICByZXR1cm4gRXhjZXB0aW9u VHlwZTo6Tm9uZTsKIH0KQEAgLTkyLDcgKzkzLDcgQEAgYXV0byBXZWJVUkxTY2hlbWVUYXNrOjpk aWRSZWNlaXZlUmVzcG9uc2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpIC0+IEUK ICAgICBpZiAoaXNTeW5jKCkpCiAgICAgICAgIG1fc3luY1Jlc3BvbnNlID0gcmVzcG9uc2U7CiAK LSAgICBtX3BhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlVSTFNjaGVtZVRhc2tEaWRSZWNl aXZlUmVzcG9uc2UobV91cmxTY2hlbWVIYW5kbGVyLT5pZGVudGlmaWVyKCksIG1faWRlbnRpZmll ciwgcmVzcG9uc2UpKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlVS TFNjaGVtZVRhc2tEaWRSZWNlaXZlUmVzcG9uc2UobV91cmxTY2hlbWVIYW5kbGVyLT5pZGVudGlm aWVyKCksIG1faWRlbnRpZmllciwgcmVzcG9uc2UpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKICAgICBy ZXR1cm4gRXhjZXB0aW9uVHlwZTo6Tm9uZTsKIH0KIApAQCAtMTE3LDcgKzExOCw3IEBAIGF1dG8g V2ViVVJMU2NoZW1lVGFzazo6ZGlkUmVjZWl2ZURhdGEoUmVmPFNoYXJlZEJ1ZmZlcj4mJiBidWZm ZXIpIC0+IEV4Y2VwdGlvblR5CiAgICAgICAgIHJldHVybiBFeGNlcHRpb25UeXBlOjpOb25lOwog ICAgIH0KIAotICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6VVJMU2NoZW1lVGFz a0RpZFJlY2VpdmVEYXRhKG1fdXJsU2NoZW1lSGFuZGxlci0+aWRlbnRpZmllcigpLCBtX2lkZW50 aWZpZXIsIHsgYnVmZmVyIH0pKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OlVSTFNjaGVtZVRhc2tEaWRSZWNlaXZlRGF0YShtX3VybFNjaGVtZUhhbmRsZXItPmlkZW50 aWZpZXIoKSwgbV9pZGVudGlmaWVyLCB7IGJ1ZmZlciB9KSwgbV9wYWdlLT5wYWdlSUQoKSk7CiAg ICAgcmV0dXJuIEV4Y2VwdGlvblR5cGU6Ok5vbmU7CiB9CiAKQEAgLTE0Miw3ICsxNDMsNyBAQCBh dXRvIFdlYlVSTFNjaGVtZVRhc2s6OmRpZENvbXBsZXRlKGNvbnN0IFJlc291cmNlRXJyb3ImIGVy cm9yKSAtPiBFeGNlcHRpb25UeXBlCiAgICAgICAgIG1fc3luY0RhdGEgPSBudWxscHRyOwogICAg IH0KIAotICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6VVJMU2NoZW1lVGFza0Rp ZENvbXBsZXRlKG1fdXJsU2NoZW1lSGFuZGxlci0+aWRlbnRpZmllcigpLCBtX2lkZW50aWZpZXIs IGVycm9yKSk7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpVUkxTY2hl bWVUYXNrRGlkQ29tcGxldGUobV91cmxTY2hlbWVIYW5kbGVyLT5pZGVudGlmaWVyKCksIG1faWRl bnRpZmllciwgZXJyb3IpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKICAgICBtX3VybFNjaGVtZUhhbmRs ZXItPnRhc2tDb21wbGV0ZWQoKnRoaXMpOwogCiAgICAgcmV0dXJuIEV4Y2VwdGlvblR5cGU6Ok5v bmU7CkBAIC0xNTIsNiArMTUzLDcgQEAgdm9pZCBXZWJVUkxTY2hlbWVUYXNrOjpwYWdlRGVzdHJv eWVkKCkKIHsKICAgICBBU1NFUlQobV9wYWdlKTsKICAgICBtX3BhZ2UgPSBudWxscHRyOworICAg IG1fcHJvY2VzcyA9IG51bGxwdHI7CiAgICAgbV9zdG9wcGVkID0gdHJ1ZTsKICAgICAKICAgICBp ZiAoaXNTeW5jKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJVUkxT Y2hlbWVUYXNrLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJVUkxTY2hlbWVUYXNrLmgK aW5kZXggNDE1ZjdmMzcwNzguLmQ0OGE0MDhlNDkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJVUkxTY2hlbWVUYXNrLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViVVJMU2NoZW1lVGFzay5oCkBAIC0yNSw2ICsyNSw3IEBACiAKICNwcmFnbWEgb25jZQog CisjaW5jbHVkZSAiV2ViUHJvY2Vzc1Byb3h5LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJj ZVJlcXVlc3QuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlUmVzcG9uc2UuaD4KICNpbmNs dWRlIDxXZWJDb3JlL1NoYXJlZEJ1ZmZlci5oPgpAQCAtNTMsNyArNTQsNyBAQCB1c2luZyBTeW5j TG9hZENvbXBsZXRpb25IYW5kbGVyID0gQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBXZWJD b3JlOjpSZXNvdXJjZQogY2xhc3MgV2ViVVJMU2NoZW1lVGFzayA6IHB1YmxpYyBSZWZDb3VudGVk PFdlYlVSTFNjaGVtZVRhc2s+LCBwdWJsaWMgSW5zdGFuY2VDb3VudGVkPFdlYlVSTFNjaGVtZVRh c2s+IHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShXZWJVUkxTY2hlbWVUYXNrKTsKIHB1Ymxp YzoKLSAgICBzdGF0aWMgUmVmPFdlYlVSTFNjaGVtZVRhc2s+IGNyZWF0ZShXZWJVUkxTY2hlbWVI YW5kbGVyJiwgV2ViUGFnZVByb3h5JiwgdWludDY0X3QgaWRlbnRpZmllciwgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiYsIFN5bmNMb2FkQ29tcGxldGlvbkhhbmRsZXImJik7CisgICAgc3RhdGlj IFJlZjxXZWJVUkxTY2hlbWVUYXNrPiBjcmVhdGUoV2ViVVJMU2NoZW1lSGFuZGxlciYsIFdlYlBh Z2VQcm94eSYsIFdlYlByb2Nlc3NQcm94eSYsIHVpbnQ2NF90IGlkZW50aWZpZXIsIFdlYkNvcmU6 OlJlc291cmNlUmVxdWVzdCYmLCBTeW5jTG9hZENvbXBsZXRpb25IYW5kbGVyJiYpOwogCiAgICAg dWludDY0X3QgaWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1faWRlbnRpZmllcjsgfQogICAg IHVpbnQ2NF90IHBhZ2VJRCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZUlkZW50aWZpZXI7IH0KQEAg LTc3LDEyICs3OCwxMyBAQCBwdWJsaWM6CiAgICAgdm9pZCBwYWdlRGVzdHJveWVkKCk7CiAKIHBy aXZhdGU6Ci0gICAgV2ViVVJMU2NoZW1lVGFzayhXZWJVUkxTY2hlbWVIYW5kbGVyJiwgV2ViUGFn ZVByb3h5JiwgdWludDY0X3QgaWRlbnRpZmllciwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYs IFN5bmNMb2FkQ29tcGxldGlvbkhhbmRsZXImJik7CisgICAgV2ViVVJMU2NoZW1lVGFzayhXZWJV UkxTY2hlbWVIYW5kbGVyJiwgV2ViUGFnZVByb3h5JiwgV2ViUHJvY2Vzc1Byb3h5JiwgdWludDY0 X3QgaWRlbnRpZmllciwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFN5bmNMb2FkQ29tcGxl dGlvbkhhbmRsZXImJik7CiAKICAgICBib29sIGlzU3luYygpIGNvbnN0IHsgcmV0dXJuICEhbV9z eW5jQ29tcGxldGlvbkhhbmRsZXI7IH0KIAogICAgIFJlZjxXZWJVUkxTY2hlbWVIYW5kbGVyPiBt X3VybFNjaGVtZUhhbmRsZXI7CiAgICAgV2ViUGFnZVByb3h5KiBtX3BhZ2U7CisgICAgUmVmUHRy PFdlYlByb2Nlc3NQcm94eT4gbV9wcm9jZXNzOwogICAgIHVpbnQ2NF90IG1faWRlbnRpZmllcjsK ICAgICB1aW50NjRfdCBtX3BhZ2VJZGVudGlmaWVyOwogICAgIFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdCBtX3JlcXVlc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv UGFnZUNsaWVudEltcGxJT1MuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9QYWdlQ2xp ZW50SW1wbElPUy5oCmluZGV4IDVkYTZmOTliZjUyLi45MTgzZjhjMmVkYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLmgKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLmgKQEAgLTUzLDcgKzUz LDcgQEAgcHVibGljOgogICAgIAogcHJpdmF0ZToKICAgICAvLyBQYWdlQ2xpZW50Ci0gICAgc3Rk Ojp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKSBv dmVycmlkZTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJh d2luZ0FyZWFQcm94eShXZWJQcm9jZXNzUHJveHkmKSBvdmVycmlkZTsKICAgICB2b2lkIHNldFZp ZXdOZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29yZTo6UmVnaW9uJikgb3ZlcnJpZGU7CiAgICAgdm9p ZCByZXF1ZXN0U2Nyb2xsKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0aW9u LCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgc2Nyb2xsT3JpZ2luLCBib29sIGlzUHJvZ3JhbW1h dGljU2Nyb2xsKSBvdmVycmlkZTsKICAgICBXZWJDb3JlOjpGbG9hdFBvaW50IHZpZXdTY3JvbGxQ b3NpdGlvbigpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1BhZ2VDbGllbnRJbXBsSU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Bh Z2VDbGllbnRJbXBsSU9TLm1tCmluZGV4IGIyMzdlZjUwNTJhLi5iNjEwNzI0ZjdkZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5tbQpAQCAt ODEsOSArODEsOSBAQCBQYWdlQ2xpZW50SW1wbDo6flBhZ2VDbGllbnRJbXBsKCkKIHsKIH0KIAot c3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVE cmF3aW5nQXJlYVByb3h5KCkKK3N0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBQYWdl Q2xpZW50SW1wbDo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eShXZWJQcm9jZXNzUHJveHkmIHByb2Nl c3MpCiB7Ci0gICAgcmV0dXJuIFttX2NvbnRlbnRWaWV3IF9jcmVhdGVEcmF3aW5nQXJlYVByb3h5 XTsKKyAgICByZXR1cm4gW21fY29udGVudFZpZXcgX2NyZWF0ZURyYXdpbmdBcmVhUHJveHk6cHJv Y2Vzc107CiB9CiAKIHZvaWQgUGFnZUNsaWVudEltcGw6OnNldFZpZXdOZWVkc0Rpc3BsYXkoY29u c3QgUmVnaW9uJikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0Nv bnRlbnRWaWV3LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5o CmluZGV4IDExZmQ4YTA0MGZmLi5hMDYwN2UzZDFhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9pb3MvV0tDb250ZW50Vmlldy5oCkBAIC00Niw2ICs0Niw3IEBAIGNsYXNzIERyYXdpbmdB cmVhUHJveHk7CiBjbGFzcyBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjsKIGNsYXNzIFdlYkZy YW1lUHJveHk7CiBjbGFzcyBXZWJQYWdlUHJveHk7CitjbGFzcyBXZWJQcm9jZXNzUHJveHk7CiBj bGFzcyBXZWJQcm9jZXNzUG9vbDsKIH0KIApAQCAtODYsNyArODcsNyBAQCBjbGFzcyBXZWJQcm9j ZXNzUG9vbDsKIAogLSAodm9pZClfd2ViVmlld0Rlc3Ryb3llZDsKIAotLSAoc3RkOjp1bmlxdWVf cHRyPFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eT4pX2NyZWF0ZURyYXdpbmdBcmVhUHJveHk7Cist IChzdGQ6OnVuaXF1ZV9wdHI8V2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5PilfY3JlYXRlRHJhd2lu Z0FyZWFQcm94eTooV2ViS2l0OjpXZWJQcm9jZXNzUHJveHkmKXByb2Nlc3M7CiAtICh2b2lkKV9w cm9jZXNzRGlkRXhpdDsKIC0gKHZvaWQpX3Byb2Nlc3NXaWxsU3dhcDsKIC0gKHZvaWQpX2RpZFJl bGF1bmNoUHJvY2VzczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXcubW0KaW5kZXggYzI3ZWJjYWUzYjAuLmNlZDg1ZThjOTkxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQpAQCAtNTIwLDkgKzUyMCw5IEBAIC0gKHZv aWQpX3dlYlZpZXdEZXN0cm95ZWQKIAogI3ByYWdtYSBtYXJrIFBhZ2VDbGllbnRJbXBsIG1ldGhv ZHMKIAotLSAoc3RkOjp1bmlxdWVfcHRyPFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eT4pX2NyZWF0 ZURyYXdpbmdBcmVhUHJveHkKKy0gKHN0ZDo6dW5pcXVlX3B0cjxXZWJLaXQ6OkRyYXdpbmdBcmVh UHJveHk+KV9jcmVhdGVEcmF3aW5nQXJlYVByb3h5OihXZWJLaXQ6OldlYlByb2Nlc3NQcm94eSYp cHJvY2VzcwogewotICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPFdlYktpdDo6UmVtb3RlTGF5 ZXJUcmVlRHJhd2luZ0FyZWFQcm94eT4oKl9wYWdlKTsKKyAgICByZXR1cm4gc3RkOjptYWtlX3Vu aXF1ZTxXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk+KCpfcGFnZSwgcHJv Y2Vzcyk7CiB9CiAKIC0gKHZvaWQpX3Byb2Nlc3NEaWRFeGl0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGxNYWMuaCBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbE1hYy5oCmluZGV4IDEyZGMyNWFiY2MzLi4wOGZm ZWE0ZThhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1BhZ2VDbGll bnRJbXBsTWFjLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJ bXBsTWFjLmgKQEAgLTYxLDcgKzYxLDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIC8vIFBh Z2VDbGllbnQKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJh d2luZ0FyZWFQcm94eSgpIG92ZXJyaWRlOworICAgIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJl YVByb3h5PiBjcmVhdGVEcmF3aW5nQXJlYVByb3h5KFdlYlByb2Nlc3NQcm94eSYpIG92ZXJyaWRl OwogICAgIHZvaWQgc2V0Vmlld05lZWRzRGlzcGxheShjb25zdCBXZWJDb3JlOjpSZWdpb24mKSBv dmVycmlkZTsKICAgICB2b2lkIHJlcXVlc3RTY3JvbGwoY29uc3QgV2ViQ29yZTo6RmxvYXRQb2lu dCYgc2Nyb2xsUG9zaXRpb24sIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBzY3JvbGxPcmlnaW4s IGJvb2wgaXNQcm9ncmFtbWF0aWNTY3JvbGwpIG92ZXJyaWRlOwogICAgIFdlYkNvcmU6OkZsb2F0 UG9pbnQgdmlld1Njcm9sbFBvc2l0aW9uKCkgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGxNYWMubW0gYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGxNYWMubW0KaW5kZXggNWQ3YzIzOGVmZDYuLmI0 OGFjM2ZhMmJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvUGFnZUNs aWVudEltcGxNYWMubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1BhZ2VDbGll bnRJbXBsTWFjLm1tCkBAIC0xMjMsOSArMTIzLDkgQEAgdm9pZCBQYWdlQ2xpZW50SW1wbDo6c2V0 SW1wbChXZWJWaWV3SW1wbCYgaW1wbCkKICAgICBtX2ltcGwgPSBtYWtlV2Vha1B0cihpbXBsKTsK IH0KIAotc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IFBhZ2VDbGllbnRJbXBsOjpj cmVhdGVEcmF3aW5nQXJlYVByb3h5KCkKK3N0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5 PiBQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eShXZWJQcm9jZXNzUHJveHkm IHByb2Nlc3MpCiB7Ci0gICAgcmV0dXJuIG1faW1wbC0+Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSgp OworICAgIHJldHVybiBtX2ltcGwtPmNyZWF0ZURyYXdpbmdBcmVhUHJveHkocHJvY2Vzcyk7CiB9 CiAKIHZvaWQgUGFnZUNsaWVudEltcGw6OnNldFZpZXdOZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29y ZTo6UmVnaW9uJikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9UaWxl ZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5oCmluZGV4IDE3OWJkMjhj ZmUzLi5mMmYyNzAyYTAxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFj L1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5oCkBAIC0z Myw3ICszMyw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBUaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYVByb3h5IDogcHVibGljIERyYXdpbmdBcmVhUHJveHkgewogcHVibGljOgot ICAgIGV4cGxpY2l0IFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkoV2ViUGFnZVBy b3h5Jik7CisgICAgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eShXZWJQYWdlUHJv eHkmLCBXZWJQcm9jZXNzUHJveHkmKTsKICAgICB2aXJ0dWFsIH5UaWxlZENvcmVBbmltYXRpb25E cmF3aW5nQXJlYVByb3h5KCk7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5tbSBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVBy b3h5Lm1tCmluZGV4IGJjOGJjNDE2YmIzLi43N2M4MzgwOTE0YiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHku bW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhUHJveHkubW0KQEAgLTQyLDggKzQyLDggQEAgbmFtZXNwYWNlIFdlYktpdCB7CiB1 c2luZyBuYW1lc3BhY2UgSVBDOwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKLVRpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh UHJveHkoV2ViUGFnZVByb3h5JiB3ZWJQYWdlUHJveHkpCi0gICAgOiBEcmF3aW5nQXJlYVByb3h5 KERyYXdpbmdBcmVhVHlwZVRpbGVkQ29yZUFuaW1hdGlvbiwgd2ViUGFnZVByb3h5KQorVGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eTo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0Fy ZWFQcm94eShXZWJQYWdlUHJveHkmIHdlYlBhZ2VQcm94eSwgV2ViUHJvY2Vzc1Byb3h5JiBwcm9j ZXNzKQorICAgIDogRHJhd2luZ0FyZWFQcm94eShEcmF3aW5nQXJlYVR5cGVUaWxlZENvcmVBbmlt YXRpb24sIHdlYlBhZ2VQcm94eSwgcHJvY2VzcykKICAgICAsIG1faXNXYWl0aW5nRm9yRGlkVXBk YXRlR2VvbWV0cnkoZmFsc2UpCiB7CiB9CkBAIC01NSw3ICs1NSw3IEBAIFRpbGVkQ29yZUFuaW1h dGlvbkRyYXdpbmdBcmVhUHJveHk6On5UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5 KCkKIAogdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5OjpkZXZpY2VTY2Fs ZUZhY3RvckRpZENoYW5nZSgpCiB7Ci0gICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnNlbmQo TWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpTZXREZXZpY2VTY2FsZUZhY3RvcihtX3dlYlBhZ2VQcm94 eS5kZXZpY2VTY2FsZUZhY3RvcigpKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOworICAgIHBy b2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6U2V0RGV2aWNlU2NhbGVGYWN0b3Io bV93ZWJQYWdlUHJveHkuZGV2aWNlU2NhbGVGYWN0b3IoKSksIG1fd2ViUGFnZVByb3h5LnBhZ2VJ RCgpKTsKIH0KIAogdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5OjpzaXpl RGlkQ2hhbmdlKCkKQEAgLTczLDcgKzczLDcgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYVByb3h5OjpzaXplRGlkQ2hhbmdlKCkKIAogdm9pZCBUaWxlZENvcmVBbmltYXRpb25E cmF3aW5nQXJlYVByb3h5Ojpjb2xvclNwYWNlRGlkQ2hhbmdlKCkKIHsKLSAgICBtX3dlYlBhZ2VQ cm94eS5wcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6OlNldENvbG9yU3BhY2Uo bV93ZWJQYWdlUHJveHkuY29sb3JTcGFjZSgpKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOwor ICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6U2V0Q29sb3JTcGFjZSht X3dlYlBhZ2VQcm94eS5jb2xvclNwYWNlKCkpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CiB9 CiAKIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eTo6dmlld0xheW91dFNp emVEaWRDaGFuZ2UoKQpAQCAtMTIyLDcgKzEyMiw3IEBAIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9u RHJhd2luZ0FyZWFQcm94eTo6ZGlkVXBkYXRlR2VvbWV0cnkoKQogdm9pZCBUaWxlZENvcmVBbmlt YXRpb25EcmF3aW5nQXJlYVByb3h5Ojp3YWl0Rm9yRGlkVXBkYXRlQWN0aXZpdHlTdGF0ZShBY3Rp dml0eVN0YXRlQ2hhbmdlSUQpCiB7CiAgICAgU2Vjb25kcyBhY3Rpdml0eVN0YXRlVXBkYXRlVGlt ZW91dCA9IFNlY29uZHM6OmZyb21NaWxsaXNlY29uZHMoMjUwKTsKLSAgICBtX3dlYlBhZ2VQcm94 eS5wcm9jZXNzKCkuY29ubmVjdGlvbigpLT53YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVseTxN ZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRVcGRhdGVBY3Rpdml0eVN0YXRlPihtX3dlYlBhZ2VQ cm94eS5wYWdlSUQoKSwgYWN0aXZpdHlTdGF0ZVVwZGF0ZVRpbWVvdXQsIElQQzo6V2FpdEZvck9w dGlvbjo6SW50ZXJydXB0V2FpdGluZ0lmU3luY01lc3NhZ2VBcnJpdmVzKTsKKyAgICBwcm9jZXNz KCkuY29ubmVjdGlvbigpLT53YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVseTxNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpEaWRVcGRhdGVBY3Rpdml0eVN0YXRlPihtX3dlYlBhZ2VQcm94eS5wYWdl SUQoKSwgYWN0aXZpdHlTdGF0ZVVwZGF0ZVRpbWVvdXQsIElQQzo6V2FpdEZvck9wdGlvbjo6SW50 ZXJydXB0V2FpdGluZ0lmU3luY01lc3NhZ2VBcnJpdmVzKTsKIH0KIAogdm9pZCBUaWxlZENvcmVB bmltYXRpb25EcmF3aW5nQXJlYVByb3h5OjppbnRyaW5zaWNDb250ZW50U2l6ZURpZENoYW5nZShj b25zdCBJbnRTaXplJiBuZXdJbnRyaW5zaWNDb250ZW50U2l6ZSkKQEAgLTE1MSwxOSArMTUxLDE5 IEBAIE1hY2hTZW5kUmlnaHQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eTo6Y3Jl YXRlRmVuY2UoKQogICAgIC8vIHdpbGwgbGlrZWx5IGdldCBkcm9wcGVkIG9uIHRoZSBmbG9vciAo aWYgdGhlIFdlYiBwcm9jZXNzIGlzIHRlcm1pbmF0ZWQpCiAgICAgLy8gb3IgcXVldWVkIHVwIHVu dGlsIHByb2Nlc3MgbGF1bmNoIGNvbXBsZXRlcywgYW5kIHRoZXJlJ3Mgbm90aGluZyB1c2VmdWwK ICAgICAvLyB0byBzeW5jaHJvbml6ZSBpbiB0aGVzZSBjYXNlcy4KLSAgICBpZiAoIW1fd2ViUGFn ZVByb3h5LnByb2Nlc3MoKS5jb25uZWN0aW9uKCkpCisgICAgaWYgKCFwcm9jZXNzKCkuY29ubmVj dGlvbigpKQogICAgICAgICByZXR1cm4gTWFjaFNlbmRSaWdodCgpOwogCiAgICAgLy8gRG9uJ3Qg ZmVuY2UgaWYgd2UgaGF2ZSBpbmNvbWluZyBzeW5jaHJvbm91cyBtZXNzYWdlcywgYmVjYXVzZSB3 ZSBtYXkgbm90CiAgICAgLy8gYmUgYWJsZSB0byByZXBseSB0byB0aGUgbWVzc2FnZSB1bnRpbCB0 aGUgZmVuY2UgdGltZXMgb3V0LgotICAgIGlmIChtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuY29u bmVjdGlvbigpLT5oYXNJbmNvbWluZ1N5bmNNZXNzYWdlKCkpCisgICAgaWYgKHByb2Nlc3MoKS5j b25uZWN0aW9uKCktPmhhc0luY29taW5nU3luY01lc3NhZ2UoKSkKICAgICAgICAgcmV0dXJuIE1h Y2hTZW5kUmlnaHQoKTsKIAogICAgIE1hY2hTZW5kUmlnaHQgZmVuY2VQb3J0ID0gTWFjaFNlbmRS aWdodDo6YWRvcHQoW3Jvb3RMYXllckNvbnRleHQgY3JlYXRlRmVuY2VQb3J0XSk7CiAKICAgICAv LyBJbnZhbGlkYXRlIHRoZSBmZW5jZSBpZiBhIHN5bmNocm9ub3VzIG1lc3NhZ2UgYXJyaXZlcyB3 aGlsZSBpdCdzIGluc3RhbGxlZCwKICAgICAvLyBiZWNhdXNlIHdlIHdvbid0IGJlIGFibGUgdG8g cmVwbHkgZHVyaW5nIHRoZSBmZW5jZS13YWl0LgotICAgIHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBt X3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuY29ubmVjdGlvbigpLT5pbnN0YWxsSW5jb21pbmdTeW5j TWVzc2FnZUNhbGxiYWNrKFtyb290TGF5ZXJDb250ZXh0XSB7CisgICAgdWludDY0X3QgY2FsbGJh Y2tJRCA9IHByb2Nlc3MoKS5jb25uZWN0aW9uKCktPmluc3RhbGxJbmNvbWluZ1N5bmNNZXNzYWdl Q2FsbGJhY2soW3Jvb3RMYXllckNvbnRleHRdIHsKICAgICAgICAgW3Jvb3RMYXllckNvbnRleHQg aW52YWxpZGF0ZUZlbmNlc107CiAgICAgfSk7CiAgICAgUmVmUHRyPFdlYlBhZ2VQcm94eT4gcmV0 YWluZWRQYWdlID0gJm1fd2ViUGFnZVByb3h5OwpAQCAtMTgyLDE3ICsxODIsMTcgQEAgdm9pZCBU aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5OjpzZW5kVXBkYXRlR2VvbWV0cnkoKQog ICAgIEFTU0VSVCghbV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVHZW9tZXRyeSk7CiAKICAgICB3aWxs U2VuZFVwZGF0ZUdlb21ldHJ5KCk7Ci0gICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnNlbmQo TWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpVcGRhdGVHZW9tZXRyeShtX3NpemUsIHRydWUgLyogZmx1 c2hTeW5jaHJvbm91c2x5ICovLCBjcmVhdGVGZW5jZSgpKSwgbV93ZWJQYWdlUHJveHkucGFnZUlE KCkpOworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6VXBkYXRlR2Vv bWV0cnkobV9zaXplLCB0cnVlIC8qIGZsdXNoU3luY2hyb25vdXNseSAqLywgY3JlYXRlRmVuY2Uo KSksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKIH0KIAogdm9pZCBUaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYVByb3h5OjphZGp1c3RUcmFuc2llbnRab29tKGRvdWJsZSBzY2FsZSwgRmxv YXRQb2ludCBvcmlnaW4pCiB7Ci0gICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnNlbmQoTWVz c2FnZXM6OkRyYXdpbmdBcmVhOjpBZGp1c3RUcmFuc2llbnRab29tKHNjYWxlLCBvcmlnaW4pLCBt X3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CisgICAgcHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRy YXdpbmdBcmVhOjpBZGp1c3RUcmFuc2llbnRab29tKHNjYWxlLCBvcmlnaW4pLCBtX3dlYlBhZ2VQ cm94eS5wYWdlSUQoKSk7CiB9CiAKIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQ cm94eTo6Y29tbWl0VHJhbnNpZW50Wm9vbShkb3VibGUgc2NhbGUsIEZsb2F0UG9pbnQgb3JpZ2lu KQogewotICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5n QXJlYTo6Q29tbWl0VHJhbnNpZW50Wm9vbShzY2FsZSwgb3JpZ2luKSwgbV93ZWJQYWdlUHJveHku cGFnZUlEKCkpOworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6Q29t bWl0VHJhbnNpZW50Wm9vbShzY2FsZSwgb3JpZ2luKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkp OwogfQogCiB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6OmRpc3BhdGNo QWZ0ZXJFbnN1cmluZ0RyYXdpbmcoV1RGOjpGdW5jdGlvbjx2b2lkIChDYWxsYmFja0Jhc2U6OkVy cm9yKT4mJiBjYWxsYmFjaykKQEAgLTIwMiw3ICsyMDIsNyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1h dGlvbkRyYXdpbmdBcmVhUHJveHk6OmRpc3BhdGNoQWZ0ZXJFbnN1cmluZ0RyYXdpbmcoV1RGOjpG dW5jdAogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgbV93ZWJQYWdlUHJveHkucHJvY2Vz cygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpBZGRUcmFuc2FjdGlvbkNhbGxiYWNrSUQo bV9jYWxsYmFja3MucHV0KFdURk1vdmUoY2FsbGJhY2spLCBudWxscHRyKSksIG1fd2ViUGFnZVBy b3h5LnBhZ2VJRCgpKTsKKyAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6 OkFkZFRyYW5zYWN0aW9uQ2FsbGJhY2tJRChtX2NhbGxiYWNrcy5wdXQoV1RGTW92ZShjYWxsYmFj ayksIG51bGxwdHIpKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOwogfQogCiB2b2lkIFRpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6OmRpc3BhdGNoUHJlc2VudGF0aW9uQ2FsbGJh Y2tzQWZ0ZXJGbHVzaGluZ0xheWVycyhjb25zdCBWZWN0b3I8Q2FsbGJhY2tJRD4mIGNhbGxiYWNr SURzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94 eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0K aW5kZXggMDg0YWY4NzA3OTQuLjYyYmU0MTBmMjNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0KQEAgLTY1LDcgKzY1LDcgQEAKICNpbXBvcnQg PHd0Zi90ZXh0L1N0cmluZ0NvbmNhdGVuYXRlLmg+CiAKICNkZWZpbmUgTUVTU0FHRV9DSEVDSyhh c3NlcnRpb24pIE1FU1NBR0VfQ0hFQ0tfQkFTRShhc3NlcnRpb24sIHByb2Nlc3MoKS5jb25uZWN0 aW9uKCkpCi0jZGVmaW5lIE1FU1NBR0VfQ0hFQ0tfVVJMKHVybCkgTUVTU0FHRV9DSEVDS19CQVNF KGNoZWNrVVJMUmVjZWl2ZWRGcm9tQ3VycmVudE9yUHJldmlvdXNXZWJQcm9jZXNzKHVybCksIG1f cHJvY2Vzcy0+Y29ubmVjdGlvbigpKQorI2RlZmluZSBNRVNTQUdFX0NIRUNLX1VSTCh1cmwpIE1F U1NBR0VfQ0hFQ0tfQkFTRShjaGVja1VSTFJlY2VpdmVkRnJvbUN1cnJlbnRPclByZXZpb3VzV2Vi UHJvY2VzcyhtX3Byb2Nlc3MsIHVybCksIG1fcHJvY2Vzcy0+Y29ubmVjdGlvbigpKQogCiBAaW50 ZXJmYWNlIE5TQXBwbGljYXRpb24gKCkKIC0gKEJPT0wpaXNTcGVha2luZzsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dpbi9QYWdlQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy93aW4vUGFnZUNsaWVudEltcGwuY3BwCmluZGV4IDgwZTJjMmQyN2Q3 Li4xNzBjMmQ3NzYzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mvd2luL1Bh Z2VDbGllbnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy93aW4vUGFnZUNs aWVudEltcGwuY3BwCkBAIC00Myw5ICs0Myw5IEBAIFBhZ2VDbGllbnRJbXBsOjpQYWdlQ2xpZW50 SW1wbChXZWJWaWV3JiB2aWV3KQogfQogCiAvLyBQYWdlQ2xpZW50J3MgcHVyZSB2aXJ0dWFsIGZ1 bmN0aW9ucwotc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IFBhZ2VDbGllbnRJbXBs OjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KCkKK3N0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVBy b3h5PiBQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eShXZWJQcm9jZXNzUHJv eHkmIHByb2Nlc3MpCiB7Ci0gICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8RHJhd2luZ0FyZWFQ cm94eUltcGw+KCptX3ZpZXcucGFnZSgpKTsKKyAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxE cmF3aW5nQXJlYVByb3h5SW1wbD4oKm1fdmlldy5wYWdlKCksIHByb2Nlc3MpOwogfQogCiB2b2lk IFBhZ2VDbGllbnRJbXBsOjpzZXRWaWV3TmVlZHNEaXNwbGF5KGNvbnN0IFdlYkNvcmU6OlJlZ2lv biYgcmVnaW9uKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mvd2luL1BhZ2VD bGllbnRJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy93aW4vUGFnZUNsaWVudEltcGwu aAppbmRleCBhMDFiNjhmNDNmMy4uNjY1NzJiYjE0MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL3dpbi9QYWdlQ2xpZW50SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL3dpbi9QYWdlQ2xpZW50SW1wbC5oCkBAIC01Myw3ICs1Myw3IEBAIHB1YmxpYzoKICAg ICBIV05EIHZpZXdXaWRnZXQoKTsKIHByaXZhdGU6CiAgICAgLy8gUGFnZUNsaWVudAotICAgIHN0 ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBjcmVhdGVEcmF3aW5nQXJlYVByb3h5KCkg b3ZlcnJpZGU7CisgICAgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURy YXdpbmdBcmVhUHJveHkoV2ViUHJvY2Vzc1Byb3h5Jikgb3ZlcnJpZGU7CiAgICAgdm9pZCBzZXRW aWV3TmVlZHNEaXNwbGF5KGNvbnN0IFdlYkNvcmU6OlJlZ2lvbiYpIG92ZXJyaWRlOwogICAgIHZv aWQgcmVxdWVzdFNjcm9sbChjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlv biwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHNjcm9sbE9yaWdpbiwgYm9vbCBpc1Byb2dyYW1t YXRpY1Njcm9sbCkgb3ZlcnJpZGU7CiAgICAgV2ViQ29yZTo6RmxvYXRQb2ludCB2aWV3U2Nyb2xs UG9zaXRpb24oKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ov cHJvamVjdC5wYnhwcm9qCmluZGV4IDgwOTYyMWZkMTIyLi4zZjA1NzFkNTZkZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9T b3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0zMDcxLDYg KzMwNzEsOCBAQAogCQk0NjZCQzAzODFGQTI2NkM5MDAyRkE5QzEgLyogV2ViU1dDb250ZXh0TWFu YWdlckNvbm5lY3Rpb24uY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0g V2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQk0NjZCQzAzOTFGQTI2NkM5MDAyRkE5QzEgLyogV2ViU1dDb250ZXh0TWFuYWdlckNv bm5lY3Rpb24uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViU1dDb250ZXh0 TWFuYWdlckNvbm5lY3Rpb24uaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDY2QkMw M0ExRkEyNjZDOTAwMkZBOUMxIC8qIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLm1lc3Nh Z2VzLmluICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0 aW9uLm1lc3NhZ2VzLmluOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk0NjgzNTY5QTIx RTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQYWdlUHJveHkuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gUHJvdmlzaW9uYWxQYWdlUHJveHkuaDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKKwkJNDY4MzU2OUIyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFsUGFn ZVByb3h5LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFByb3Zpc2lv bmFsUGFnZVByb3h5LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDZBMkI2MDYx RTU2NzVBMjAwQzNERURBIC8qIEJhY2tncm91bmRQcm9jZXNzUmVzcG9uc2l2ZW5lc3NUaW1lci5j cHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBCYWNrZ3JvdW5kUHJvY2Vz c1Jlc3BvbnNpdmVuZXNzVGltZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0 NkEyQjYwNzFFNTY3NUEyMDBDM0RFREEgLyogQmFja2dyb3VuZFByb2Nlc3NSZXNwb25zaXZlbmVz c1RpbWVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEJhY2tncm91bmRQcm9j ZXNzUmVzcG9uc2l2ZW5lc3NUaW1lci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0 NkRGMDYzOTFGMzkwNUU1MDAxOTgwQkIgLyogTmV0d29ya0NPUlNQcmVmbGlnaHRDaGVja2VyLmNw cCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IE5ldHdvcmtDT1JTUHJlZmxp Z2h0Q2hlY2tlci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC03MzE3LDYgKzcz MTksOCBAQAogCQkJCTg2RTY3QTIyMTkwRjQxMTgwMDAwNEFCNyAvKiBQcm9jZXNzVGhyb3R0bGVy LmNwcCAqLywKIAkJCQk4NkU2N0EyMTE5MEY0MTE4MDAwMDRBQjcgLyogUHJvY2Vzc1Rocm90dGxl ci5oICovLAogCQkJCTgzMDQ4QUU1MUFDQTQ1REMwMDgyQzgzMiAvKiBQcm9jZXNzVGhyb3R0bGVy Q2xpZW50LmggKi8sCisJCQkJNDY4MzU2OUIyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFs UGFnZVByb3h5LmNwcCAqLywKKwkJCQk0NjgzNTY5QTIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlz aW9uYWxQYWdlUHJveHkuaCAqLywKIAkJCQlBNTVCQTgxQjFCQTI1QjFFMDA3Q0QzM0QgLyogUmVt b3RlV2ViSW5zcGVjdG9yUHJveHkuY3BwICovLAogCQkJCUE1NUJBODE5MUJBMjVCMUUwMDdDRDMz RCAvKiBSZW1vdGVXZWJJbnNwZWN0b3JQcm94eS5oICovLAogCQkJCUE1NUJBODFBMUJBMjVCMUUw MDdDRDMzRCAvKiBSZW1vdGVXZWJJbnNwZWN0b3JQcm94eS5tZXNzYWdlcy5pbiAqLywKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcCBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcAppbmRleCAwMDc0OWI0 NzdhMi4uZmZlZDAwYzgyMDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYkZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJGcmFtZS5jcHAKQEAgLTI2Myw4ICsyNjMsNiBAQCBzdGF0aWMgV2ViQ29yZTo6UG9saWN5 QWN0aW9uIHRvUG9saWN5QWN0aW9uKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24pCiAgICAg ICAgIHJldHVybiBXZWJDb3JlOjpQb2xpY3lBY3Rpb246Oklnbm9yZTsKICAgICBjYXNlIFdlYlBv bGljeUFjdGlvbjo6RG93bmxvYWQ6CiAgICAgICAgIHJldHVybiBXZWJDb3JlOjpQb2xpY3lBY3Rp b246OkRvd25sb2FkOwotICAgIGNhc2UgV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kOgotICAgICAg ICBicmVhazsKICAgICB9CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgcmV0dXJuIFdl YkNvcmU6OlBvbGljeUFjdGlvbjo6SWdub3JlOwpAQCAtMjcyLDExICsyNzAsOCBAQCBzdGF0aWMg V2ViQ29yZTo6UG9saWN5QWN0aW9uIHRvUG9saWN5QWN0aW9uKFdlYlBvbGljeUFjdGlvbiBwb2xp Y3lBY3Rpb24pCiAKIHZvaWQgV2ViRnJhbWU6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1aW50 NjRfdCBsaXN0ZW5lcklELCBXZWJQb2xpY3lBY3Rpb24gYWN0aW9uLCB1aW50NjRfdCBuYXZpZ2F0 aW9uSUQsIERvd25sb2FkSUQgZG93bmxvYWRJRCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0 YT4mJiB3ZWJzaXRlUG9saWNpZXMpCiB7Ci0gICAgaWYgKCFtX2NvcmVGcmFtZSB8fCAhbV9wb2xp Y3lMaXN0ZW5lcklEIHx8IGxpc3RlbmVySUQgIT0gbV9wb2xpY3lMaXN0ZW5lcklEIHx8ICFtX3Bv bGljeUZ1bmN0aW9uKSB7Ci0gICAgICAgIGlmIChhY3Rpb24gPT0gV2ViUG9saWN5QWN0aW9uOjpT dXNwZW5kKQotICAgICAgICAgICAgcGFnZSgpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 OkRpZEZhaWxUb1N1c3BlbmRBZnRlclByb2Nlc3NTd2FwKCkpOworICAgIGlmICghbV9jb3JlRnJh bWUgfHwgIW1fcG9saWN5TGlzdGVuZXJJRCB8fCBsaXN0ZW5lcklEICE9IG1fcG9saWN5TGlzdGVu ZXJJRCB8fCAhbV9wb2xpY3lGdW5jdGlvbikKICAgICAgICAgcmV0dXJuOwotICAgIH0KIAogICAg IEZyYW1lUG9saWN5RnVuY3Rpb24gZnVuY3Rpb24gPSBXVEZNb3ZlKG1fcG9saWN5RnVuY3Rpb24p OwogICAgIGJvb2wgZm9yTmF2aWdhdGlvbkFjdGlvbiA9IG1fcG9saWN5RnVuY3Rpb25Gb3JOYXZp Z2F0aW9uQWN0aW9uID09IEZvck5hdmlnYXRpb25BY3Rpb246OlllczsKQEAgLTI5MiwxNiArMjg3 LDcgQEAgdm9pZCBXZWJGcmFtZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKHVpbnQ2NF90IGxp c3RlbmVySUQsIFdlYlBvbGljeUFjdGlvbiBhY3QKICAgICAgICAgICAgIGRvY3VtZW50TG9hZGVy LT5zZXROYXZpZ2F0aW9uSUQobmF2aWdhdGlvbklEKTsKICAgICB9CiAKLSAgICBib29sIHNob3Vs ZFN1c3BlbmQgPSBmYWxzZTsKLSAgICBpZiAoYWN0aW9uID09IFdlYlBvbGljeUFjdGlvbjo6U3Vz cGVuZCkgewotICAgICAgICBzaG91bGRTdXNwZW5kID0gdHJ1ZTsKLSAgICAgICAgYWN0aW9uID0g V2ViUG9saWN5QWN0aW9uOjpJZ25vcmU7Ci0gICAgfQotCiAgICAgZnVuY3Rpb24odG9Qb2xpY3lB Y3Rpb24oYWN0aW9uKSk7Ci0KLSAgICBpZiAoc2hvdWxkU3VzcGVuZCkKLSAgICAgICAgcGFnZSgp LT5zdXNwZW5kRm9yUHJvY2Vzc1N3YXAoKTsKIH0KIAogdm9pZCBXZWJGcmFtZTo6c3RhcnREb3du bG9hZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFN0cmlu ZyYgc3VnZ2VzdGVkTmFtZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAKaW5kZXggNzYyMDMxMTNkNjAuLmRkOTdkNmViMDdhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtNDAyLDcgKzQwMiw3IEBAIFdl YlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz JiYgcGFyYW1ldGVycykKICAgICAsIG1fb3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgeyBw YXJhbWV0ZXJzLm92ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5IH0KICAgICAsIG1fY3B1TGlt aXQocGFyYW1ldGVycy5jcHVMaW1pdCkKICNpZiBQTEFURk9STShNQUMpCi0gICAgLCBtX3Nob3Vs ZEF0dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNpdGlvbihwYXJhbWV0ZXJzLmlzU3dhcEZyb21T dXNwZW5kZWQpCisgICAgLCBtX3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNpdGlv bihwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXApCiAjZW5kaWYKIHsKICAgICBBU1NFUlQobV9wYWdl SUQpOwpAQCAtNDczLDggKzQ3Myw4IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlE LCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICBtX2RyYXdpbmdB cmVhLT5zZXRQYWludGluZ0VuYWJsZWQoZmFsc2UpOwogICAgIG1fZHJhd2luZ0FyZWEtPnNldFNo b3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQocGFyYW1ldGVycy5zaG91bGRTY2FsZVZpZXdUb0Zp dERvY3VtZW50KTsKIAotICAgIGlmIChwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQpCi0g ICAgICAgIGZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlN3YXBGcm9tU3Vz cGVuZGVkKTsKKyAgICBpZiAocGFyYW1ldGVycy5pc1Byb2Nlc3NTd2FwKQorICAgICAgICBmcmVl emVMYXllclRyZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29uOjpQcm9jZXNzU3dhcCk7CiAKICNpZiBF TkFCTEUoQVNZTkNfU0NST0xMSU5HKQogICAgIG1fdXNlQXN5bmNTY3JvbGxpbmcgPSBwYXJhbWV0 ZXJzLnN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6dGhyZWFkZWRT Y3JvbGxpbmdFbmFibGVkS2V5KCkpOwpAQCAtNjk4LDcgKzY5OCw3IEBAIHZvaWQgV2ViUGFnZTo6 cmVpbml0aWFsaXplV2ViUGFnZShXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVy cykKICAgICAgICAgbV9kcmF3aW5nQXJlYS0+dXBkYXRlUHJlZmVyZW5jZXMocGFyYW1ldGVycy5z dG9yZSk7CiAgICAgICAgIG1fZHJhd2luZ0FyZWEtPnNldFBhaW50aW5nRW5hYmxlZCh0cnVlKTsK ICNpZiBQTEFURk9STShNQUMpCi0gICAgICAgIG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBh Z2VUcmFuc2l0aW9uID0gcGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkOworICAgICAgICBt X3Nob3VsZEF0dGFjaERyYXdpbmdBcmVhT25QYWdlVHJhbnNpdGlvbiA9IHBhcmFtZXRlcnMuaXNQ cm9jZXNzU3dhcDsKICNlbmRpZgogICAgICAgICB1bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVG cmVlemVSZWFzb246OlBhZ2VTdXNwZW5kZWQpOwogICAgIH0KQEAgLTMwNTUsMTIgKzMwNTUsNiBA QCB2b2lkIFdlYlBhZ2U6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1aW50NjRfdCBmcmFtZUlE LCB1aW50NjRfdCBsaXN0ZW5lcklELCBXZQogICAgIFdlYkZyYW1lKiBmcmFtZSA9IFdlYlByb2Nl c3M6OnNpbmdsZXRvbigpLndlYkZyYW1lKGZyYW1lSUQpOwogICAgIGlmICghZnJhbWUpCiAgICAg ICAgIHJldHVybjsKLSAgICBpZiAocG9saWN5QWN0aW9uID09IFdlYlBvbGljeUFjdGlvbjo6U3Vz cGVuZCkgewotICAgICAgICBBU1NFUlQoZnJhbWUgPT0gbV9tYWluRnJhbWUpOwotICAgICAgICBz ZXRJc1N1c3BlbmRlZCh0cnVlKTsKLQotICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5z ZW5kUHJld2FybUluZm9ybWF0aW9uKG1haW5XZWJGcmFtZSgpLT51cmwoKSk7Ci0gICAgfQogICAg IGZyYW1lLT5kaWRSZWNlaXZlUG9saWN5RGVjaXNpb24obGlzdGVuZXJJRCwgcG9saWN5QWN0aW9u LCBuYXZpZ2F0aW9uSUQsIGRvd25sb2FkSUQsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7CiB9 CiAKQEAgLTMxMDIsNyArMzA5Niw3IEBAIHZvaWQgV2ViUGFnZTo6ZGlkQ29tcGxldGVQYWdlVHJh bnNpdGlvbigpCiAKICAgICBib29sIGlzSW5pdGlhbEVtcHR5RG9jdW1lbnQgPSAhbV9tYWluRnJh bWU7CiAgICAgaWYgKCFpc0luaXRpYWxFbXB0eURvY3VtZW50KQotICAgICAgICB1bmZyZWV6ZUxh eWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlN3YXBGcm9tU3VzcGVuZGVkKTsKKyAgICAg ICAgdW5mcmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29uOjpQcm9jZXNzU3dhcCk7 CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgaWYgKG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFP blBhZ2VUcmFuc2l0aW9uICYmICFpc0luaXRpYWxFbXB0eURvY3VtZW50KSB7CkBAIC02MzE0LDYg KzYzMDgsMTAgQEAgdm9pZCBXZWJQYWdlOjpzZXRJc1N1c3BlbmRlZChib29sIHN1c3BlbmRlZCkK ICAgICBpZiAobV9pc1N1c3BlbmRlZCkgewogICAgICAgICAvLyBVbmZyb3plbiBvbiBkcmF3aW5n IGFyZWEgcmVzZXQuCiAgICAgICAgIGZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFz b246OlBhZ2VTdXNwZW5kZWQpOworCisgICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnNl bmRQcmV3YXJtSW5mb3JtYXRpb24obWFpbldlYkZyYW1lKCktPnVybCgpKTsKKworICAgICAgICBz dXNwZW5kRm9yUHJvY2Vzc1N3YXAoKTsKICAgICB9IGVsc2UKICAgICAgICAgbV9zaG91bGRSZXNl dERyYXdpbmdBcmVhQWZ0ZXJTdXNwZW5kID0gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA3MTVlMTI0NTIwZi4uZjNiOTM0ZTI3ZGEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTY5Niw3ICs2 OTYsNyBAQCBwdWJsaWM6CiAgICAgICAgIFByb2Nlc3NTdXNwZW5kZWQgICAgICAgID0gMSA8PCAy LAogICAgICAgICBQYWdlU3VzcGVuZGVkICAgICAgICAgICA9IDEgPDwgMywKICAgICAgICAgUHJp bnRpbmcgICAgICAgICAgICAgICAgPSAxIDw8IDQsCi0gICAgICAgIFN3YXBGcm9tU3VzcGVuZGVk ICAgICAgID0gMSA8PCA1LAorICAgICAgICBQcm9jZXNzU3dhcCAgICAgICAgICAgICA9IDEgPDwg NSwKICAgICB9OwogICAgIHZvaWQgZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNv bik7CiAgICAgdm9pZCB1bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb24pOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCmluZGV4IDVlZTFmODI2MzU3 Li4wODNlOTZjYzg5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5t bQpAQCAtOTcsNyArOTcsNyBAQCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6VGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEoV2ViUGFnZSYgd2ViUGFnZSwgYwogICAgIHVwZGF0ZUxh eWVySG9zdGluZ0NvbnRleHQoKTsKICAgICBzZXRDb2xvclNwYWNlKHBhcmFtZXRlcnMuY29sb3JT cGFjZSk7CiAKLSAgICBpZiAoIXBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCkKKyAgICBp ZiAoIXBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkKICAgICAgICAgYXR0YWNoKCk7CiB9CiAKZGlm ZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3 YXBPbk5hdmlnYXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCmluZGV4IGYzNWQ4YmFhMzUzLi4xN2MzZTIyZWM3 YiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9j ZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCkBAIC0xLDUgKzEsNSBAQAogLyoK LSAqIENvcHlyaWdodCAoQykgMjAxNyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg KiBDb3B5cmlnaHQgKEMpIDIwMTctMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTcyLDYgKzcyLDcgQEAgc3RhdGlj IGJvb2wgc2VydmVyUmVkaXJlY3RlZDsKIHN0YXRpYyBIYXNoU2V0PHBpZF90PiBzZWVuUElEczsK IHN0YXRpYyBib29sIHdpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3Q7CiBzdGF0aWMgYm9vbCBkaWRQ ZXJmb3JtQ2xpZW50UmVkaXJlY3Q7CitzdGF0aWMgYm9vbCBzaG91bGRDb252ZXJ0VG9Eb3dubG9h ZDsKIHN0YXRpYyBSZXRhaW5QdHI8TlNVUkw+IGNsaWVudFJlZGlyZWN0U291cmNlVVJMOwogc3Rh dGljIFJldGFpblB0cjxOU1VSTD4gY2xpZW50UmVkaXJlY3REZXN0aW5hdGlvblVSTDsKIApAQCAt MTI4LDYgKzEyOSwxMSBAQCAtICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVj aWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjooV0tOYXZpZ2F0aQogICAgIGRpZFJlcG9uZFRv UG9saWN5RGVjaXNpb25DYWxsID0gdHJ1ZTsKIH0KIAorLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZp ZXcgKil3ZWJWaWV3IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25SZXNwb25zZTooV0tOYXZpZ2F0 aW9uUmVzcG9uc2UgKiluYXZpZ2F0aW9uUmVzcG9uc2UgZGVjaXNpb25IYW5kbGVyOih2b2lkIChe KShXS05hdmlnYXRpb25SZXNwb25zZVBvbGljeSkpZGVjaXNpb25IYW5kbGVyCit7CisgICAgZGVj aXNpb25IYW5kbGVyKHNob3VsZENvbnZlcnRUb0Rvd25sb2FkID8gX1dLTmF2aWdhdGlvblJlc3Bv bnNlUG9saWN5QmVjb21lRG93bmxvYWQgOiBXS05hdmlnYXRpb25SZXNwb25zZVBvbGljeUFsbG93 KTsKK30KKwogLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRpZFJlY2VpdmVT ZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTmF2aWdhdGlvbjooV0tOYXZpZ2F0aW9uICopbmF2 aWdhdGlvbgogewogICAgIHNlZW5QSURzLmFkZChbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZp ZXJdKTsKQEAgLTE0NjcsNiArMTQ3MywxMDkgQEAgVEVTVChQcm9jZXNzU3dhcCwgU2VydmVyUmVk aXJlY3QyKQogICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWlu MS5odG1sIiwgW1t3ZWJWaWV3IFVSTF0gYWJzb2x1dGVTdHJpbmddKTsKIH0KIAorc3RhdGljIGNv bnN0IGNoYXIqIGxpbmtUb1dlYktpdEJ5dGVzID0gUiJQU09OUkVTT1VSQ0UoCis8Ym9keT4KKyAg PGEgaWQ9InRlc3RMaW5rIiBocmVmPSJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIj5M aW5rPC9hPgorPC9ib2R5PgorKVBTT05SRVNPVVJDRSI7CisKK1RFU1QoUHJvY2Vzc1N3YXAsIFBv bGljeUNhbmNlbEFmdGVyU2VydmVyUmVkaXJlY3QpCit7CisgICAgYXV0byBwcm9jZXNzUG9vbENv bmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9j XSBpbml0XSk7CisgICAgcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NTd2Fw c09uTmF2aWdhdGlvbiA9IFlFUzsKKyAgICBhdXRvIHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dL UHJvY2Vzc1Bvb2wgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25m aWd1cmF0aW9uLmdldCgpXSk7CisKKyAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRv cHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmll d0NvbmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0KCldOworICAgIGF1 dG8gaGFuZGxlciA9IGFkb3B0TlMoW1tQU09OU2NoZW1lIGFsbG9jXSBpbml0XSk7CisgICAgW2hh bmRsZXIgYWRkTWFwcGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFp bi5odG1sIiB0b0RhdGE6bGlua1RvV2ViS2l0Qnl0ZXNdOworICAgIFtoYW5kbGVyIGFkZFJlZGly ZWN0RnJvbVVSTFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiIHRvVVJM U3RyaW5nOkAicHNvbjovL3d3dy5hcHBsZS5jb20vaWdub3JlLmh0bWwiXTsKKyAgICBbd2ViVmll d0NvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZvclVSTFNj aGVtZTpAInBzb24iXTsKKworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcg YWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJh dGlvbjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIGF1dG8gbmF2aWdhdGlvbkRl bGVnYXRlID0gYWRvcHROUyhbW1BTT05OYXZpZ2F0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsK KyAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6bmF2aWdhdGlvbkRlbGVnYXRlLmdl dCgpXTsKKworICAgIG5hdmlnYXRpb25EZWxlZ2F0ZS0+ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlv bkFjdGlvbiA9IF4oV0tOYXZpZ2F0aW9uQWN0aW9uICphY3Rpb24sIHZvaWQgKF5kZWNpc2lvbkhh bmRsZXIpKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSkpIHsKKyAgICAgICAgaWYgKFthY3Rpb24u cmVxdWVzdC5VUkwuYWJzb2x1dGVTdHJpbmcgaGFzU3VmZml4OkAiaWdub3JlLmh0bWwiXSkgewor ICAgICAgICAgICAgZGVjaXNpb25IYW5kbGVyKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeUNhbmNl bCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgZGVjaXNpb25IYW5k bGVyKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeUFsbG93KTsKKyAgICB9OworCisgICAgTlNVUkxS ZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJM V2l0aFN0cmluZzpAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiXV07CisgICAgW3dl YlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpy dW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKyAgICBhdXRvIHBpZEFmdGVyRmlyc3RMb2Fk ID0gW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKworICAgIEVYUEVDVF9FUSgxLCBu dW1iZXJPZkRlY2lkZVBvbGljeUNhbGxzKTsKKworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNj cmlwdDpAInRlc3RMaW5rLmNsaWNrKCkiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07CisKKyAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmZhaWxlZCk7CisgICAgZmFpbGVkID0gZmFsc2U7Cisg ICAgZG9uZSA9IGZhbHNlOworCisgICAgRVhQRUNUX0VRKDMsIG51bWJlck9mRGVjaWRlUG9saWN5 Q2FsbHMpOworCisgICAgLy8gV2Ugc2hvdWxkIHN0aWxsIGJlIG9uIGdvb2dsZS5jb20uCisgICAg RVhQRUNUX0VRKHBpZEFmdGVyRmlyc3RMb2FkLCBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZp ZXJdKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5o dG1sIiwgW1t3ZWJWaWV3IFVSTF0gYWJzb2x1dGVTdHJpbmddKTsKKworICAgIFt3ZWJWaWV3IGV2 YWx1YXRlSmF2YVNjcmlwdDpAInRlc3RMaW5rLmlubmVyVGV4dCIgY29tcGxldGlvbkhhbmRsZXI6 IFsmXSAoaWQgaW5uZXJUZXh0LCBOU0Vycm9yICplcnJvcikgeworICAgICAgICBFWFBFQ1RfV0tf U1RSRVEoQCJMaW5rIiwgaW5uZXJUZXh0KTsKKyAgICAgICAgZG9uZSA9IHRydWU7CisgICAgfV07 CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7 Cit9CisKK1RFU1QoUHJvY2Vzc1N3YXAsIENyb3NzU2l0ZURvd25sb2FkKQoreworICAgIGF1dG8g cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW19XS1Byb2Nlc3NQb29sQ29uZmln dXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQo KS5wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb24gPSBZRVM7CisgICAgYXV0byBwcm9jZXNzUG9vbCA9 IGFkb3B0TlMoW1tXS1Byb2Nlc3NQb29sIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOnBy b2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKV0pOworCisgICAgYXV0byB3ZWJWaWV3Q29uZmln dXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7 CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFByb2Nlc3NQb29sOnByb2Nlc3NQb29sLmdl dCgpXTsKKyAgICBhdXRvIGhhbmRsZXIgPSBhZG9wdE5TKFtbUFNPTlNjaGVtZSBhbGxvY10gaW5p dF0pOworICAgIFtoYW5kbGVyIGFkZE1hcHBpbmdGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy5n b29nbGUuY29tL21haW4uaHRtbCIgdG9EYXRhOmxpbmtUb1dlYktpdEJ5dGVzXTsKKyAgICBbaGFu ZGxlciBhZGRNYXBwaW5nRnJvbVVSTFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWlu Lmh0bWwiIHRvRGF0YToiSGVsbG8iXTsKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0VVJM U2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAInBzb24iXTsKKworICAg IGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6 TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJh dGlvbi5nZXQoKV0pOworICAgIGF1dG8gbmF2aWdhdGlvbkRlbGVnYXRlID0gYWRvcHROUyhbW1BT T05OYXZpZ2F0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlldyBzZXROYXZp Z2F0aW9uRGVsZWdhdGU6bmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpXTsKKworICAgIE5TVVJMUmVx dWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdp dGhTdHJpbmc6QCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1sIl1dOworICAgIFt3ZWJW aWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVu KCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisgICAgYXV0byBwaWRBZnRlckZpcnN0TG9hZCA9 IFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl07CisKKyAgICBzaG91bGRDb252ZXJ0VG9E b3dubG9hZCA9IHRydWU7CisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAidGVzdExp bmsuY2xpY2soKSIgY29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKworICAgIFRlc3RXZWJLaXRBUEk6 OlV0aWw6OnJ1bigmZmFpbGVkKTsKKyAgICBmYWlsZWQgPSBmYWxzZTsKKyAgICBzaG91bGRDb252 ZXJ0VG9Eb3dubG9hZCA9IGZhbHNlOworCisgICAgLy8gV2Ugc2hvdWxkIHN0aWxsIGJlIG9uIGdv b2dsZS5jb20uCisgICAgRVhQRUNUX0VRKHBpZEFmdGVyRmlyc3RMb2FkLCBbd2ViVmlldyBfd2Vi UHJvY2Vzc0lkZW50aWZpZXJdKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3Lmdv b2dsZS5jb20vbWFpbi5odG1sIiwgW1t3ZWJWaWV3IFVSTF0gYWJzb2x1dGVTdHJpbmddKTsKKwor ICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAInRlc3RMaW5rLmlubmVyVGV4dCIgY29t cGxldGlvbkhhbmRsZXI6IFsmXSAoaWQgaW5uZXJUZXh0LCBOU0Vycm9yICplcnJvcikgeworICAg ICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJMaW5rIiwgaW5uZXJUZXh0KTsKKyAgICAgICAgZG9uZSA9 IHRydWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAg ICBkb25lID0gZmFsc2U7Cit9CisKIGVudW0gY2xhc3MgU2hvdWxkRW5hYmxlUFNPTiB7IE5vLCBZ ZXMgfTsKIHN0YXRpYyB2b2lkIHJ1bkNsaWVudFNpZGVSZWRpcmVjdFRlc3QoU2hvdWxkRW5hYmxl UFNPTiBzaG91bGRFbmFibGVQU09OKQogewpAQCAtMjIzMiwxMiArMjM0MSwyNyBAQCBURVNUKFBy b2Nlc3NTd2FwLCBQYWdlU2hvd0hpZGUpCiAKICAgICBFWFBFQ1RfRVEoN3UsIFtyZWNlaXZlZE1l c3NhZ2VzIGNvdW50XSk7CiAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQu b3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IE5PVCBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2Vz LmdldCgpWzBdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcv bWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsx XSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1s IC0gcGFnZXNob3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOwot ICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBh Z2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10pOwotICAgIEVYUEVD VF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlc2hvdyBw ZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKLSAgICBFWFBFQ1RfV0tfU1RS RVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVk IiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNv bjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2 ZWRNZXNzYWdlcy5nZXQoKVs2XSk7CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFd IGhhc1ByZWZpeDpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiXSkgeworICAgICAg ICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFn ZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7CisgICAgICAgIEVY UEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93 IE5PVCBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsKKyAgICB9IGVsc2Ug eworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0 bWwgLSBwYWdlc2hvdyBOT1QgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7 CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0 bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsKKyAg ICB9CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdIGhhc1ByZWZpeDpAInBzb246 Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShA InBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJl Y2VpdmVkTWVzc2FnZXMuZ2V0KClbM10pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29u Oi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2 ZWRNZXNzYWdlcy5nZXQoKVs0XSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgRVhQRUNUX1dLX1NU UkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3Rl ZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEo QCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCBy ZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKKyAgICB9CisgICAgaWYgKFtyZWNlaXZlZE1lc3Nh Z2VzLmdldCgpWzVdIGhhc1ByZWZpeDpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwi XSkgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFp bi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7 CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRt bCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAg IH0gZWxzZSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29t L21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClb NV0pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFp bi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7 CisgICAgfQogfQogCiAvLyBEaXNhYmxpbmcgdGhlIHBhZ2UgY2FjaGUgZXhwbGljaXRseSBpcyAo Zm9yIHNvbWUgcmVhc29uKSBub3QgYXZhaWxhYmxlIG9uIGlPUy4KQEAgLTIzMDcsMTIgKzI0MzEs MjcgQEAgVEVTVChQcm9jZXNzU3dhcCwgTG9hZFVubG9hZCkKIAogICAgIEVYUEVDVF9FUSg3dSwg W3JlY2VpdmVkTWVzc2FnZXMgY291bnRdKTsKICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8v d3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gbG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClb MF0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0 bWwgLSB1bmxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKLSAgICBFWFBFQ1RfV0tf U1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBsb2FkIiwgcmVjZWl2ZWRN ZXNzYWdlcy5nZXQoKVsyXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBs ZS5jb20vbWFpbi5odG1sIC0gdW5sb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSk7Ci0g ICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIGxv YWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJw c29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gdW5sb2FkIiwgcmVjZWl2ZWRNZXNzYWdl cy5nZXQoKVs1XSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20v bWFpbi5odG1sIC0gbG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAgIGlmIChb cmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSBoYXNQcmVmaXg6QCJwc29uOi8vd3d3LndlYmtpdC5v cmcvbWFpbi5odG1sIl0pIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53 ZWJraXQub3JnL21haW4uaHRtbCAtIHVubG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0p OworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0 bWwgLSBsb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7CisgICAgfSBlbHNlIHsKKyAg ICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0g bG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0pOworICAgICAgICBFWFBFQ1RfV0tfU1RS RVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gdW5sb2FkIiwgcmVjZWl2ZWRN ZXNzYWdlcy5nZXQoKVsyXSk7CisgICAgfQorICAgIGlmIChbcmVjZWl2ZWRNZXNzYWdlcy5nZXQo KVszXSBoYXNQcmVmaXg6QCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwiXSkgeworICAg ICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSB1 bmxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NU UkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIGxvYWQiLCByZWNlaXZlZE1l c3NhZ2VzLmdldCgpWzRdKTsKKyAgICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEo QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gbG9hZCIsIHJlY2VpdmVkTWVzc2Fn ZXMuZ2V0KClbM10pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxl LmNvbS9tYWluLmh0bWwgLSB1bmxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKKyAg ICB9CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdIGhhc1ByZWZpeDpAInBzb246 Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiXSkgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEo QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gdW5sb2FkIiwgcmVjZWl2ZWRNZXNz YWdlcy5nZXQoKVs1XSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBw bGUuY29tL21haW4uaHRtbCAtIGxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAg ICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNv bS9tYWluLmh0bWwgLSBsb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7CisgICAgICAg IEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSB1bmxv YWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAgICB9CiB9CiAKIFRFU1QoUHJvY2Vz c1N3YXAsIFdlYkluc3BlY3RvcikK 359274 2019-01-16 10:01:17 -0800 2019-01-16 12:40:10 -0800 Patch bug-193361-20190116100115.patch text/plain 227617 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMDIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2M2OTQ0MmQxODAyYTcz YWUwMGIyYjJmMWMzMzM3NWZlMDJmZWYzZC4uMWEwMzE4ZGJiNGQ4OTkyY2M4MTcwOWI0NWVhMzRi OWVmMDY4NGE0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAxLTE2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBW aWV3IGJlY29tZXMgYmxhbmsgYWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAg ICAgIFdoZW4gcmVzdG9yaW5nIGZyb20gUGFnZUNhY2hlLCBtYWtlIHN1cmUgd2Ugbm90aWZ5IHRo ZSBjbGllbnQgdGhhdCB0aGUgbG9hZCB3YXMgY29tbWl0dGVkCisgICAgICAgICpiZWZvcmUqIHdl IHRlbGwgaXQgdGhhdCB0aGUgbmF2aWdhdGlvbiBpcyBjb21wbGV0ZS4gVGhpcyB3b3VsZCBjb25m dXNlIHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eQorICAgICAgICBsb2dpYyBpbiB0aGUgVUlQcm9j ZXNzLgorCiAyMDE5LTAxLTE1ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5j b20+CiAKICAgICAgICAgQWRkIFJldmVhbCBzdXBwb3J0IGluIGlPU01hYwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAz NmUwNmRjYWY1OGVjOTg5NzU0NGZjYjI2Yzk1NDI5OWUyMjZjOGQ5Li4zOTRjMjc0MmEyNTUxY2Y3 MDIwMjY3MjU1OTc5NTZiZTZiOGY1MTUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3NiBAQAorMjAx OS0wMS0xNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFJlZ3Jl c3Npb24oUFNPTikgVmlldyBiZWNvbWVzIGJsYW5rIGFmdGVyIGNsaWNrIGEgY3Jvc3Mtc2l0ZSBk b3dubG9hZCBsaW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTMzNjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBpc3N1ZSB0cmFja2Vk IGJ5IHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczIGlzIHRoYXQgYSBwcm92aXNpb25hbCBsb2FkIG1h eSBnZXQKKyAgICAgICAgY2FuY2VsZWQgKG9yIGNvbnZlcnRlZCBpbnRvIGEgZG93bmxvYWQpICph ZnRlciogd2UndmUgZGVjaWRlZCB0byBwcm9jZXNzLXN3YXAuCisgICAgICAgIEluIHN1Y2ggY2Fz ZXMsIHRoZSB2aWV3IHNob3VsZCBrZWVwIGRpc3BsYXlpbmcgdGhlIGN1cnJlbnQgc2l0ZSBhbmQg aXQgc2hvdWxkCisgICAgICAgIHN0aWxsIGJlIGludGVyYWN0aXZlLiBIb3dldmVyLCB3aXRoIHRo ZSBwcmV2aW91cyBQU09OIG1vZGVsLCB0aGUgdmlldyAocGFnZVByb3h5KQorICAgICAgICB3b3Vs ZCBoYXZlIGFscmVhZHkgc3dhcHBlZCB0byB0aGUgbmV3IHByb2Nlc3MgYW5kIHdvdWxkIGVuZCB1 cCBkaXNwbGF5aW5nIHRoZQorICAgICAgICBpbml0aWFsbHkgZW1wdHkgZG9jdW1lbnQuCisKKyAg ICAgICAgVG8gYWRkcmVzcyB0aGUgaXNzdWUsIHRoaXMgcGF0Y2ggaW50cm9kdWNlcyB0aGUgY29u Y2VwdCBvZiBhIHByb3Zpc2lvbmFsIGxvYWQKKyAgICAgICAgaW4gdGhlIFVJUHJvY2VzcywgaGFu ZGxlZCBieSBhIFByb3Zpc2lvbmFsUGFnZVByb3h5IHdoaWNoIGhhcyBpdHMgb3duIHByaXZpc2lv bmFsCisgICAgICAgIHByb2Nlc3MuIFRoZSBXZWJQYWdlUHJveHkgb3ducyB0aGUgUHJvdmlzaW9u YWxQYWdlUHJveHkgYnV0IHdlIGRvIG5vdCBjb21taXQgdGhlCisgICAgICAgIHByb3Zpc2lvbmFs IHBhZ2UgdW50aWwgYWZ0ZXIgdGhlIGxvYWQgd2FzIGNvbW1pdHRlZCBpbiB0aGUgbmV3IHByb2Nl c3MuIFRoaXMgbWVhbnMKKyAgICAgICAgdGhhdCB0aGUgdmlldyAvIFdlYlBhZ2VQcm94eSBrZWVw cyB1c2luZyB0aGUgb2xkIHByb2Nlc3MgYW5kIGRpc3BsYXlzIHRoZSBjdXJyZW50CisgICAgICAg IGNvbnRlbnQgdW50aWwgYSBsb2FkIGhhcyBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lvbmFsIHBh Z2UuIElmIG5vIGxvYWQgY29tbWl0cworICAgICAgICBpbiB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vz cyAoZS5nLiBiZWNhdXNlIHRoZSBsb2FkIGlzIGNhbmNlbGxlZCBvciBjb252ZXJ0ZWQgaW50bwor ICAgICAgICBhIGRvd25sb2FkKSwgdGhlbiB3ZSBtZXJlbHkgZGVzdHJveSB0aGUgUHJvdmlzaW9u YWxQYWdlUHJveHkgYW5kIHRlcm1pbmF0ZSBpdHMKKyAgICAgICAgcHJvY2Vzcywgd2l0aG91dCBp bXBhY3RpbmcgdGhlIFdlYlBhZ2VQcm94eS4KKworICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVyczo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVycy5oOgorICAgICAgICBSZW5hbWUgaXNTd2FwRnJvbVN1c3BlbmRlZCB0byBpc1Byb2Nl c3NTd2FwIGZvciBjbGFyaXR5IGFzIHdlIGFsd2F5cyB3YW50IHRvCisgICAgICAgIGRlbGF5IGF0 dGFjaGluZyB0aGUgZHJhd2luZyBhcmVhIGluIGNhc2Ugb2YgYSBwcm9jZXNzLXN3YXAsIG5vIG1h dHRlciB3aGF0CisgICAgICAgIG5vdyB0aGF0IHRoZSBwcmV2aW91cyBwcm9jZXNzIGlzIGtlcHQg YWxpdmUgdW50aWwgdGhlIHByb3Zpc2lvbmFsIGxvYWQgaXMKKyAgICAgICAgY29tbWl0dGVkIGlu IHRoZSBuZXcgcHJvY2Vzcy4KKworICAgICAgICAqIFNoYXJlZC9XZWJQb2xpY3lBY3Rpb24uaDoK KyAgICAgICAgRHJvcCBTdXNwZW5kIHBvbGljeSBhY3Rpb24uIEF0IGRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb24gdGltZSwgaW4gY2FzZSBvZgorICAgICAgICBwcm9jZXNzLXN3YXAsIHdl IG5vdyB0ZWxsIHRoZSBwcmV2aW91cyBwcm9jZXNzIHRvIHNpbXBseSBpZ25vcmUgdGhlIGxvYWQs IHdoaWxlCisgICAgICAgIHdlIGNyZWF0ZSBhIFByb3Zpc2lvbmFsUGFnZVByb3h5IHRvIGRvIHRo ZSBuZXcgbG9hZCBpbiBhIG5ldyBwcm9jZXNzLgorICAgICAgICBTdXNwZW5zaW9uIG9mIHRoZSBw cmV2aW91cyBwYWdlIGluIHRoZSBvbGQgcHJvY2VzcywgaGFwcGVucyBsYXRlciwgd2hlbiBhIGxv YWQKKyAgICAgICAgaXMgYWN0dWFsbHkgY29tbWl0dGVkIGluIHRoZSBuZXcgcHJvY2Vzcy4KKwor ICAgICAgICAqIFNvdXJjZXMudHh0OgorICAgICAgICBBZGQgbmV3IFByb3Zpc2lvbmFsUGFnZVBy b3h5IGZpbGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToK KyAgICAgICAgKC1bV0tXZWJWaWV3IF9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0YXRl XSk6CisgICAgICAgIFdoZW4gY2FsbGluZyBfa2lsbFdlYkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRT dGF0ZSBvbiBhIFdLV2ViVmlldywga2lsbCBib3RoIHRoZSBjdXJyZW50CisgICAgICAgIHByb2Nl c3MgYW5kIHRoZSBwcm92aXNpb25hbCBvbmUsIHRvIG1haW50YWluIHByZXZpb3VzIGJlaGF2aW9y IGluIG91ciBBUEkgdGVzdHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xp ZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpjcmVhdGVEcmF3 aW5nQXJlYVByb3h5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1w bC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvd3BlL1BhZ2VDbGllbnRJbXBsLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkpOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvd3BlL1BhZ2VDbGllbnRJbXBsLmg6CisgICAgICAgICog VUlQcm9jZXNzL0FjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eS5jcHA6CisgICAgICAgIChXZWJL aXQ6OkFjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eTo6QWNjZWxlcmF0ZWREcmF3aW5nQXJlYVBy b3h5KToKKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5OjpkaWRV cGRhdGVCYWNraW5nU3RvcmVTdGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OkFjY2VsZXJhdGVkRHJh d2luZ0FyZWFQcm94eTo6c2VuZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKToKKyAgICAgICAgKFdl YktpdDo6QWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5Ojp3YWl0Rm9yQW5kRGlzcGF0Y2hEaWRV cGRhdGVCYWNraW5nU3RvcmVTdGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OkFjY2VsZXJhdGVkRHJh d2luZ0FyZWFQcm94eTo6c2V0TmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKToKKyAg ICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5OjpkZXN0cm95TmF0aXZl U3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQWNjZWxl cmF0ZWREcmF3aW5nQXJlYVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dlYlZp ZXdJbXBsLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tOgorICAg ICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSk6CisgICAg ICAgICogVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpE cmF3aW5nQXJlYVByb3h5OjpEcmF3aW5nQXJlYVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6RHJh d2luZ0FyZWFQcm94eTo6fkRyYXdpbmdBcmVhUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpEcmF3 aW5nQXJlYVByb3h5Ojp2aWV3RXhwb3NlZFJlY3RDaGFuZ2VkVGltZXJGaXJlZCk6CisgICAgICAg ICogVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6RHJhd2lu Z0FyZWFQcm94eTo6cHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJv eHlJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eUltcGw6OkRyYXdp bmdBcmVhUHJveHlJbXBsKToKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eUltcGw6 OnVwZGF0ZSk6CisgICAgICAgICogVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmg6Cisg ICAgICAgICogVUlQcm9jZXNzL1BhZ2VDbGllbnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvUmVt b3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHkuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJv eHkubW06CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6 OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpSZW1v dGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5Ojp+UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQ cm94eSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6 OmRldmljZVNjYWxlRmFjdG9yRGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5 ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6c2VuZFVwZGF0ZUdlb21ldHJ5KToKKyAgICAgICAgKFdl YktpdDo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6YWNjZWxlcmF0ZWRBbmltYXRp b25EaWRTdGFydCk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVh UHJveHk6OmFjY2VsZXJhdGVkQW5pbWF0aW9uRGlkRW5kKToKKyAgICAgICAgKFdlYktpdDo6UmVt b3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6ZGlkUmVmcmVzaERpc3BsYXkpOgorICAgICAg ICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5Ojp3YWl0Rm9yRGlkVXBk YXRlQWN0aXZpdHlTdGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURyYXdp bmdBcmVhUHJveHk6OmRpc3BhdGNoQWZ0ZXJFbnN1cmluZ0RyYXdpbmcpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9z L1BhZ2VDbGllbnRJbXBsSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6 Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tOgorICAg ICAgICAoLVtXS0NvbnRlbnRWaWV3IF9jcmVhdGVEcmF3aW5nQXJlYVByb3h5Ol0pOgorICAgICAg ICAqIFVJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGxNYWMuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvbWFjL1BhZ2VDbGllbnRJbXBsTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50 SW1wbDo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9U aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNz L21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5Lm1tOgorICAgICAgICAoV2Vi S2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5OjpUaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9u RHJhd2luZ0FyZWFQcm94eTo6ZGV2aWNlU2NhbGVGYWN0b3JEaWRDaGFuZ2UpOgorICAgICAgICAo V2ViS2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5Ojpjb2xvclNwYWNlRGlk Q2hhbmdlKToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQ cm94eTo6d2FpdEZvckRpZFVwZGF0ZUFjdGl2aXR5U3RhdGUpOgorICAgICAgICAoV2ViS2l0OjpU aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5OjpjcmVhdGVGZW5jZSk6CisgICAgICAg IChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6OnNlbmRVcGRhdGVH ZW9tZXRyeSk6CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh UHJveHk6OmFkanVzdFRyYW5zaWVudFpvb20pOgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVB bmltYXRpb25EcmF3aW5nQXJlYVByb3h5Ojpjb21taXRUcmFuc2llbnRab29tKToKKyAgICAgICAg KFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eTo6ZGlzcGF0Y2hBZnRl ckVuc3VyaW5nRHJhd2luZyk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlN YWMubW06CisgICAgICAgICogVUlQcm9jZXNzL3dpbi9QYWdlQ2xpZW50SW1wbC5jcHA6CisgICAg ICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KToKKyAg ICAgICAgKiBVSVByb2Nlc3Mvd2luL1BhZ2VDbGllbnRJbXBsLmg6CisgICAgICAgICogVUlQcm9j ZXNzL3dpbi9QYWdlQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJ bXBsOjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KToKKyAgICAgICAgKiBVSVByb2Nlc3Mvd2luL1Bh Z2VDbGllbnRJbXBsLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5p bWF0aW9uRHJhd2luZ0FyZWE6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhKToKKyAgICAg ICAgUGFzcyB0aGUgZHJhd2luZyBhcmVhJ3MgYXNzb2NpYXRlZCBwcm9jZXNzIHdoZW4gY29uc3Ry dWN0aW5nIGl0IGFuZCBzdG9yZSBpdCBhcyBhIG1lbWJlcgorICAgICAgICBpbiBhZGRpdGlvbiB0 byB0aGUgcGFnZS4gVGhpcyBpcyBuZWNlc3Nhcnkgbm93IHRoYXQgYSBwYWdlIGNhbiBiZSBhc3Nv Y2lhdGVkIHdpdGggMgorICAgICAgICBXZWJQcm9jZXNzZXMgYXQgYSB0aW1lLCBlYWNoIGhhdmlu ZyBpdHMgb3duIGRyYXdpbmcgYXJlYS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJQ YWdlUHJveHlDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjcmVhdGVT YW5kYm94RXh0ZW5zaW9uc0lmTmVlZGVkKToKKyAgICAgICAgUGFzcyB0aGUgcHJvY2Vzcy4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHA6IEFkZGVkLgorICAg ICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6UHJvdmlzaW9uYWxQYWdlUHJveHkp OgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6flByb3Zpc2lvbmFsUGFn ZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OnByb2Nlc3NE aWRUZXJtaW5hdGUpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6dGFr ZURyYXdpbmdBcmVhKToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmNh bmNlbCk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5Ojpwcm9jZXNzRGlk RmluaXNoTGF1bmNoaW5nKToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6 OmZpbmlzaEluaXRpYWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2gpOgorICAgICAgICAo V2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UpOgorICAgICAg ICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6bG9hZERhdGEpOgorICAgICAgICAoV2Vi S2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6bG9hZFJlcXVlc3QpOgorICAgICAgICAoV2ViS2l0 OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6Z29Ub0JhY2tGb3J3YXJkSXRlbSk6CisgICAgICAgIChX ZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUpOgorICAgICAg ICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0 KToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlz aW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94 eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6UHJv dmlzaW9uYWxQYWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJL aXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YSk6 CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDaGFuZ2VQcm92aXNp b25hbFVSTEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6 OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYyk6CisgICAgICAgIChXZWJLaXQ6 OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JSZXNwb25zZSk6CisgICAgICAg IChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpzdGFydFVSTFNjaGVtZVRhc2spOgorICAg ICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6YmFja0ZvcndhcmRHb1RvSXRlbSk6 CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2Fn ZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlU3lu Y01lc3NhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oOiBB ZGRlZC4KKyAgICAgICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OnBhZ2UpOgorICAg ICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6bWFpbkZyYW1lIGNvbnN0KToKKyAg ICAgICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OnByb2Nlc3MpOgorICAgICAgICAo V2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVu dCBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpuYXZpZ2F0 aW9uSUQgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6ZHJh d2luZ0FyZWEgY29uc3QpOgorICAgICAgICBOZXcgV2ViUGFnZVByb3h5LWxpa2UgY2xhc3Mgd2hp Y2ggaXMgb3duZWQgYnkgdGhlIFdlYlBhZ2VQcm94eSBhbmQgcHJveGllcyBJUEMgZnJvbQorICAg ICAgICB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vzcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9TdXNw ZW5kZWRQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6 On5TdXNwZW5kZWRQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpTdXNwZW5kZWRQYWdlUHJv eHk6OnVuc3VzcGVuZCk6CisgICAgICAgIChXZWJLaXQ6OlN1c3BlbmRlZFBhZ2VQcm94eTo6ZGlk UHJvY2Vzc1JlcXVlc3RUb1N1c3BlbmQpOgorICAgICAgICBVbnJlZ2lzdGVyIHRoZSBTdXNwZW5k ZWRQYWdlUHJveHkgYXMgYW4gSVBDIG1lc3NhZ2UgcmVjZWl2ZXIgYSBsaXR0bGUgYml0IGVhcmxp ZXIKKyAgICAgICAgd2hlbiB3ZSdyZSBnb2luZyB0byB1bnN1c3BlbmQgaXQuIFRoaXMgYXZvaWRz IGNvbmZsaWN0aW5nIHdpdGggdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5CisgICAgICAgIHdoaWNo IHRyaWVzIHRvIHJlZ2lzdGVyIGl0c2VsZiBhcyBhbiBJUEMgbWVzc2FnZSByZWNlaXZlciBmb3Ig dGhlIHNhbWUgcGFnZUlEIHdoZW4KKyAgICAgICAgYSBwcm9jZXNzLXN3YXAgb2NjdXJzIGFuZCB3 ZSdyZSBzd2l0Y2hpbmcgdG8gYSBzdXNwZW5kZWQgcGFnZS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9XZWJGcmFtZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVQcm94eTo6aXNN YWluRnJhbWUgY29uc3QpOgorICAgICAgICBXZWJGcmFtZVByb3h5Ojppc01haW5GcmFtZSgpIHJl bGllcyBvbiBjaGVja2luZyB0aGF0IHRoZSBmcmFtZSBpcyB0aGUgV2ViUGFnZVByb3h5J3MgbV9t YWluRnJhbWUuCisgICAgICAgIE5vdyB0aGF0IHRoZSBXZWJQYWdlUHJveHkgY2FuIGhhdmUgYSBQ cm92aXNpb25hbFBhZ2VQcm94eSwgYWxzbyBjaGVjayBpZiBpdCBpcyB0aGUgUHJvdmlzaW9uYWxQ YWdlUHJveHkncworICAgICAgICBtX21haW5GcmFtZSB0byBtYWludGFpbiBwcmV2aW91cyBiZWhh dmlvci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OnByb3Zpc2lvbmFsRHJhd2luZ0FyZWEgY29uc3QpOgorICAg ICAgICBBZGQgZ2V0dGVyIGZvciB0aGUgcHJvdmlzaW9uYWwgZHJhd2luZyBhcmVhLiBXZSBub3Jt YWxseSBvbmx5IGRlYWwgd2l0aCB0aGUgcGFnZSdzIGN1cnJlbnQgZHJhd2luZyBhcmVhLCBidXQK KyAgICAgICAgdGhlIFZpZXdHZXN0dXJlQ29udHJvbGxlciBuZWVkcyBhY2Nlc3MgdG8gdGhlIHBy b3Zpc2lvbmFsIG9uY2UgdG8gZGlzcGxheSB0aGUgc3dpcGUgZ2VzdHVyZSBzbmFwc2hvdC4KKwor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnN3YXBUb1dlYlByb2Nlc3MpOgorICAgICAg ICBzd2FwVG9XZWJQcm9jZXNzKCkgbm8gbG9uZ2VyIHRha2VzIGNhcmUgb2YgdW5zdXNwZW5kaW5n IHRoZSBTdXNwZW5kZWRQYWdlIGJlY2F1c2Ugd2Ugbm93IGNhbGwgc3dhcFRvV2ViUHJvY2Vzcygp CisgICAgICAgIGxhdGVyLCB3aGVuIGEgbG9hZCBpcyBhY3R1YWxseSBjb21taXR0ZWQgaW4gdGhl IHByb3Zpc2lvbmFsIHBhZ2UgLyBwcm9jZXNzLiBzd2FwVG9XZWJQcm9jZXNzKCkgbm93IGFsc28g bmVlZHMKKyAgICAgICAgdG8gaW5pdGlhbGl6ZSBzb21lIGRhdGEgbWVtYmVycyBzdWNoIGFzIHRo ZSBkcmF3aW5nIGFyZWEgYW5kIHRoZSBtYWluIGZyYW1lIGFzIGl0IGlzIHRyYW5zZmVycmluZyB0 aGVtIG92ZXIgZnJvbQorICAgICAgICB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkgd2hpY2ggc3Rh cnRlZCB0aGUgcHJvdmlzaW9uYWwgbG9hZC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OmZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2Vzcyk6CisgICAgICAgIFdlIG5vIGxvbmdlciBu ZWVkIElzU3dhcEZyb21TdXNwZW5kZWQgcGFyYW1ldGVyIGFzIHRoaXMgaXMgY2FsbGVkIGxhdGVy IG5vdywgYWZ0ZXIgYSBsb2FkIGhhcyBhY3R1YWxseSBiZWVuCisgICAgICAgIGNvbW1pdHRlZCBp biB0aGUgcHJvdmlzaW9uYWwgcHJvY2Vzcy4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OnNldERyYXdpbmdBcmVhKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojppbml0 aWFsaXplV2ViUGFnZSk6CisgICAgICAgIC0gV2Ugbm8gbG9uZ2VyIG5lZWQgSXNTd2FwRnJvbVN1 c3BlbmRlZCBwYXJhbWV0ZXIgYXMgdGhpcyBpcyBjYWxsZWQgbGF0ZXIgbm93LCBhZnRlciBhIGxv YWQgaGFzIGFjdHVhbGx5IGJlZW4KKyAgICAgICAgICBjb21taXR0ZWQgaW4gdGhlIHByb3Zpc2lv bmFsIHByb2Nlc3MuCisgICAgICAgIC0gRmFjdG9yIHNvbWUgY29kZSBvdXQgdG8gV2ViUGFnZVBy b3h5OjpzZXREcmF3aW5nQXJlYSgpIHNvIHRoYXQgaXQgY2FuIGJlIHNoYXJlZCB3aXRoIHN3YXBU b1dlYlByb2Nlc3MoKS4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6Om1heWJlSW5p dGlhbGl6ZVNhbmRib3hFeHRlbnNpb25IYW5kbGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OmxvYWRSZXF1ZXN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpsb2Fk UmVxdWVzdFdpdGhOYXZpZ2F0aW9uU2hhcmVkKToKKyAgICAgICAgT25seSBjYWxsIHNldFBlbmRp bmdBUElSZXF1ZXN0VVJMKCkgaW4gbG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvbigpIG9ubHkgaWYg U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkIGlzIG5vdAorICAgICAgICBZZXMuIFRoaXMgYXZv aWRzIGhpdHRpbmcgc29tZSBhc3NlcnRpb25zIGFzIHRoaXMgd2FzIGFscmVhZHkgY2FsbGVkIGR1 cmluZyB0aGUgZmlyc3QgQVBJIGNhbGwgaWYgbmVlZGVkLgorCisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6bG9hZERhdGEpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6Omxv YWREYXRhV2l0aE5hdmlnYXRpb25TaGFyZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OnN0b3BMb2FkaW5nKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZWxvYWQp OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZFBlcmZvcm1EcmFnQ29udHJvbGxl ckFjdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZmluZFBsdWdpbik6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVjZWl2ZWROYXZpZ2F0aW9uUG9saWN5RGVj aXNpb24pOgorICAgICAgICBJbiBjYXNlIG9mIHByb2Nlc3Mgc3dhcCwgdGVsbCB0aGUgcHJldmlv dXMgcHJvY2VzcyB0byBpZ25vcmUgdGhlIGxvYWQgaW5zdGVhZCBvZiBzdXNwZW5kaW5nIGl0IHJp Z2h0IGF3YXkuCisgICAgICAgIFN1c3BlbnNpb24gbm93IGhhcHBlbnMgbGF0ZXIsIG9ubHkgaWYg d2UgZW5kIHVwIGNvbW1pdHRpbmcgdGhlIHByb3Zpc2lvbmFsIGxvYWQgaW4gdGhlIG5ldyBwcm9j ZXNzLgorICAgICAgICBBbHNvIGRpc2NhcmQgdGhlIFN1c3BlbmRlZFBhZ2UgaWYgaXQgZmFpbGVk IHRvIHN1c3BlbmQgKHdlIG9ubHkgcmV1c2UgaXRzIHByb2Nlc3MgaW4gdGhpcyBjYXNlKS4gVGhp cyB1c2VkCisgICAgICAgIHRvIGhhcHBlbiBhIGJpdCBsYXRlciBidXQgaXQgaXMgY2xlYXJlciBp ZiB3ZSBkbyB0aGlzIGFzIGVhcmx5IGFzIHBvc3NpYmxlIEkgdGhpbmsuCisKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5Ojpjb21taXRQcm92aXNpb25hbFBhZ2UpOgorICAgICAgICBXaGVu IHRoZSBsb2FkIGlzIGNvbW1pdHRlZCBpbiB0aGUgbmV3IHByb2Nlc3MsIHdlIGNhbGwgV2ViUGFn ZVByb3h5Ojpjb21taXRQcm92aXNpb25hbFBhZ2UoKS4gSXQgdGFrZXMgY2FyZSBvZjoKKyAgICAg ICAgLSBBY3R1YWxseSBzd2FwcGluZyB0aGUgV2ViUGFnZVByb3h5IHRvIHRoZSBuZXcgcHJvY2Vz cyBieSBjYWxsaW5nIHByb2Nlc3NEaWRUZXJtaW5hdGUoKSAvIHN3YXBUb1dlYlByb2Nlc3MoKS4K KyAgICAgICAgLSBTdXNwZW5kaW5nIHRoZSBjdXJyZW50IHBhZ2UuCisgICAgICAgIC0gTGV0dGlu ZyB0aGUgY2xpZW50IGtub3cgdGhlIGxvYWQgaXMgY29taXR0ZWQKKyAgICAgICAgLSBEZXN0cm95 IHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eS4KKyAgICAgICAgVGhpcyB3b3JrIHVzZWQgdG8gaGFw cGVuIGVhcmxpZXIgaW4gY29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKCkuCisKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3Mp OgorICAgICAgICBNb3ZlZCBzb21lIG9mIHRoZSBsb2dpYyB0byBjb21taXRQcm92aXNpb25hbFBh Z2UoKS4gV2Ugbm93IG1lcmVseSBzdGFydCB0aGUgbG9hZCBpbiBhIG5ldyBQcm92aXNpb25hbFBh Z2VQcm94eSwKKyAgICAgICAgd2l0aG91dCBhY3R1YWxseSBoYXZpbmcgdGhlIFdlYlBhZ2VQcm94 eSBzd2l0Y2ggdG8gdGhlIG5ldyBwcm9jZXNzIHlldC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmRpZENyZWF0ZU1haW5GcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6ZGlkQ3JlYXRlU3ViZnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OmRpZENyZWF0ZVdpbmRvdyk6CisgICAgICAgIERyb3Agc29tZSBjb2RlIHRoYXQgaXMgbm8gbG9u Z2VyIG5lZWRlZCwgbm93IHRoYXQgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5IHRha2VzIGNhcmUg b2YgdGhpcy4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZERlc3Ryb3lOYXZp Z2F0aW9uKToKKyAgICAgICAgT24gcHJvY2Vzcy1zd2FwLCB3aGVuIHRlbGxpbmcgdGhlIHByZXZp b3VzIHByb2Nlc3MgdG8gaWdub3JlIHRoZSBsb2FkIGFuZCBzdGFydGluZyB0aGUgbmV3IGxvYWQg aW4gYSBuZXcKKyAgICAgICAgUHJvdmlzaW9uYWxQYWdlUHJveHksIHRoZSBwcmV2aW91cyBXZWJQ YWdlIGF0dGVtcHRzIHRvIGRlc3Ryb3kgdGhlIG5hdmlnYXRpb24uIEluIHRoaXMgY2FzZSwgd2Ug aWdub3JlCisgICAgICAgIHRoZSBjYWxsIHNpbmNlIHRoZSBuYXZpZ2F0aW9uIGlzIG1lcmVseSB0 YWtlbiBvdmVyIGJ5IHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eS4KKworICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWVT aGFyZWQpOgorICAgICAgICBNb3ZlZCBzb21lIFBTT04gbG9naWMgdG8gdGhlIFByb3Zpc2lvbmFs UGFnZVByb3h5IGluc3RlYWQuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRS ZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSk6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlz aW9uYWxMb2FkRm9yRnJhbWVTaGFyZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OndpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6ZGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3RGb3JGcmFtZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JG cmFtZVNoYXJlZCk6CisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRGYWlsUHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRp ZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZVNoYXJlZCk6CisgICAgICAgIFdoZW4gZGlkRmFp bFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKCkgaXMgY2FsbGVkIGZvciBhIFByb3Zpc2lvbmFsUGFn ZVByb3h5LCBkZXN0cm95IGl0LgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlk Q29tbWl0TG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRG aW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6ZGlkRmluaXNoTG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjpkaWRGYWlsTG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpk aWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmRpZFJlY2VpdmVUaXRsZUZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JGcmFtZSk6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkRGlzcGxheUluc2VjdXJlQ29udGVudEZvckZy YW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRSdW5JbnNlY3VyZUNvbnRl bnRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZnJhbWVEaWRCZWNv bWVGcmFtZVNldCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5 Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmNTaGFyZWQpOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24pOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb25TeW5jKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lG b3JOZXdXaW5kb3dBY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lk ZVBvbGljeUZvclJlc3BvbnNlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkZWNp ZGVQb2xpY3lGb3JSZXNwb25zZVNoYXJlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6dW5hYmxlVG9JbXBsZW1lbnRQb2xpY3kpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OndpbGxTdWJtaXRGb3JtKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRO YXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6ZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGFTaGFyZWQpOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdCk6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VQcm94eTo6ZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0U2hhcmVkKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRQZXJmb3JtU2VydmVyUmVkaXJlY3QpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZFVwZGF0ZUhpc3RvcnlUaXRsZSk6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y3JlYXRlTmV3UGFnZSk6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VQcm94eTo6cnVuSmF2YVNjcmlwdEFsZXJ0KToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5OjpydW5KYXZhU2NyaXB0Q29uZmlybSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6cnVuSmF2YVNjcmlwdFByb21wdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6dW5hdmFpbGFibGVQbHVnaW5CdXR0b25DbGlja2VkKToKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZVByb3h5OjpydW5CZWZvcmVVbmxvYWRDb25maXJtUGFuZWwpOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OnJ1bk9wZW5QYW5lbCk6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6cHJpbnRGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 YmFja0ZvcndhcmRHb1RvSXRlbSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6YmFj a0ZvcndhcmRHb1RvSXRlbVNoYXJlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 bGVhcm5Xb3JkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjppZ25vcmVXb3JkKToK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRSZWNlaXZlRXZlbnQpOgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmVkaXRpbmdSYW5nZUNhbGxiYWNrKToKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZWN0Rm9yQ2hhcmFjdGVyUmFuZ2VDYWxsYmFjayk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Zm9jdXNlZEZyYW1lQ2hhbmdlZCk6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZnJhbWVTZXRMYXJnZXN0RnJhbWVDaGFuZ2VkKToK KworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnByb3Zpc2lvbmFsUHJvY2Vzc0RpZFRl cm1pbmF0ZSk6CisgICAgICAgIENhbmNlbCB0aGUgcHJvdmlzaW9uYSBsb2FkIGFuZCBkZXN0cm95 IHRoZSBQcm92aXNpb25hbFBhZ2VQcm94eSBpZgorICAgICAgICB0aGUgcHJvdmlzaW9uYWwgcHJv Y2VzcyBjcmFzaGVzLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVzZXRTdGF0 ZSk6CisgICAgICAgIERyb3Agc29tZSBjb2RlIHRoYXQgaXMgbm8gbG9uZ2VyIG5lZWRlZC4KKwor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycyk6CisgICAg ICAgIC0gTW92ZSB0aGUgaGFzUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXJzIGZsYWcgaW5pdGlhbGl6 YXRpb24gZnJvbSB0aGUgY2FsbCBzaXRlIHRvIGhlcmUgbm93IHRoYXQgd2UgaGF2ZQorICAgICAg ICBtb3JlIHRoYW4gb25lIGNhbGwgc2l0ZS4gVGhpcyB3YXMganVzdCBzb21lIGJhZCBmYWN0b3Jp bmcuCisgICAgICAgIC0gVGFrZSB0aGUgcHJvY2VzcyBpbiBwYXJhbWV0ZXIgbm93IHRoYXQgd2Ug cGFnZSBjYW4gYmUgYXNzb2NpYXRlZCB3aXRoIHNldmVyYWwgcHJvY2Vzc2VzIGF0IGEgdGltZS4K KworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmV4Y2VlZGVkRGF0YWJhc2VRdW90YSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVxdWVzdEdlb2xvY2F0aW9uUGVybWlz c2lvbkZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZXF1ZXN0VXNl ck1lZGlhUGVybWlzc2lvbkZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjplbnVtZXJhdGVNZWRpYURldmljZXNGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6c3RhcnRVUkxTY2hlbWVUYXNrKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpzdGFydFVSTFNjaGVtZVRhc2tTaGFyZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OnN0b3BVUkxTY2hlbWVUYXNrKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 Ojpsb2FkU3luY2hyb25vdXNVUkxTY2hlbWVUYXNrKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZVByb3h5OjpjaGVja1VSTFJlY2VpdmVkRnJvbUN1cnJlbnRPclByZXZpb3VzV2ViUHJvY2Vzcyk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6d2lsbEFjcXVpcmVVbml2ZXJzYWxGaWxl UmVhZFNhbmRib3hFeHRlbnNpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHku aDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp2aXNpdGVkTGlua1N0b3JlKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpwcm92aXNpb25hbFBhZ2VQcm94eSBjb25zdCk6 CisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQgY29uc3QpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OnVwZGF0ZUJhY2tGb3J3YXJkSXRlbSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6cHJvY2Vzc0RpZFRlcm1pbmF0ZU9y RmFpbGVkVG9MYXVuY2gpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OmRpZEZp bmlzaExhdW5jaGluZyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6Y2FuVGVy bWluYXRlQ2hpbGRQcm9jZXNzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5 Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6YWRkUHJvdmlzaW9uYWxQYWdl UHJveHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OnJlbW92ZVByb3Zpc2lv bmFsUGFnZVByb3h5KToKKyAgICAgICAgQmVmb3JlIHVwZGF0aW5nIGEgQmFja0ZvcndhcmRMaXN0 SXRlbSwgd2Ugbm9ybWFsbHkgbWFrZSBzdXJlIHRoZSBwcm9jZXNzIGhhcyBhIFdlYlBhZ2VQcm94 eSB3aXRoIHRoZQorICAgICAgICBpdGVtJ3MgcGFnZUlELiBXZSBoYXZlIHRvIHR3ZWFrIHRoZSBs b2dpYyBiZWNhdXNlIHRoZXJlIG1heSBub3cgYmUgbm8gV2ViUGFnZVByb3h5IHdpdGggdGhpcyBw YWdlSUQKKyAgICAgICAgYXNzb2NpYXRlZCB3aXRoIHRoaXMgcHJvY2VzcyB5ZXQsIGJlY2F1c2Ug aXQgaXMgc3RpbGwgYSBQcm92aXNpb25hbFBhZ2VQcm94eS4gICAgICAgIAorCisgICAgICAgICog VUlQcm9jZXNzL1dlYlVSTFNjaGVtZUhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJV UkxTY2hlbWVIYW5kbGVyOjpzdGFydFRhc2spOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJVUkxT Y2hlbWVIYW5kbGVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlVSTFNjaGVtZVRhc2suY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJVUkxTY2hlbWVUYXNrOjpjcmVhdGUpOgorICAgICAgICAo V2ViS2l0OjpXZWJVUkxTY2hlbWVUYXNrOjpXZWJVUkxTY2hlbWVUYXNrKToKKyAgICAgICAgKFdl YktpdDo6V2ViVVJMU2NoZW1lVGFzazo6ZGlkUGVyZm9ybVJlZGlyZWN0aW9uKToKKyAgICAgICAg KFdlYktpdDo6V2ViVVJMU2NoZW1lVGFzazo6ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAg KFdlYktpdDo6V2ViVVJMU2NoZW1lVGFzazo6ZGlkUmVjZWl2ZURhdGEpOgorICAgICAgICAoV2Vi S2l0OjpXZWJVUkxTY2hlbWVUYXNrOjpkaWRDb21wbGV0ZSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlVSTFNjaGVtZVRhc2s6OnBhZ2VEZXN0cm95ZWQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJV UkxTY2hlbWVUYXNrLmg6CisgICAgICAgIFBhc3MgdGhlIHByb2Nlc3Mgd2hlbiBjb25zdHJ1Y3Rp bmcgYSBXZWJVUkxTY2hlbWVUYXNrIGFuZCBzdG9yZSBpdCBhcyBhIGRhdGEgbWVtYmVyIGluIGFk ZGl0aW9uIHRvCisgICAgICAgIHRoZSBwYWdlLiBUaGlzIGlzIG5lY2Vzc2FyeSBub3cgdGhhdCBh IFdlYlBhZ2VQcm94eSBjYW4gYmUgYXNzb2NpYXRlZCB3aXRoIHNldmVyYWwgV2ViUHJvY2Vzc2Vz LgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXJJT1MubW06 CisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZW5kU3dpcGVHZXN0dXJl KToKKyAgICAgICAgVXNlIHRoZSBwcm92aXNpb25hbCBkcmF3aW5nIGFyZWEgdG8gZGlzcGxheSB0 aGUgc3dpcGUgc25hcHNob3QgYXMgaXQgbWF5IGRpZmZlciBmcm9tIHRoZSBvbmUgY3VycmVudGx5 CisgICAgICAgIGFzc29jaWF0ZWQgd2l0aCB0aGUgcGFnZSBpbiBjYXNlIG9mIHByb2Nlc3Mgc3dh cC4KKworICAgICAgICAqIFdlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAg ICBBZGQgUHJvdmlzaW9uYWxQYWdlUHJveHkgY2xhc3MuCisKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvV2ViRnJhbWUuY3BwOgorICAgICAgICAoV2ViS2l0Ojp0b1BvbGljeUFjdGlvbik6 CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24pOgor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktp dDo6bV9zaG91bGRBdHRhY2hEcmF3aW5nQXJlYU9uUGFnZVRyYW5zaXRpb24pOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlOjpyZWluaXRpYWxpemVXZWJQYWdlKToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKToKKyAgICAgICAgU3RvcCBkZWFsaW5n IHdpdGggV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kIGFzIGl0IG5vIGxvbmdlciBleGlzdHMuCisK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZGlkQ29tcGxldGVQYWdlVHJhbnNpdGlvbik6CisK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0SXNTdXNwZW5kZWQpOgorICAgICAgICBTdXNw ZW5kIHRoZSBQYWdlIHdoZW4gc2V0SXNTdXNwZW5kZWQodHJ1ZSkgaXMgY2FsbGVkLCBub3cgdGhh dCB0aGVyZSBpcyBubyBsb25nZXIgYSBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQuCisgICAgICAg IHNldElzU3VzcGVuZGVkKHRydWUpIElQQyBpcyBzZW50IHdoZW4gd2UgYWN0dWFsbHkgY29tbWl0 IHRoZSBwcm92aXNpb25hbCBwYWdlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuaDoKKwogMjAxOS0wMS0xNSAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRuZXJAYXBw bGUuY29tPgogCiAgICAgICAgIEFkZCBSZXZlYWwgc3VwcG9ydCBpbiBpT1NNYWMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDRjMjZhNjk4MWI0NjRkYTU5MTZmMDVlYjcz NTk2NjkxNTdlZTlmZmUuLmViZjk1MGJhNmMyZWQ5MWY2MjMyYmQyYjVlZmI5Zjc5NTU3YWI1OGQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMjAzMiwxMSArMjAzMiwx MSBAQCB2b2lkIEZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQoKQogCiAgICAgICAg IE9wdGlvbmFsPEhhc0luc2VjdXJlQ29udGVudD4gaGFzSW5zZWN1cmVDb250ZW50ID0gY2FjaGVk UGFnZS0+Y2FjaGVkTWFpbkZyYW1lKCktPmhhc0luc2VjdXJlQ29udGVudCgpOwogCisgICAgICAg IGRpc3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOworCiAgICAgICAgIC8v IEZJWE1FOiBUaGlzIEFQSSBzaG91bGQgYmUgdHVybmVkIGFyb3VuZCBzbyB0aGF0IHdlIGdyb3Vu ZCBDYWNoZWRQYWdlIGludG8gdGhlIFBhZ2UuCiAgICAgICAgIGNhY2hlZFBhZ2UtPnJlc3RvcmUo Km1fZnJhbWUucGFnZSgpKTsKIAotICAgICAgICBkaXNwYXRjaERpZENvbW1pdExvYWQoaGFzSW5z ZWN1cmVDb250ZW50KTsKLQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgICAgIG1fZnJh bWUucGFnZSgpLT5jaHJvbWUoKS5zZXREaXNwYXRjaFZpZXdwb3J0RGF0YURpZENoYW5nZVN1cHBy ZXNzZWQoZmFsc2UpOwogICAgICAgICBtX2ZyYW1lLnBhZ2UoKS0+Y2hyb21lKCkuZGlzcGF0Y2hW aWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UobV9mcmFtZS5wYWdlKCktPnZpZXdwb3J0QXJndW1l bnRzKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJh bWV0ZXJzLmNwcAppbmRleCBjYTJkZjQwZWUxZGQyY2EzNmYzYTQ4YTA0NzU3Zjk3YmRiYjYzNjQ3 Li42ZDA3YzAzYWQ4YzkyN2U1NDUzYzVmZGE5NTk2NzA5YTc3MjYxZTJiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcApAQCAtNzMs NyArNzMsNyBAQCB2b2lkIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZShJUEM6OkVu Y29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2Rlci5lbmNvZGVFbnVtKGxheWVySG9zdGlu Z01vZGUpOwogICAgIGVuY29kZXIgPDwgbWltZVR5cGVzV2l0aEN1c3RvbUNvbnRlbnRQcm92aWRl cnM7CiAgICAgZW5jb2RlciA8PCBjb250cm9sbGVkQnlBdXRvbWF0aW9uOwotICAgIGVuY29kZXIg PDwgaXNTd2FwRnJvbVN1c3BlbmRlZDsKKyAgICBlbmNvZGVyIDw8IGlzUHJvY2Vzc1N3YXA7CiAK ICNpZiBQTEFURk9STShNQUMpCiAgICAgZW5jb2RlciA8PCBjb2xvclNwYWNlOwpAQCAtMjI3LDcg KzIyNyw3IEBAIE9wdGlvbmFsPFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM+IFdlYlBhZ2VDcmVh dGlvblBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkRlY29kCiAgICAgICAgIHJldHVybiBXVEY6Om51 bGxvcHQ7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmNvbnRyb2xsZWRCeUF1 dG9tYXRpb24pKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotICAgIGlmICghZGVjb2Rl ci5kZWNvZGUocGFyYW1ldGVycy5pc1N3YXBGcm9tU3VzcGVuZGVkKSkKKyAgICBpZiAoIWRlY29k ZXIuZGVjb2RlKHBhcmFtZXRlcnMuaXNQcm9jZXNzU3dhcCkpCiAgICAgICAgIHJldHVybiBXVEY6 Om51bGxvcHQ7CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgKaW5kZXggYWU0MzI1Y2JkNWYxZTU2NzYxNjU4 NmY1ZTlmYTczZWU1YjM1YjkzNy4uYjM4MmNlZWRkNDQ5YThkOWEwZjg2OTQ3MzVmMjZjMDU5NWRk ZWNkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnMuaApAQCAtMTI5LDcgKzEyOSw3IEBAIHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzIHsKICAgICBWZWN0b3I8U3RyaW5nPiBtaW1lVHlwZXNXaXRoQ3VzdG9tQ29udGVudFByb3Zp ZGVyczsKIAogICAgIGJvb2wgY29udHJvbGxlZEJ5QXV0b21hdGlvbjsKLSAgICBib29sIGlzU3dh cEZyb21TdXNwZW5kZWQgeyBmYWxzZSB9OworICAgIGJvb2wgaXNQcm9jZXNzU3dhcCB7IGZhbHNl IH07CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgQ29sb3JTcGFjZURhdGEgY29sb3JTcGFjZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBvbGljeUFjdGlvbi5oIGIvU291 cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKaW5kZXggMTQyYTUxOGRmMDk3ZTVl ZjJmYTE4MDQ4NGUwOWQwMzMzYzEwNWI4MS4uMzk3MTc5NWM0NmE1MWIzODgxOGM1NWI3NmQ2NTNh MzRiNTI4OWU5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0 aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUG9saWN5QWN0aW9uLmgKQEAgLTI5 LDExICsyOSwxMSBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorLy8gRklYTUU6IFJlbW92ZSB0 aGlzIHR5cGUgYW5kIHVzZSBXZWJDb3JlOjpQb2xpY3lBY3Rpb24gaW5zdGVhZC4KIGVudW0gY2xh c3MgV2ViUG9saWN5QWN0aW9uIDogdWludDhfdCB7CiAgICAgVXNlLAogICAgIERvd25sb2FkLAot ICAgIElnbm9yZSwKLSAgICBTdXNwZW5kCisgICAgSWdub3JlCiB9OwogCiB9CkBAIC00NSw4ICs0 NSw3IEBAIHRlbXBsYXRlPD4gc3RydWN0IEVudW1UcmFpdHM8V2ViS2l0OjpXZWJQb2xpY3lBY3Rp b24+IHsKICAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb24sCiAgICAgICAgIFdlYktpdDo6 V2ViUG9saWN5QWN0aW9uOjpVc2UsCiAgICAgICAgIFdlYktpdDo6V2ViUG9saWN5QWN0aW9uOjpE b3dubG9hZCwKLSAgICAgICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246Oklnbm9yZSwKLSAgICAg ICAgV2ViS2l0OjpXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQKKyAgICAgICAgV2ViS2l0OjpXZWJQ b2xpY3lBY3Rpb246Oklnbm9yZQogICAgID47CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1NvdXJjZXMudHh0IGIvU291cmNlL1dlYktpdC9Tb3VyY2VzLnR4dAppbmRleCAzNDBlN2Jm MjYxODRiZDg1NWY4ZWMxM2Q2N2I2ODAxZTY5ZDZjZWNmLi40ZGUwYzZmZWZlOGVhZjNjYTRhMGZk ZjA3ZDA1YTExMTdkYWJjYjMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NvdXJjZXMudHh0 CisrKyBiL1NvdXJjZS9XZWJLaXQvU291cmNlcy50eHQKQEAgLTIzMCw2ICsyMzAsNyBAQCBVSVBy b2Nlc3MvSW5zcGVjdG9yVGFyZ2V0UHJveHkuY3BwCiBVSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5j cHAKIFVJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcAogVUlQcm9jZXNzL1Byb2Nlc3NUaHJv dHRsZXIuY3BwCitVSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCiBVSVByb2Nlc3Mv UmVtb3RlV2ViSW5zcGVjdG9yUHJveHkuY3BwCiBVSVByb2Nlc3MvUmVzcG9uc2l2ZW5lc3NUaW1l ci5jcHAKIFVJUHJvY2Vzcy9TZXJ2aWNlV29ya2VyUHJvY2Vzc1Byb3h5LmNwcApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMDc0Y2RkZmQy Nzg0ZTg2OTEyOGQwMjBiZWQ1OTIxM2ExY2JkZGU2OC4uNGRmYWQ2NGUwMTU0MzU5MjgwZTYxNjhi MWYxZWQ1ZWJlNmQ3ZDliYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3Lm1tCkBAIC00NCw2ICs0NCw3IEBACiAjaW1wb3J0ICJOYXZpZ2F0aW9uU3Rh dGUuaCIKICNpbXBvcnQgIk9iakNPYmplY3RHcmFwaC5oIgogI2ltcG9ydCAiUGFnZUNsaWVudC5o IgorI2ltcG9ydCAiUHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbXBvcnQgIlJlbW90ZUxheWVy VHJlZVNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YS5oIgogI2ltcG9ydCAiUmVtb3RlTGF5ZXJUcmVl VHJhbnNhY3Rpb24uaCIKICNpbXBvcnQgIlJlbW90ZU9iamVjdFJlZ2lzdHJ5LmgiCkBAIC00NzAw LDYgKzQ3MDEsMTEgQEAgLSAodm9pZClfa2lsbFdlYkNvbnRlbnRQcm9jZXNzQW5kUmVzZXRTdGF0 ZQogewogICAgIFJlZjxXZWJLaXQ6OldlYlByb2Nlc3NQcm94eT4gcHJvdGVjdGVkUHJvY2Vzc1By b3h5KF9wYWdlLT5wcm9jZXNzKCkpOwogICAgIHByb3RlY3RlZFByb2Nlc3NQcm94eS0+cmVxdWVz dFRlcm1pbmF0aW9uKFdlYktpdDo6UHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpSZXF1ZXN0ZWRC eUNsaWVudCk7CisKKyAgICBpZiAoYXV0byogcHJvdmlzaW9uYWxQYWdlUHJveHkgPSBfcGFnZS0+ cHJvdmlzaW9uYWxQYWdlUHJveHkoKSkgeworICAgICAgICBSZWY8V2ViS2l0OjpXZWJQcm9jZXNz UHJveHk+IHByb3RlY3RlZFByb2Nlc3NQcm94eShwcm92aXNpb25hbFBhZ2VQcm94eS0+cHJvY2Vz cygpKTsKKyAgICAgICAgcHJvdGVjdGVkUHJvY2Vzc1Byb3h5LT5yZXF1ZXN0VGVybWluYXRpb24o V2ViS2l0OjpQcm9jZXNzVGVybWluYXRpb25SZWFzb246OlJlcXVlc3RlZEJ5Q2xpZW50KTsKKyAg ICB9CiB9CiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwCmluZGV4IDY4MzMzMWQ3NjE0ZmI2YWY5Yzkw OWNmZjk1ZWY1MDA1YmJhYjkzMTIuLjMxNzg1OWQ3NTMzNWU3ZGRjYTAzMDcyMDRkY2NlNWU0ZGUx ZTAxMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNs aWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNs aWVudEltcGwuY3BwCkBAIC02MCw5ICs2MCw5IEBAIFBhZ2VDbGllbnRJbXBsOjpQYWdlQ2xpZW50 SW1wbChHdGtXaWRnZXQqIHZpZXdXaWRnZXQpCiB9CiAKIC8vIFBhZ2VDbGllbnQncyBwdXJlIHZp cnR1YWwgZnVuY3Rpb25zCi1zdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gUGFnZUNs aWVudEltcGw6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKQorc3RkOjp1bmlxdWVfcHRyPERyYXdp bmdBcmVhUHJveHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KFdlYlBy b2Nlc3NQcm94eSYgcHJvY2VzcykKIHsKLSAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxEcmF3 aW5nQXJlYVByb3h5SW1wbD4oKndlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJ RVdfQkFTRShtX3ZpZXdXaWRnZXQpKSk7CisgICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8RHJh d2luZ0FyZWFQcm94eUltcGw+KCp3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9W SUVXX0JBU0UobV92aWV3V2lkZ2V0KSksIHByb2Nlc3MpOwogfQogCiB2b2lkIFBhZ2VDbGllbnRJ bXBsOjpzZXRWaWV3TmVlZHNEaXNwbGF5KGNvbnN0IFdlYkNvcmU6OlJlZ2lvbiYgcmVnaW9uKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1w bC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5oCmlu ZGV4IGIwOTE5MjBlODI1NTUxOTliZjMyN2M2YjZkMzNmMjk0ZTAwMDNmMTIuLjZkZWE4ZjM5ZmQ4 MTUxZDQ2NGNlNjRhMTVlNTMwY2U5NmY5YzRkZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmgKQEAgLTU1LDcgKzU1LDcgQEAgcHVibGlj OgogCiBwcml2YXRlOgogICAgIC8vIFBhZ2VDbGllbnQKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8RHJh d2luZ0FyZWFQcm94eT4gY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpIG92ZXJyaWRlOworICAgIHN0 ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBjcmVhdGVEcmF3aW5nQXJlYVByb3h5KFdl YlByb2Nlc3NQcm94eSYpIG92ZXJyaWRlOwogICAgIHZvaWQgc2V0Vmlld05lZWRzRGlzcGxheShj b25zdCBXZWJDb3JlOjpSZWdpb24mKSBvdmVycmlkZTsKICAgICB2b2lkIHJlcXVlc3RTY3JvbGwo Y29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgc2Nyb2xsUG9zaXRpb24sIGNvbnN0IFdlYkNvcmU6 OkludFBvaW50JiBzY3JvbGxPcmlnaW4sIGJvb2wgaXNQcm9ncmFtbWF0aWNTY3JvbGwpIG92ZXJy aWRlOwogICAgIFdlYkNvcmU6OkZsb2F0UG9pbnQgdmlld1Njcm9sbFBvc2l0aW9uKCkgb3ZlcnJp ZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL1BhZ2VDbGll bnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvUGFnZUNsaWVudElt cGwuY3BwCmluZGV4IGRhOWU2ZDc4NzRmYzNjMWM4ZmE5MDVlNzAxMjZiNGQ2NGQ0YzJjOTUuLjIy MzM2MTUwZmVhYmY4YzQwNjM4ZmZhOTA1Y2M0MjE3Yjg0MDE0ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvUGFnZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvUGFnZUNsaWVudEltcGwuY3BwCkBAIC01MSw5ICs1 MSw5IEBAIHN0cnVjdCB3cGVfdmlld19iYWNrZW5kKiBQYWdlQ2xpZW50SW1wbDo6dmlld0JhY2tl bmQoKQogICAgIHJldHVybiBtX3ZpZXcuYmFja2VuZCgpOwogfQogCi1zdGQ6OnVuaXF1ZV9wdHI8 RHJhd2luZ0FyZWFQcm94eT4gUGFnZUNsaWVudEltcGw6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHko KQorc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVh dGVEcmF3aW5nQXJlYVByb3h5KFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcykKIHsKLSAgICByZXR1 cm4gc3RkOjptYWtlX3VuaXF1ZTxBY2NlbGVyYXRlZERyYXdpbmdBcmVhUHJveHk+KG1fdmlldy5w YWdlKCkpOworICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPEFjY2VsZXJhdGVkRHJhd2luZ0Fy ZWFQcm94eT4obV92aWV3LnBhZ2UoKSwgcHJvY2Vzcyk7CiB9CiAKIHZvaWQgUGFnZUNsaWVudElt cGw6OnNldFZpZXdOZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29yZTo6UmVnaW9uJikKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvUGFnZUNsaWVudEltcGwuaCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvUGFnZUNsaWVudEltcGwuaAppbmRleCBkNmQ1 YTY5MmE4ZWEyZjk0MWJlNDNlODFjZjkyNzhjODUzMmVkMmVlLi5iNjk5ZjI5ZjliMjg3MGE2YmUw YjNmZmI0NGE3ODk2ZTIzZjg1YzQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvd3BlL1BhZ2VDbGllbnRJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL3dwZS9QYWdlQ2xpZW50SW1wbC5oCkBAIC01Myw3ICs1Myw3IEBAIHB1YmxpYzoKIAogcHJp dmF0ZToKICAgICAvLyBQYWdlQ2xpZW50Ci0gICAgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVh UHJveHk+IGNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKSBvdmVycmlkZTsKKyAgICBzdGQ6OnVuaXF1 ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJhd2luZ0FyZWFQcm94eShXZWJQcm9jZXNz UHJveHkmKSBvdmVycmlkZTsKICAgICB2b2lkIHNldFZpZXdOZWVkc0Rpc3BsYXkoY29uc3QgV2Vi Q29yZTo6UmVnaW9uJikgb3ZlcnJpZGU7CiAgICAgdm9pZCByZXF1ZXN0U2Nyb2xsKGNvbnN0IFdl YkNvcmU6OkZsb2F0UG9pbnQmLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYsIGJvb2wpIG92ZXJy aWRlOwogICAgIFdlYkNvcmU6OkZsb2F0UG9pbnQgdmlld1Njcm9sbFBvc2l0aW9uKCkgb3ZlcnJp ZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BY2NlbGVyYXRlZERyYXdp bmdBcmVhUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQWNjZWxlcmF0ZWREcmF3 aW5nQXJlYVByb3h5LmNwcAppbmRleCBlYzg0NmIzN2E0YWQzZTRkOWZlMjdlM2NmNGE2ZmJjMGY2 NTlhZDZiLi4zOWFmOWIzNzk4YjgyZWQ5NjFiZDliZTQ4ZjIyZmQ2N2MyZGE5OTFhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BY2NlbGVyYXRlZERyYXdpbmdBcmVhUHJveHku Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FjY2VsZXJhdGVkRHJhd2luZ0FyZWFQ cm94eS5jcHAKQEAgLTQ1LDggKzQ1LDggQEAKIG5hbWVzcGFjZSBXZWJLaXQgewogdXNpbmcgbmFt ZXNwYWNlIFdlYkNvcmU7CiAKLUFjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eTo6QWNjZWxlcmF0 ZWREcmF3aW5nQXJlYVByb3h5KFdlYlBhZ2VQcm94eSYgd2ViUGFnZVByb3h5KQotICAgIDogRHJh d2luZ0FyZWFQcm94eShEcmF3aW5nQXJlYVR5cGVJbXBsLCB3ZWJQYWdlUHJveHkpCitBY2NlbGVy YXRlZERyYXdpbmdBcmVhUHJveHk6OkFjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eShXZWJQYWdl UHJveHkmIHdlYlBhZ2VQcm94eSwgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKQorICAgIDogRHJh d2luZ0FyZWFQcm94eShEcmF3aW5nQXJlYVR5cGVJbXBsLCB3ZWJQYWdlUHJveHksIHByb2Nlc3Mp CiB7CiB9CiAKQEAgLTEwNiw3ICsxMDYsNyBAQCB2b2lkIEFjY2VsZXJhdGVkRHJhd2luZ0FyZWFQ cm94eTo6ZGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUodWludDY0X3QgYmFja2luZ1N0bwogICAg IG1faXNXYWl0aW5nRm9yRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUgPSBmYWxzZTsKIAogICAg IC8vIFN0b3AgdGhlIHJlc3BvbnNpdmVuZXNzIHRpbWVyIHRoYXQgd2FzIHN0YXJ0ZWQgaW4gc2Vu ZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlLgotICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5y ZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RvcCgpOworICAgIHByb2Nlc3MoKS5yZXNwb25zaXZlbmVz c1RpbWVyKCkuc3RvcCgpOwogCiAgICAgaWYgKGxheWVyVHJlZUNvbnRleHQgIT0gbV9sYXllclRy ZWVDb250ZXh0KSB7CiAgICAgICAgIGlmIChsYXllclRyZWVDb250ZXh0LmlzRW1wdHkoKSAmJiAh bV9sYXllclRyZWVDb250ZXh0LmlzRW1wdHkoKSkgewpAQCAtMTgzLDEzICsxODMsMTMgQEAgdm9p ZCBBY2NlbGVyYXRlZERyYXdpbmdBcmVhUHJveHk6OnNlbmRVcGRhdGVCYWNraW5nU3RvcmVTdGF0 ZShSZXNwb25kSW1tZWRpYXRlbHkKIAogICAgIG1faXNXYWl0aW5nRm9yRGlkVXBkYXRlQmFja2lu Z1N0b3JlU3RhdGUgPSByZXNwb25kSW1tZWRpYXRlbHlPck5vdCA9PSBSZXNwb25kSW1tZWRpYXRl bHk7CiAKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2lu Z0FyZWE6OlVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKG1fbmV4dEJhY2tpbmdTdG9yZVN0YXRlSUQs IHJlc3BvbmRJbW1lZGlhdGVseU9yTm90ID09IFJlc3BvbmRJbW1lZGlhdGVseSwgbV93ZWJQYWdl UHJveHkuZGV2aWNlU2NhbGVGYWN0b3IoKSwgbV9zaXplLCBtX3Njcm9sbE9mZnNldCksIG1fd2Vi UGFnZVByb3h5LnBhZ2VJRCgpKTsKKyAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2lu Z0FyZWE6OlVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKG1fbmV4dEJhY2tpbmdTdG9yZVN0YXRlSUQs IHJlc3BvbmRJbW1lZGlhdGVseU9yTm90ID09IFJlc3BvbmRJbW1lZGlhdGVseSwgbV93ZWJQYWdl UHJveHkuZGV2aWNlU2NhbGVGYWN0b3IoKSwgbV9zaXplLCBtX3Njcm9sbE9mZnNldCksIG1fd2Vi UGFnZVByb3h5LnBhZ2VJRCgpKTsKICAgICBtX3Njcm9sbE9mZnNldCA9IEludFNpemUoKTsKIAog ICAgIGlmIChtX2lzV2FpdGluZ0ZvckRpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKSB7CiAgICAg ICAgIC8vIFN0YXJ0IHRoZSByZXNwb25zaXZlbmVzcyB0aW1lci4gV2Ugd2lsbCBzdG9wIGl0IHdo ZW4gd2UgaGVhciBiYWNrIGZyb20gdGhlIFdlYlByb2Nlc3MKICAgICAgICAgLy8gaW4gZGlkVXBk YXRlQmFja2luZ1N0b3JlU3RhdGUuCi0gICAgICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5y ZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKKyAgICAgICAgcHJvY2VzcygpLnJlc3BvbnNp dmVuZXNzVGltZXIoKS5zdGFydCgpOwogICAgIH0KIAogICAgIGlmIChtX2lzV2FpdGluZ0ZvckRp ZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlICYmICFtX2xheWVyVHJlZUNvbnRleHQuaXNFbXB0eSgp KSB7CkBAIC0yMDUsNyArMjA1LDcgQEAgdm9pZCBBY2NlbGVyYXRlZERyYXdpbmdBcmVhUHJveHk6 OndhaXRGb3JBbmREaXNwYXRjaERpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKCkKIAogICAgIGlm ICghbV93ZWJQYWdlUHJveHkuaXNWYWxpZCgpKQogICAgICAgICByZXR1cm47Ci0gICAgaWYgKG1f d2ViUGFnZVByb3h5LnByb2Nlc3MoKS5zdGF0ZSgpID09IFdlYlByb2Nlc3NQcm94eTo6U3RhdGU6 OkxhdW5jaGluZykKKyAgICBpZiAocHJvY2VzcygpLnN0YXRlKCkgPT0gV2ViUHJvY2Vzc1Byb3h5 OjpTdGF0ZTo6TGF1bmNoaW5nKQogICAgICAgICByZXR1cm47CiAgICAgaWYgKCFtX3dlYlBhZ2VQ cm94eS5pc1ZpZXdWaXNpYmxlKCkpCiAgICAgICAgIHJldHVybjsKQEAgLTIyMiw3ICsyMjIsNyBA QCB2b2lkIEFjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eTo6d2FpdEZvckFuZERpc3BhdGNoRGlk VXBkYXRlQmFja2luZ1N0b3JlU3RhdGUoKQogICAgIC8vIGNob29zZSB0aGUgbW9zdCByZWNlbnQg b25lLCBvciB0aGUgb25lIHRoYXQgaXMgY2xvc2VzdCB0byBvdXIgY3VycmVudCBzaXplLgogCiAg ICAgLy8gVGhlIHRpbWVvdXQsIGluIHNlY29uZHMsIHdlIHVzZSB3aGVuIHdhaXRpbmcgZm9yIGEg RGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUgbWVzc2FnZSB3aGVuIHdlJ3JlIGFza2VkIHRvIHBh aW50LgotICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5jb25uZWN0aW9uKCktPndhaXRGb3JB bmREaXNwYXRjaEltbWVkaWF0ZWx5PE1lc3NhZ2VzOjpEcmF3aW5nQXJlYVByb3h5OjpEaWRVcGRh dGVCYWNraW5nU3RvcmVTdGF0ZT4obV93ZWJQYWdlUHJveHkucGFnZUlEKCksIFNlY29uZHM6OmZy b21NaWxsaXNlY29uZHMoNTAwKSk7CisgICAgcHJvY2VzcygpLmNvbm5lY3Rpb24oKS0+d2FpdEZv ckFuZERpc3BhdGNoSW1tZWRpYXRlbHk8TWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJveHk6OkRpZFVw ZGF0ZUJhY2tpbmdTdG9yZVN0YXRlPihtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSwgU2Vjb25kczo6 ZnJvbU1pbGxpc2Vjb25kcyg1MDApKTsKIH0KIAogdm9pZCBBY2NlbGVyYXRlZERyYXdpbmdBcmVh UHJveHk6OmVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoY29uc3QgTGF5ZXJUcmVlQ29u dGV4dCYgbGF5ZXJUcmVlQ29udGV4dCkKQEAgLTI1Niw3ICsyNTYsNyBAQCB2b2lkIEFjY2VsZXJh dGVkRHJhd2luZ0FyZWFQcm94eTo6c2V0TmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5n KHVpbnQ2NF90CiAgICAgICAgIG1fcGVuZGluZ05hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3Np dGluZyA9IGhhbmRsZTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBtX3dlYlBhZ2VQcm94 eS5wcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6OlNldE5hdGl2ZVN1cmZhY2VI YW5kbGVGb3JDb21wb3NpdGluZyhoYW5kbGUpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSwgSVBD OjpTZW5kT3B0aW9uOjpEaXNwYXRjaE1lc3NhZ2VFdmVuV2hlbldhaXRpbmdGb3JTeW5jUmVwbHkp OworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6U2V0TmF0aXZlU3Vy ZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKGhhbmRsZSksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgp LCBJUEM6OlNlbmRPcHRpb246OkRpc3BhdGNoTWVzc2FnZUV2ZW5XaGVuV2FpdGluZ0ZvclN5bmNS ZXBseSk7CiB9CiAKIHZvaWQgQWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5OjpkZXN0cm95TmF0 aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKCkKQEAgLTI2Niw3ICsyNjYsNyBAQCB2b2lk IEFjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eTo6ZGVzdHJveU5hdGl2ZVN1cmZhY2VIYW5kbGVG b3JDb21wb3NpdGluZygpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgYm9vbCBoYW5kbGVk OwotICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5zZW5kU3luYyhNZXNzYWdlczo6RHJhd2lu Z0FyZWE6OkRlc3Ryb3lOYXRpdmVTdXJmYWNlSGFuZGxlRm9yQ29tcG9zaXRpbmcoKSwgTWVzc2Fn ZXM6OkRyYXdpbmdBcmVhOjpEZXN0cm95TmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5n OjpSZXBseShoYW5kbGVkKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOworICAgIHByb2Nlc3Mo KS5zZW5kU3luYyhNZXNzYWdlczo6RHJhd2luZ0FyZWE6OkRlc3Ryb3lOYXRpdmVTdXJmYWNlSGFu ZGxlRm9yQ29tcG9zaXRpbmcoKSwgTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpEZXN0cm95TmF0aXZl U3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nOjpSZXBseShoYW5kbGVkKSwgbV93ZWJQYWdlUHJv eHkucGFnZUlEKCkpOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5LmgKaW5kZXggNzY4M2MzZjI0YTZkNzRj YTMyZjYyZmY2Y2YxYmU2MzQ4MjA5NzFhMS4uYzM4YTliYjEyYmM1MDM2ZGU5ZWJmYjYyYmUyNWIy MTQ2YzVlMWNlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQWNjZWxlcmF0 ZWREcmF3aW5nQXJlYVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQWNjZWxl cmF0ZWREcmF3aW5nQXJlYVByb3h5LmgKQEAgLTM0LDcgKzM0LDcgQEAgbmFtZXNwYWNlIFdlYktp dCB7CiAKIGNsYXNzIEFjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eSA6IHB1YmxpYyBEcmF3aW5n QXJlYVByb3h5IHsKIHB1YmxpYzoKLSAgICBleHBsaWNpdCBBY2NlbGVyYXRlZERyYXdpbmdBcmVh UHJveHkoV2ViUGFnZVByb3h5Jik7CisgICAgQWNjZWxlcmF0ZWREcmF3aW5nQXJlYVByb3h5KFdl YlBhZ2VQcm94eSYsIFdlYlByb2Nlc3NQcm94eSYpOwogICAgIHZpcnR1YWwgfkFjY2VsZXJhdGVk RHJhd2luZ0FyZWFQcm94eSgpOwogCiAgICAgYm9vbCBpc0luQWNjZWxlcmF0ZWRDb21wb3NpdGlu Z01vZGUoKSBjb25zdCB7IHJldHVybiBhbHdheXNVc2VDb21wb3NpdGluZygpIHx8ICFtX2xheWVy VHJlZUNvbnRleHQuaXNFbXB0eSgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Db2NvYS9XZWJQYWdlUHJveHlDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL1dlYlBhZ2VQcm94eUNvY29hLm1tCmluZGV4IDgzZjVlOGZmZmRkNjk4MjNmZjdkOGZl OTg5ZmRlZmU2YTJiNjQxZTIuLjM1NGY1YWYzYTEyYzE3MjUwMmM1ZmEwNGIwOWJiNjhhNWJlNzJj MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlBhZ2VQcm94 eUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlBhZ2VQcm94 eUNvY29hLm1tCkBAIC0xMjEsNyArMTIxLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNyZWF0ZVNh bmRib3hFeHRlbnNpb25zSWZOZWVkZWQoY29uc3QgVmVjdG9yPFN0cmluZz4mIGZpbGVzLAogICAg ICAgICBCT09MIGlzRGlyZWN0b3J5OwogICAgICAgICBpZiAoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1 bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOmZpbGVzWzBdIGlzRGlyZWN0b3J5OiZpc0RpcmVj dG9yeV0gJiYgIWlzRGlyZWN0b3J5KSB7CiAgICAgICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpj cmVhdGVIYW5kbGUoIi8iLCBTYW5kYm94RXh0ZW5zaW9uOjpUeXBlOjpSZWFkT25seSwgZmlsZVJl YWRIYW5kbGUpOwotICAgICAgICAgICAgd2lsbEFjcXVpcmVVbml2ZXJzYWxGaWxlUmVhZFNhbmRi b3hFeHRlbnNpb24oKTsKKyAgICAgICAgICAgIHdpbGxBY3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRT YW5kYm94RXh0ZW5zaW9uKG1fcHJvY2Vzcyk7CiAgICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmggYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCmluZGV4IGM2OGRiY2M3Y2VhYjkx MjRmYjllZTk1YTUyZDY4ZGVlODgzYWM3N2EuLjViMjEzOGRmMzA1NThiYzgzMmZiYWYzMGNmMDBi MTM3MDFkMzhlNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dl YlZpZXdJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0lt cGwuaApAQCAtMTk3LDcgKzE5Nyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEZpeGVkTGF5b3V0 U2l6ZShDR1NpemUpOwogICAgIENHU2l6ZSBmaXhlZExheW91dFNpemUoKSBjb25zdDsKIAotICAg IHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBjcmVhdGVEcmF3aW5nQXJlYVByb3h5 KCk7CisgICAgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURyYXdpbmdB cmVhUHJveHkoV2ViUHJvY2Vzc1Byb3h5Jik7CiAgICAgYm9vbCBpc1VzaW5nVUlTaWRlQ29tcG9z aXRpbmcoKSBjb25zdDsKICAgICB2b2lkIHNldERyYXdpbmdBcmVhU2l6ZShDR1NpemUpOwogICAg IHZvaWQgdXBkYXRlTGF5ZXIoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL1dlYlZpZXdJbXBsLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2Vi Vmlld0ltcGwubW0KaW5kZXggZDUxZWY1ZDlmZTE3MmNjMDYxNmNhMDVmZGQzZjE5YTYzNmQ4MmY5 Mi4uNWRkMTUzNTVjYmQ0YWU0Zjg0ZTg2MGJmNjBhYmM1NzlkNDBmM2IzMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KQEAgLTE3MjUsMTIgKzE3MjUs MTIgQEAgQ0dTaXplIFdlYlZpZXdJbXBsOjpmaXhlZExheW91dFNpemUoKSBjb25zdAogICAgIHJl dHVybiBtX3BhZ2UtPmZpeGVkTGF5b3V0U2l6ZSgpOwogfQogCi1zdGQ6OnVuaXF1ZV9wdHI8V2Vi S2l0OjpEcmF3aW5nQXJlYVByb3h5PiBXZWJWaWV3SW1wbDo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94 eSgpCitzdGQ6OnVuaXF1ZV9wdHI8V2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5PiBXZWJWaWV3SW1w bDo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eShXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MpCiB7CiAg ICAgaWYgKFtbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBvYmplY3RGb3JL ZXk6QCJXZWJLaXQyVXNlUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEiXSBib29sVmFsdWVdKQot ICAgICAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJl YVByb3h5PihtX3BhZ2UpOworICAgICAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxSZW1vdGVM YXllclRyZWVEcmF3aW5nQXJlYVByb3h5PihtX3BhZ2UsIHByb2Nlc3MpOwogCi0gICAgcmV0dXJu IHN0ZDo6bWFrZV91bmlxdWU8VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eT4obV9w YWdlKTsKKyAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxUaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYVByb3h5PihtX3BhZ2UsIHByb2Nlc3MpOwogfQogCiBib29sIFdlYlZpZXdJbXBsOjpp c1VzaW5nVUlTaWRlQ29tcG9zaXRpbmcoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9EcmF3aW5nQXJlYVByb3h5LmNwcAppbmRleCA3OTU2OGRmMTY3ZWM3YzdjNTBhZmViZGNkMDMx MTM3NzFlYmU0MTgxLi5kMzZiYzQ2ZmU2OTQ5ZDVjODhkMjY5YTBlYjJjYmM0NThlNmM4YmZiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmNwcApAQCAtMzgs MjAgKzM4LDIxIEBACiBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3Jl OwogCi1EcmF3aW5nQXJlYVByb3h5OjpEcmF3aW5nQXJlYVByb3h5KERyYXdpbmdBcmVhVHlwZSB0 eXBlLCBXZWJQYWdlUHJveHkmIHdlYlBhZ2VQcm94eSkKK0RyYXdpbmdBcmVhUHJveHk6OkRyYXdp bmdBcmVhUHJveHkoRHJhd2luZ0FyZWFUeXBlIHR5cGUsIFdlYlBhZ2VQcm94eSYgd2ViUGFnZVBy b3h5LCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MpCiAgICAgOiBtX3R5cGUodHlwZSkKICAgICAs IG1fd2ViUGFnZVByb3h5KHdlYlBhZ2VQcm94eSkKKyAgICAsIG1fcHJvY2VzcyhtYWtlUmVmKHBy b2Nlc3MpKQogICAgICwgbV9zaXplKHdlYlBhZ2VQcm94eS52aWV3U2l6ZSgpKQogI2lmIFBMQVRG T1JNKE1BQykKICAgICAsIG1fdmlld0V4cG9zZWRSZWN0Q2hhbmdlZFRpbWVyKFJ1bkxvb3A6Om1h aW4oKSwgdGhpcywgJkRyYXdpbmdBcmVhUHJveHk6OnZpZXdFeHBvc2VkUmVjdENoYW5nZWRUaW1l ckZpcmVkKQogI2VuZGlmCiB7Ci0gICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLmFkZE1lc3Nh Z2VSZWNlaXZlcihNZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFt ZSgpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSwgKnRoaXMpOworICAgIHByb2Nlc3MuYWRkTWVz c2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYVByb3h5OjptZXNzYWdlUmVjZWl2ZXJO YW1lKCksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpLCAqdGhpcyk7CiB9CiAKIERyYXdpbmdBcmVh UHJveHk6On5EcmF3aW5nQXJlYVByb3h5KCkKIHsKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNz KCkucmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYVByb3h5OjptZXNz YWdlUmVjZWl2ZXJOYW1lKCksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKKyAgICBwcm9jZXNz KCkucmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYVByb3h5OjptZXNz YWdlUmVjZWl2ZXJOYW1lKCksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKIH0KIAogYm9vbCBE cmF3aW5nQXJlYVByb3h5OjpzZXRTaXplKGNvbnN0IEludFNpemUmIHNpemUsIGNvbnN0IEludFNp emUmIHNjcm9sbERlbHRhKQpAQCAtOTIsNyArOTMsNyBAQCB2b2lkIERyYXdpbmdBcmVhUHJveHk6 OnZpZXdFeHBvc2VkUmVjdENoYW5nZWRUaW1lckZpcmVkKCkKICAgICBpZiAobV92aWV3RXhwb3Nl ZFJlY3QgPT0gbV9sYXN0U2VudFZpZXdFeHBvc2VkUmVjdCkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpT ZXRWaWV3RXhwb3NlZFJlY3QobV92aWV3RXhwb3NlZFJlY3QpLCBtX3dlYlBhZ2VQcm94eS5wYWdl SUQoKSk7CisgICAgcHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpTZXRWaWV3 RXhwb3NlZFJlY3QobV92aWV3RXhwb3NlZFJlY3QpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7 CiAgICAgbV9sYXN0U2VudFZpZXdFeHBvc2VkUmVjdCA9IG1fdmlld0V4cG9zZWRSZWN0OwogfQog I2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0RyYXdpbmdBcmVhUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdpbmdB cmVhUHJveHkuaAppbmRleCA4NmZiMTNkOTc2NDJiNGY3OWQ3MWQyYjA0Mjk0NjczYzNhMjdlMTg0 Li4zNDE5YTg5ZThkN2M4MzI3Y2JlMGYwY2EzOWUyMmViYjJkNDQyNWFkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmgKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oCkBAIC00OCw2ICs0OCw3IEBAIG5hbWVz cGFjZSBXZWJLaXQgewogY2xhc3MgTGF5ZXJUcmVlQ29udGV4dDsKIGNsYXNzIFVwZGF0ZUluZm87 CiBjbGFzcyBXZWJQYWdlUHJveHk7CitjbGFzcyBXZWJQcm9jZXNzUHJveHk7CiAKIGNsYXNzIERy YXdpbmdBcmVhUHJveHkgOiBwdWJsaWMgSVBDOjpNZXNzYWdlUmVjZWl2ZXIgewogICAgIFdURl9N QUtFX05PTkNPUFlBQkxFKERyYXdpbmdBcmVhUHJveHkpOwpAQCAtMTA3LDEyICsxMDgsMTQgQEAg cHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaFByZXNlbnRhdGlvbkNhbGxiYWNrc0Fm dGVyRmx1c2hpbmdMYXllcnMoY29uc3QgVmVjdG9yPENhbGxiYWNrSUQ+JikgeyB9CiAKICAgICBX ZWJQYWdlUHJveHkmIHBhZ2UoKSBjb25zdCB7IHJldHVybiBtX3dlYlBhZ2VQcm94eTsgfQorICAg IFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcygpIHsgcmV0dXJuIG1fcHJvY2Vzcy5nZXQoKTsgfQog CiBwcm90ZWN0ZWQ6Ci0gICAgZXhwbGljaXQgRHJhd2luZ0FyZWFQcm94eShEcmF3aW5nQXJlYVR5 cGUsIFdlYlBhZ2VQcm94eSYpOworICAgIERyYXdpbmdBcmVhUHJveHkoRHJhd2luZ0FyZWFUeXBl LCBXZWJQYWdlUHJveHkmLCBXZWJQcm9jZXNzUHJveHkmKTsKIAogICAgIERyYXdpbmdBcmVhVHlw ZSBtX3R5cGU7CiAgICAgV2ViUGFnZVByb3h5JiBtX3dlYlBhZ2VQcm94eTsKKyAgICBSZWY8V2Vi UHJvY2Vzc1Byb3h5PiBtX3Byb2Nlc3M7CiAKICAgICBXZWJDb3JlOjpJbnRTaXplIG1fc2l6ZTsK ICAgICBXZWJDb3JlOjpJbnRTaXplIG1fc2Nyb2xsT2Zmc2V0OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwCmluZGV4IDkwNzBiNWFmYjVhYjQ4 MTNiYjJkYzNkM2JmYWJmMmRhNjc4NDcxZDguLjhjNmNlOGQ2NTg4N2NiOGRjMjkxNTc2ZmJkZDgx Mjc1MWE1NzFkNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdpbmdB cmVhUHJveHlJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9EcmF3aW5nQXJl YVByb3h5SW1wbC5jcHAKQEAgLTQ3LDggKzQ3LDggQEAKIG5hbWVzcGFjZSBXZWJLaXQgewogdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKLURyYXdpbmdBcmVhUHJveHlJbXBsOjpEcmF3aW5nQXJl YVByb3h5SW1wbChXZWJQYWdlUHJveHkmIHdlYlBhZ2VQcm94eSkKLSAgICA6IEFjY2VsZXJhdGVk RHJhd2luZ0FyZWFQcm94eSh3ZWJQYWdlUHJveHkpCitEcmF3aW5nQXJlYVByb3h5SW1wbDo6RHJh d2luZ0FyZWFQcm94eUltcGwoV2ViUGFnZVByb3h5JiB3ZWJQYWdlUHJveHksIFdlYlByb2Nlc3NQ cm94eSYgcHJvY2VzcykKKyAgICA6IEFjY2VsZXJhdGVkRHJhd2luZ0FyZWFQcm94eSh3ZWJQYWdl UHJveHksIHByb2Nlc3MpCiAgICAgLCBtX2Rpc2NhcmRCYWNraW5nU3RvcmVUaW1lcihSdW5Mb29w OjpjdXJyZW50KCksIHRoaXMsICZEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZGlzY2FyZEJhY2tpbmdT dG9yZSkKIHsKICNpZiBVU0UoR0xJQl9FVkVOVF9MT09QKQpAQCAtMTI0LDcgKzEyNCw3IEBAIHZv aWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OnVwZGF0ZSh1aW50NjRfdCBiYWNraW5nU3RvcmVTdGF0 ZUlELCBjb25zdCBVcGRhdGVJbmZvCiAgICAgLy8gRklYTUU6IEhhbmRsZSB0aGUgY2FzZSB3aGVy ZSB0aGUgdmlldyBpcyBoaWRkZW4uCiAKICAgICBpbmNvcnBvcmF0ZVVwZGF0ZSh1cGRhdGVJbmZv KTsKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2luZ0Fy ZWE6OkRpZFVwZGF0ZSgpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CisgICAgcHJvY2Vzcygp LnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpEaWRVcGRhdGUoKSwgbV93ZWJQYWdlUHJveHku cGFnZUlEKCkpOwogfQogCiB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjpkaWRVcGRhdGVCYWNr aW5nU3RvcmVTdGF0ZSh1aW50NjRfdCBiYWNraW5nU3RvcmVTdGF0ZUlELCBjb25zdCBVcGRhdGVJ bmZvJiB1cGRhdGVJbmZvLCBjb25zdCBMYXllclRyZWVDb250ZXh0JiBsYXllclRyZWVDb250ZXh0 KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUlt cGwuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmgKaW5k ZXggMGFmNzc3ZmNlNDQwN2QyMzYxZGFkM2ZiZGZmZTc2YTFiYmMzN2I4OS4uMzFhOWNjNzk4NjFm NmI0MGMyNTM5OWJjN2Q4NTRkNGIzNDBmMDM5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5oCkBAIC0zOSw3ICszOSw3IEBAIG5hbWVzcGFjZSBX ZWJLaXQgewogCiBjbGFzcyBEcmF3aW5nQXJlYVByb3h5SW1wbCBmaW5hbCA6IHB1YmxpYyBBY2Nl bGVyYXRlZERyYXdpbmdBcmVhUHJveHkgewogcHVibGljOgotICAgIGV4cGxpY2l0IERyYXdpbmdB cmVhUHJveHlJbXBsKFdlYlBhZ2VQcm94eSYpOworICAgIERyYXdpbmdBcmVhUHJveHlJbXBsKFdl YlBhZ2VQcm94eSYsIFdlYlByb2Nlc3NQcm94eSYpOwogICAgIHZpcnR1YWwgfkRyYXdpbmdBcmVh UHJveHlJbXBsKCk7CiAKICAgICB2b2lkIHBhaW50KEJhY2tpbmdTdG9yZTo6UGxhdGZvcm1HcmFw aGljc0NvbnRleHQsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmLCBXZWJDb3JlOjpSZWdpb24mIHVu cGFpbnRlZFJlZ2lvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdl Q2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKaW5kZXggMDA3 YjI4MTg0ZjM2YWYyYWJiOTVlMzJmZTUwZThmZjkxNWJlZDZkZC4uYmY0ZWIyZGY0OTYyOGM0MWY5 ZmEzMjUwZDcxNThiMzQ1ZDlmZjMyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvUGFnZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VDbGllbnQu aApAQCAtNDksNiArNDksNyBAQAogCiBPQkpDX0NMQVNTIENBTGF5ZXI7CiBPQkpDX0NMQVNTIE5T RmlsZVdyYXBwZXI7CitPQkpDX0NMQVNTIE5TTWVudTsKIE9CSkNfQ0xBU1MgTlNTZXQ7CiBPQkpD X0NMQVNTIFdLRHJhd2luZ1ZpZXc7CiBPQkpDX0NMQVNTIF9XS1JlbW90ZU9iamVjdFJlZ2lzdHJ5 OwpAQCAtMTIyLDYgKzEyMyw3IEBAIGNsYXNzIFdlYkZyYW1lUHJveHk7CiBjbGFzcyBXZWJPcGVu UGFuZWxSZXN1bHRMaXN0ZW5lclByb3h5OwogY2xhc3MgV2ViUGFnZVByb3h5OwogY2xhc3MgV2Vi UG9wdXBNZW51UHJveHk7CitjbGFzcyBXZWJQcm9jZXNzUHJveHk7CiAKIGVudW0gY2xhc3MgQ29u dGludWVVbnNhZmVMb2FkIDogYm9vbCB7IE5vLCBZZXMgfTsKIApAQCAtMTU4LDcgKzE2MCw3IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIH5QYWdlQ2xpZW50KCkgeyB9CiAKICAgICAvLyBDcmVhdGUg YSBuZXcgZHJhd2luZyBhcmVhIHByb3h5IGZvciB0aGUgZ2l2ZW4gcGFnZS4KLSAgICB2aXJ0dWFs IHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBjcmVhdGVEcmF3aW5nQXJlYVByb3h5 KCkgPSAwOworICAgIHZpcnR1YWwgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IGNy ZWF0ZURyYXdpbmdBcmVhUHJveHkoV2ViUHJvY2Vzc1Byb3h5JikgPSAwOwogCiAgICAgLy8gVGVs bCB0aGUgdmlldyB0byBpbnZhbGlkYXRlIHRoZSBnaXZlbiByZWdpb24uIFRoZSByZWdpb24gaXMg aW4gdmlldyBjb29yZGluYXRlcy4KICAgICB2aXJ0dWFsIHZvaWQgc2V0Vmlld05lZWRzRGlzcGxh eShjb25zdCBXZWJDb3JlOjpSZWdpb24mKSA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMTRmYmFjOGQwODA3MGM3 Y2E0YzQxMDdkZmQ5YzQwOGNjZDNkMmU0YwotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmNwcApAQCAtMCwwICsxLDM2NyBAQAor LyoKKyAqIENvcHlyaWdodCAoQykgMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRp c3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdo dAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3Qg cmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRv Y3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0 cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMu IEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElN UExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUg SU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQ QVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBB UFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVD VCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNF UVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVN RU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFU QSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVT RUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFD VCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RI RVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09G VFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFN QUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJQcm92aXNpb25hbFBh Z2VQcm94eS5oIgorCisjaW5jbHVkZSAiQVBJTmF2aWdhdGlvbi5oIgorI2luY2x1ZGUgIkRyYXdp bmdBcmVhUHJveHkuaCIKKyNpbmNsdWRlICJGb3JtRGF0YVJlZmVyZW5jZS5oIgorI2luY2x1ZGUg IkxvZ2dpbmcuaCIKKyNpbmNsdWRlICJQYWdlQ2xpZW50LmgiCisjaW5jbHVkZSAiVVJMU2NoZW1l VGFza1BhcmFtZXRlcnMuaCIKKyNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3QuaCIKKyNpbmNs dWRlICJXZWJCYWNrRm9yd2FyZExpc3RJdGVtLmgiCisjaW5jbHVkZSAiV2ViRXJyb3JzLmgiCisj aW5jbHVkZSAiV2ViTmF2aWdhdGlvbkRhdGFTdG9yZS5oIgorI2luY2x1ZGUgIldlYk5hdmlnYXRp b25TdGF0ZS5oIgorI2luY2x1ZGUgIldlYlBhZ2VNZXNzYWdlcy5oIgorI2luY2x1ZGUgIldlYlBh Z2VQcm94eS5oIgorI2luY2x1ZGUgIldlYlBhZ2VQcm94eU1lc3NhZ2VzLmgiCisjaW5jbHVkZSAi V2ViUHJvY2Vzc01lc3NhZ2VzLmgiCisjaW5jbHVkZSAiV2ViUHJvY2Vzc1Byb3h5LmgiCisjaW5j bHVkZSA8V2ViQ29yZS9TaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQuaD4KKworbmFtZXNwYWNl IFdlYktpdCB7CisKKyNkZWZpbmUgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChjaGFubmVsLCBmbXQs IC4uLikgUkVMRUFTRV9MT0dfSUYobV9wYWdlLmlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpLCBj aGFubmVsLCAiJXAgLSBQcm92aXNpb25hbFBhZ2VQcm94eTo6IiBmbXQsIHRoaXMsICMjX19WQV9B UkdTX18pCisjZGVmaW5lIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoY2hhbm5lbCwgZm10 LCAuLi4pIFJFTEVBU0VfTE9HX0VSUk9SX0lGKG1fcGFnZS5pc0Fsd2F5c09uTG9nZ2luZ0FsbG93 ZWQoKSwgY2hhbm5lbCwgIiVwIC0gUHJvdmlzaW9uYWxQYWdlUHJveHk6OiIgZm10LCB0aGlzLCAj I19fVkFfQVJHU19fKQorCitQcm92aXNpb25hbFBhZ2VQcm94eTo6UHJvdmlzaW9uYWxQYWdlUHJv eHkoV2ViUGFnZVByb3h5JiBwYWdlLCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIHN0 ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+IHN1c3BlbmRlZFBhZ2UsIHVpbnQ2NF90 IG5hdmlnYXRpb25JRCwgYm9vbCBpc1NlcnZlclJlZGlyZWN0LCBjb25zdCBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QmIHJlcXVlc3QsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vz c1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCkKKyAgICA6IG1fcGFnZShwYWdlKQorICAgICwgbV9wcm9j ZXNzKFdURk1vdmUocHJvY2VzcykpCisgICAgLCBtX25hdmlnYXRpb25JRChuYXZpZ2F0aW9uSUQp CisgICAgLCBtX2lzU2VydmVyUmVkaXJlY3QoaXNTZXJ2ZXJSZWRpcmVjdCkKKyAgICAsIG1fcmVx dWVzdChyZXF1ZXN0KQorICAgICwgbV9wcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KHByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAgICAs IG1fc3VzcGVuc2lvblRva2VuKG1fcHJvY2Vzcy0+dGhyb3R0bGVyKCkuZm9yZWdyb3VuZEFjdGl2 aXR5VG9rZW4oKSkKKyNlbmRpZgoreworICAgIG1fcHJvY2Vzcy0+YWRkTWVzc2FnZVJlY2VpdmVy KE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBh Z2VJRCgpLCAqdGhpcyk7CisgICAgbV9wcm9jZXNzLT5hZGRQcm92aXNpb25hbFBhZ2VQcm94eSgq dGhpcyk7CisKKyAgICAvLyBJZiB3ZSBhcmUgcmVhdHRhY2hpbmcgdG8gYSBTdXNwZW5kZWRQYWdl LCB0aGVuIHRoZSBXZWJQcm9jZXNzJyBXZWJQYWdlIGFscmVhZHkgZXhpc3RzIGFuZAorICAgIC8v IFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKCkgd2lsbCBub3QgYmUgY2FsbGVkIHRv IGluaXRpYWxpemUgbV9tYWluRnJhbWUuIEluIHN1Y2gKKyAgICAvLyBjYXNlLCB3ZSBuZWVkIHRv IGluaXRpYWxpemUgbV9tYWluRnJhbWUgdG8gcmVmbGVjdCB0aGUgZmFjdCB0aGUgdGhlIFdlYlBy b2Nlc3MnIFdlYlBhZ2UKKyAgICAvLyBhbHJlYWR5IGV4aXN0cyBhbmQgYWxyZWFkeSBoYXMgYSBt YWluIGZyYW1lLgorICAgIGlmIChzdXNwZW5kZWRQYWdlKSB7CisgICAgICAgIEFTU0VSVCgmc3Vz cGVuZGVkUGFnZS0+cHJvY2VzcygpID09IG1fcHJvY2Vzcy5wdHIoKSk7CisgICAgICAgIHN1c3Bl bmRlZFBhZ2UtPnVuc3VzcGVuZCgpOworICAgICAgICBtX21haW5GcmFtZSA9IFdlYkZyYW1lUHJv eHk6OmNyZWF0ZShtX3BhZ2UsIHN1c3BlbmRlZFBhZ2UtPm1haW5GcmFtZUlEKCkpOworICAgICAg ICBtX3Byb2Nlc3MtPmZyYW1lQ3JlYXRlZChzdXNwZW5kZWRQYWdlLT5tYWluRnJhbWVJRCgpLCAq bV9tYWluRnJhbWUpOworICAgIH0KKworICAgIGluaXRpYWxpemVXZWJQYWdlKCk7Cit9CisKK1By b3Zpc2lvbmFsUGFnZVByb3h5Ojp+UHJvdmlzaW9uYWxQYWdlUHJveHkoKQoreworICAgIG1fcHJv Y2Vzcy0+cmVtb3ZlUHJvdmlzaW9uYWxQYWdlUHJveHkoKnRoaXMpOworCisgICAgaWYgKG1fd2Fz Q29tbWl0dGVkKQorICAgICAgICByZXR1cm47CisKKyAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3Nh Z2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCks IG1fcGFnZS5wYWdlSUQoKSk7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdl OjpDbG9zZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAgUnVuTG9vcDo6bWFpbigpLmRpc3Bh dGNoKFtwcm9jZXNzID0gbV9wcm9jZXNzLmNvcHlSZWYoKV0geworICAgICAgICBwcm9jZXNzLT5t YXliZVNodXREb3duKCk7CisgICAgfSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6 OnByb2Nlc3NEaWRUZXJtaW5hdGUoKQoreworICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9X RUQoUHJvY2Vzc1N3YXBwaW5nLCAicHJvY2Vzc0RpZFRlcm1pbmF0ZTogcGFnZUlEID0gJSIgUFJJ dTY0LCBtX3BhZ2UucGFnZUlEKCkpOworICAgIG1fcGFnZS5wcm92aXNpb25hbFByb2Nlc3NEaWRU ZXJtaW5hdGUoKTsKK30KKworc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IFByb3Zp c2lvbmFsUGFnZVByb3h5Ojp0YWtlRHJhd2luZ0FyZWEoKQoreworICAgIHJldHVybiBXVEZNb3Zl KG1fZHJhd2luZ0FyZWEpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpjYW5jZWwo KQoreworICAgIC8vIElmIHRoZSBwcm92aXNpb25hbCBsb2FkIHN0YXJ0ZWQsIHRoZW4gaW5kaWNh dGUgdGhhdCBpdCBmYWlsZWQgZHVlIHRvIGNhbmNlbGxhdGlvbiBieSBjYWxsaW5nIGRpZEZhaWxQ cm92aXNpb25hbExvYWRGb3JGcmFtZSgpLgorICAgIGlmIChtX3Byb3Zpc2lvbmFsTG9hZFVSTC5p c0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQo UHJvY2Vzc1N3YXBwaW5nLCAiY2FuY2VsOiBTaW11bGF0aW5nIGEgZGlkRmFpbFByb3Zpc2lvbmFs TG9hZEZvckZyYW1lIGZvciBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdlSUQoKSk7Cisg ICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKKyAgICBhdXRvIGVycm9yID0gV2ViS2l0OjpjYW5jZWxs ZWRFcnJvcihtX3JlcXVlc3QpOworICAgIGVycm9yLnNldFR5cGUoV2ViQ29yZTo6UmVzb3VyY2VF cnJvcjo6VHlwZTo6Q2FuY2VsbGF0aW9uKTsKKyAgICBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUobV9tYWluRnJhbWUtPmZyYW1lSUQoKSwgeyB9LCBtX25hdmlnYXRpb25JRCwgbV9wcm92 aXNpb25hbExvYWRVUkwsIGVycm9yLCBVc2VyRGF0YSB7IH0pOyAvLyBXaWxsIGRlbGV0ZSB8dGhp c3wuCit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OnByb2Nlc3NEaWRGaW5pc2hMYXVu Y2hpbmcoKQoreworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAi cHJvY2Vzc0RpZEZpbmlzaExhdW5jaGluZzogcGFnZUlEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFn ZUlEKCkpOworICAgIGZpbmlzaEluaXRpYWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2go KTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZmluaXNoSW5pdGlhbGl6aW5nV2Vi UGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCgpCit7CisgICAgQVNTRVJUKG1fcHJvY2Vzcy0+c3RhdGUo KSA9PSBXZWJQcm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKTsKKworICAgIC8vIEZJWE1FOiBU aGUgV2ViUGFnZVByb3h5IGRlbGF5cyBhZGRpbmcgdGhlIHZpc2l0ZWQgbGluayBzdG9yZSB1bnRp bCBhZnRlciB0aGUgcHJvY2VzcyBoYXMgbGF1bmNoZWQKKyAgICAvLyBzbyB0aGUgUHJvdmlzaW9u YWxQYWdlUHJveHkgZG9lcyB0aGUgc2FtZS4gSG93ZXZlciwgZG8gd2UgcmVhbGx5IG5lZWQgdG8/ CisgICAgbV9wcm9jZXNzLT5hZGRWaXNpdGVkTGlua1N0b3JlKG1fcGFnZS52aXNpdGVkTGlua1N0 b3JlKCkpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojppbml0aWFsaXplV2ViUGFn ZSgpCit7CisgICAgbV9kcmF3aW5nQXJlYSA9IG1fcGFnZS5wYWdlQ2xpZW50KCkuY3JlYXRlRHJh d2luZ0FyZWFQcm94eShtX3Byb2Nlc3MpOworCisgICAgYXV0byBwYXJhbWV0ZXJzID0gbV9wYWdl LmNyZWF0aW9uUGFyYW1ldGVycyhtX3Byb2Nlc3MpOworICAgIHBhcmFtZXRlcnMuaXNQcm9jZXNz U3dhcCA9IHRydWU7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpD cmVhdGVXZWJQYWdlKG1fcGFnZS5wYWdlSUQoKSwgcGFyYW1ldGVycyksIDApOworCisgICAgaWYg KG1fcHJvY2Vzcy0+c3RhdGUoKSA9PSBXZWJQcm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKQor ICAgICAgICBmaW5pc2hJbml0aWFsaXppbmdXZWJQYWdlQWZ0ZXJQcm9jZXNzTGF1bmNoKCk7Cit9 CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmxvYWREYXRhKEFQSTo6TmF2aWdhdGlvbiYg bmF2aWdhdGlvbiwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBkYXRhLCBjb25zdCBTdHJpbmcm IE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkws IEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3 ZWJzaXRlUG9saWNpZXMpCit7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dh cHBpbmcsICJsb2FkRGF0YTogcGFnZUlEID0gJSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCkpOwor CisgICAgbV9wYWdlLmxvYWREYXRhV2l0aE5hdmlnYXRpb25TaGFyZWQobV9wcm9jZXNzLCBuYXZp Z2F0aW9uLCBkYXRhLCBNSU1FVHlwZSwgZW5jb2RpbmcsIGJhc2VVUkwsIHVzZXJEYXRhLCBXZWJD b3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9s aWNpZXMpKTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6bG9hZFJlcXVlc3QoQVBJ OjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiByZXF1 ZXN0LCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5IHNob3VsZE9wZW5FeHRl cm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgT3B0aW9uYWw8V2Vic2l0ZVBv bGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxM T1dFRChQcm9jZXNzU3dhcHBpbmcsICJsb2FkUmVxdWVzdDogcGFnZUlEID0gJSIgUFJJdTY0LCBt X3BhZ2UucGFnZUlEKCkpOworCisgICAgbV9wYWdlLmxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb25T aGFyZWQobV9wcm9jZXNzLCBuYXZpZ2F0aW9uLCBXVEZNb3ZlKHJlcXVlc3QpLCBzaG91bGRPcGVu RXh0ZXJuYWxVUkxzUG9saWN5LCB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRp bnVpbmdMb2FkOjpZZXMsIFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKSk7Cit9CisKK3ZvaWQgUHJv dmlzaW9uYWxQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0oQVBJOjpOYXZpZ2F0aW9uJiBu YXZpZ2F0aW9uLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtJiBpdGVtLCBPcHRpb25hbDxXZWJzaXRl UG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3sKKyAgICBSRUxFQVNFX0xPR19JRl9B TExPV0VEKFByb2Nlc3NTd2FwcGluZywgImdvVG9CYWNrRm9yd2FyZEl0ZW06IHBhZ2VJRCA9ICUi IFBSSXU2NCwgbV9wYWdlLnBhZ2VJRCgpKTsKKworICAgIGF1dG8gaXRlbVN0YXRlcyA9IG1fcGFn ZS5iYWNrRm9yd2FyZExpc3QoKS5maWx0ZXJlZEl0ZW1TdGF0ZXMoW3RoaXMsIHRhcmdldEl0ZW0g PSAmaXRlbV0oYXV0byYgaXRlbSkgeworICAgICAgICBpZiAoYXV0byogcGFnZSA9IGl0ZW0uc3Vz cGVuZGVkUGFnZSgpKSB7CisgICAgICAgICAgICBpZiAoJnBhZ2UtPnByb2Nlc3MoKSA9PSBtX3By b2Nlc3MucHRyKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9Cisg ICAgICAgIHJldHVybiAmaXRlbSAhPSB0YXJnZXRJdGVtOworICAgIH0pOworICAgIG1fcHJvY2Vz cy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6VXBkYXRlQmFja0ZvcndhcmRMaXN0Rm9yUmVhdHRh Y2goV1RGTW92ZShpdGVtU3RhdGVzKSksIG1fcGFnZS5wYWdlSUQoKSk7CisgICAgbV9wcm9jZXNz LT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtKG5hdmlnYXRpb24u bmF2aWdhdGlvbklEKCksIGl0ZW0uaXRlbUlEKCksICpuYXZpZ2F0aW9uLmJhY2tGb3J3YXJkRnJh bWVMb2FkVHlwZSgpLCBXZWJDb3JlOjpTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6Olllcywg V1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKyAgICBtX3Byb2Nl c3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS5zdGFydCgpOworfQorCit2b2lkIFByb3Zpc2lvbmFs UGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUodWludDY0X3QgZnJhbWVJRCkKK3sKKyAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZENyZWF0ZU1haW5GcmFt ZTogcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5wYWdl SUQoKSwgZnJhbWVJRCk7CisgICAgQVNTRVJUKCFtX21haW5GcmFtZSk7CisKKyAgICBtX21haW5G cmFtZSA9IFdlYkZyYW1lUHJveHk6OmNyZWF0ZShtX3BhZ2UsIGZyYW1lSUQpOworCisgICAgLy8g QWRkIHRoZSBmcmFtZSB0byB0aGUgcHJvY2VzcyB3aWRlIG1hcC4KKyAgICBtX3Byb2Nlc3MtPmZy YW1lQ3JlYXRlZChmcmFtZUlELCAqbV9tYWluRnJhbWUpOworCisgICAgLy8gVGhpcyBuYXZpZ2F0 aW9uIHdhcyBkZXN0cm95ZWQgc28gbm8gbmVlZCB0byBub3RpZnkgb2YgcmVkaXJlY3QuCisgICAg aWYgKCFtX3BhZ2UubmF2aWdhdGlvblN0YXRlKCkuaGFzTmF2aWdhdGlvbihtX25hdmlnYXRpb25J RCkpCisgICAgICAgIHJldHVybjsKKworICAgIC8vIFJlc3RvcmUgdGhlIG1haW4gZnJhbWUncyBj b21taXR0ZWQgVVJMIGFzIHNvbWUgY2xpZW50cyBtYXkgcmVseSBvbiBpdCB1bnRpbCB0aGUgbmV4 dCBsb2FkIGlzIGNvbW1pdHRlZC4KKyAgICBpZiAoYXV0byogbWFpbkZyYW1lID0gbV9wYWdlLm1h aW5GcmFtZSgpKQorICAgICAgICBtX21haW5GcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5zZXRVUkwo bWFpbkZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLnVybCgpKTsKKworICAgIC8vIE5vcm1hbGx5LCBu b3RpZmljYXRpb24gb2YgYSBzZXJ2ZXIgcmVkaXJlY3QgY29tZXMgZnJvbSB0aGUgV2ViQ29udGVu dCBwcm9jZXNzLgorICAgIC8vIElmIHdlIGFyZSBwcm9jZXNzIHN3YXBwaW5nIGluIHJlc3BvbnNl IHRvIGEgc2VydmVyIHJlZGlyZWN0IHRoZW4gdGhhdCBub3RpZmljYXRpb24gd2lsbCBub3QgY29t ZSBmcm9tIHRoZSBuZXcgV2ViQ29udGVudCBwcm9jZXNzLgorICAgIC8vIEluIHRoaXMgY2FzZSB3 ZSBoYXZlIHRoZSBVSVByb2Nlc3Mgc3ludGhlc2l6ZSB0aGUgcmVkaXJlY3Qgbm90aWZpY2F0aW9u IGF0IHRoZSBhcHByb3ByaWF0ZSB0aW1lLgorICAgIGlmIChtX2lzU2VydmVyUmVkaXJlY3QpIHsK KyAgICAgICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0YXRlKCkuZGlkU3RhcnRQcm92aXNpb25h bExvYWQobV9yZXF1ZXN0LnVybCgpKTsKKyAgICAgICAgbV9wYWdlLmRpZFJlY2VpdmVTZXJ2ZXJS ZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKG1fcHJvY2VzcywgbV9tYWlu RnJhbWUtPmZyYW1lSUQoKSwgbV9uYXZpZ2F0aW9uSUQsIFdURk1vdmUobV9yZXF1ZXN0KSwgeyB9 KTsKKyAgICB9Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFBlcmZvcm1DbGll bnRSZWRpcmVjdChjb25zdCBTdHJpbmcmIHNvdXJjZVVSTFN0cmluZywgY29uc3QgU3RyaW5nJiBk ZXN0aW5hdGlvblVSTFN0cmluZywgdWludDY0X3QgZnJhbWVJRCkKK3sKKyAgICBtX3BhZ2UuZGlk UGVyZm9ybUNsaWVudFJlZGlyZWN0U2hhcmVkKG1fcHJvY2Vzcywgc291cmNlVVJMU3RyaW5nLCBk ZXN0aW5hdGlvblVSTFN0cmluZywgZnJhbWVJRCk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdl UHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwg dWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJiB1cmwsIFVSTCYmIHVucmVhY2hhYmxlVVJMLCBj b25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCit7CisgICAgLy8gSWYgdGhlIHByZXZpb3VzIHByb3Zp c2lvbmFsIGxvYWQgdXNlZCB0aGUgc2FtZSBwcm9jZXNzLCB3ZSBtYXkgcmVjZWl2ZSBJUEMgZm9y IHRoaXMgcHJldmlvdXMgcHJvdmlzaW9uYWwncyBtYWluIGZyYW1lIHRoYXQgd2UgbmVlZCB0byBp Z25vcmUuCisgICAgaWYgKCFtX21haW5GcmFtZSB8fCBtX21haW5GcmFtZS0+ZnJhbWVJRCgpICE9 IGZyYW1lSUQpCisgICAgICAgIHJldHVybjsKKworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQo UHJvY2Vzc1N3YXBwaW5nLCAiZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTogcGFnZUlE ID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEID0gJSIg UFJJdTY0LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCk7CisgICAgQVNT RVJUKG1fcHJvdmlzaW9uYWxMb2FkVVJMLmlzTnVsbCgpKTsKKyAgICBtX3Byb3Zpc2lvbmFsTG9h ZFVSTCA9IHVybDsKKworICAgIC8vIE1lcmVseSBmb2xsb3dpbmcgYSBzZXJ2ZXIgc2lkZSByZWRp cmVjdCBzbyB0aGVyZSBpcyBubyBuZWVkIHRvIHNlbmQgYSBkaWRTdGFydFByb3Zpc2lvbmFsTG9h ZCBhZ2Fpbi4KKyAgICBpZiAobV9pc1NlcnZlclJlZGlyZWN0KQorICAgICAgICByZXR1cm47CisK KyAgICAvLyBDbGllbnRzIGV4cGVjdCB0aGUgUGFnZSdzIG1haW4gZnJhbWUncyBleHBlY3RlZFVS TCB0byBiZSB0aGUgcHJvdmlzaW9uYWwgb25lIHdoZW4gYSBwcm92aXNpb25hbCBsb2FkIGlzIHN0 YXJ0ZWQuCisgICAgaWYgKGF1dG8qIHBhZ2VNYWluRnJhbWUgPSBtX3BhZ2UubWFpbkZyYW1lKCkp CisgICAgICAgIHBhZ2VNYWluRnJhbWUtPmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKHVybCk7CisK KyAgICBtX3BhZ2UuZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZVNoYXJlZChtX3Byb2Nl c3MsIGZyYW1lSUQsIG5hdmlnYXRpb25JRCwgV1RGTW92ZSh1cmwpLCBXVEZNb3ZlKHVucmVhY2hh YmxlVVJMKSwgdXNlckRhdGEpOworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRG YWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29y ZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZp Z2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFdlYkNvcmU6OlJl c291cmNlRXJyb3ImIGVycm9yLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCit7CisgICAgUkVM RUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJkaWRGYWlsUHJvdmlz aW9uYWxMb2FkRm9yRnJhbWU6IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJ dTY0ICIsIG5hdmlnYXRpb25JRCA9ICUiIFBSSXU2NCwgbV9wYWdlLnBhZ2VJRCgpLCBmcmFtZUlE LCBuYXZpZ2F0aW9uSUQpOworICAgIG1fcHJvdmlzaW9uYWxMb2FkVVJMID0geyB9OworCisgICAg Ly8gTWFrZSBzdXJlIHRoZSBQYWdlJ3MgbWFpbiBmcmFtZSdzIGV4cGVjdGVkVVJMIGdldHMgY2xl YXJlZCBzaW5jZSB3ZSB1cGRhdGVkIGl0IGluIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkLgorICAg IGlmIChhdXRvKiBwYWdlTWFpbkZyYW1lID0gbV9wYWdlLm1haW5GcmFtZSgpKQorICAgICAgICBw YWdlTWFpbkZyYW1lLT5kaWRGYWlsUHJvdmlzaW9uYWxMb2FkKCk7CisKKyAgICBtX3BhZ2UuZGlk RmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKG1fcHJvY2VzcywgZnJhbWVJRCwgZnJh bWVTZWN1cml0eU9yaWdpbiwgbmF2aWdhdGlvbklELCBwcm92aXNpb25hbFVSTCwgZXJyb3IsIHVz ZXJEYXRhKTsgLy8gV2lsbCBkZWxldGUgfHRoaXN8LgorfQorCit2b2lkIFByb3Zpc2lvbmFsUGFn ZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3Qg bmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9t Q29udGVudFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpD ZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5mbywgYm9vbCBjb250YWluc1BsdWdpbkRvY3Vt ZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+IGZvcmNlZEhhc0luc2Vj dXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAgIC8vIElmIHRoZSBw cmV2aW91cyBwcm92aXNpb25hbCBsb2FkIHVzZWQgdGhlIHNhbWUgcHJvY2Vzcywgd2UgbWF5IHJl Y2VpdmUgSVBDIGZvciB0aGlzIHByZXZpb3VzIHByb3Zpc2lvbmFsJ3MgbWFpbiBmcmFtZSB0aGF0 IHdlIG5lZWQgdG8gaWdub3JlLgorICAgIGlmICghbV9tYWluRnJhbWUgfHwgbV9tYWluRnJhbWUt PmZyYW1lSUQoKSAhPSBmcmFtZUlEKQorICAgICAgICByZXR1cm47CisKKyAgICBSRUxFQVNFX0xP R19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZENvbW1pdExvYWRGb3JGcmFtZTogcGFn ZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEID0g JSIgUFJJdTY0LCBtX3BhZ2UucGFnZUlEKCksIGZyYW1lSUQsIG5hdmlnYXRpb25JRCk7CisgICAg bV9wcm92aXNpb25hbExvYWRVUkwgPSB7IH07CisgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdl UmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBt X3BhZ2UucGFnZUlEKCkpOworCisgICAgbV93YXNDb21taXR0ZWQgPSB0cnVlOworICAgIG1fcGFn ZS5jb21taXRQcm92aXNpb25hbFBhZ2UoZnJhbWVJRCwgbmF2aWdhdGlvbklELCBtaW1lVHlwZSwg ZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIGZyYW1lTG9hZFR5cGUsIGNlcnRpZmljYXRl SW5mbywgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCB1 c2VyRGF0YSk7IC8vIFdpbGwgZGVsZXRlIHx0aGlzfC4KK30KKwordm9pZCBQcm92aXNpb25hbFBh Z2VQcm94eTo6ZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGEoY29uc3QgV2ViTmF2aWdhdGlv bkRhdGFTdG9yZSYgc3RvcmUsIHVpbnQ2NF90IGZyYW1lSUQpCit7CisgICAgbV9wYWdlLmRpZE5h dmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhU2hhcmVkKG1fcHJvY2Vzcywgc3RvcmUsIGZyYW1lSUQp OworfQorCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDaGFuZ2VQcm92aXNpb25hbFVS TEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYg dXJsKQoreworICAgIG1fcGFnZS5kaWRDaGFuZ2VQcm92aXNpb25hbFVSTEZvckZyYW1lU2hhcmVk KG1fcHJvY2VzcywgZnJhbWVJRCwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKHVybCkpOworfQorCit2 b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9u QXN5bmModWludDY0X3QgZnJhbWVJRCwgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiYgZnJh bWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBOYXZpZ2F0aW9uQWN0aW9u RGF0YSYmIG5hdmlnYXRpb25BY3Rpb25EYXRhLCBGcmFtZUluZm9EYXRhJiYgZnJhbWVJbmZvRGF0 YSwgdWludDY0X3Qgb3JpZ2luYXRpbmdQYWdlSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdCYgb3JpZ2luYWxSZXF1ZXN0LCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0 LCBJUEM6OkZvcm1EYXRhUmVmZXJlbmNlJiYgcmVxdWVzdEJvZHksIFdlYkNvcmU6OlJlc291cmNl UmVzcG9uc2UmJiByZWRpcmVjdFJlc3BvbnNlLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEsIHVp bnQ2NF90IGxpc3RlbmVySUQpCit7CisgICAgbV9wYWdlLmRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb25Bc3luY1NoYXJlZChtX3Byb2Nlc3MsIGZyYW1lSUQsIFdURk1vdmUoZnJhbWVTZWN1 cml0eU9yaWdpbiksIG5hdmlnYXRpb25JRCwgV1RGTW92ZShuYXZpZ2F0aW9uQWN0aW9uRGF0YSks IFdURk1vdmUoZnJhbWVJbmZvRGF0YSksIG9yaWdpbmF0aW5nUGFnZUlELCBvcmlnaW5hbFJlcXVl c3QsIFdURk1vdmUocmVxdWVzdCksIFdURk1vdmUocmVxdWVzdEJvZHkpLCBXVEZNb3ZlKHJlZGly ZWN0UmVzcG9uc2UpLCB1c2VyRGF0YSwgbGlzdGVuZXJJRCk7Cit9CisKK3ZvaWQgUHJvdmlzaW9u YWxQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlKHVpbnQ2NF90IGZyYW1lSUQsIGNv bnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWlu dDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiByZXNw b25zZSwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBib29sIGNhblNo b3dNSU1FVHlwZSwgdWludDY0X3QgbGlzdGVuZXJJRCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRh KQoreworICAgIG1fcGFnZS5kZWNpZGVQb2xpY3lGb3JSZXNwb25zZVNoYXJlZChtX3Byb2Nlc3Ms IGZyYW1lSUQsIGZyYW1lU2VjdXJpdHlPcmlnaW4sIG5hdmlnYXRpb25JRCwgcmVzcG9uc2UsIHJl cXVlc3QsIGNhblNob3dNSU1FVHlwZSwgbGlzdGVuZXJJRCwgdXNlckRhdGEpOworfQorCit2b2lk IFByb3Zpc2lvbmFsUGFnZVByb3h5OjpzdGFydFVSTFNjaGVtZVRhc2soVVJMU2NoZW1lVGFza1Bh cmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQoreworICAgIG1fcGFnZS5zdGFydFVSTFNjaGVtZVRhc2tT aGFyZWQobV9wcm9jZXNzLCBXVEZNb3ZlKHBhcmFtZXRlcnMpKTsKK30KKwordm9pZCBQcm92aXNp b25hbFBhZ2VQcm94eTo6YmFja0ZvcndhcmRHb1RvSXRlbShjb25zdCBXZWJDb3JlOjpCYWNrRm9y d2FyZEl0ZW1JZGVudGlmaWVyJiBpZGVudGlmaWVyLCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUm IGhhbmRsZSkKK3sKKyAgICBtX3BhZ2UuYmFja0ZvcndhcmRHb1RvSXRlbVNoYXJlZChtX3Byb2Nl c3MsIGlkZW50aWZpZXIsIGhhbmRsZSk7Cit9CisKK3ZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6 OmRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgSVBDOjpEZWNv ZGVyJiBkZWNvZGVyKQoreworICAgIEFTU0VSVChkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUo KSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpOworCisg ICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpE aWRTdGFydFByb2dyZXNzOjpuYW1lKCkKKyAgICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgp ID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENoYW5nZVByb2dyZXNzOjpuYW1lKCkKKyAg ICAgICAgfHwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 OkJhY2tGb3J3YXJkQWRkSXRlbTo6bmFtZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5h bWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpMb2dEaWFnbm9zdGljTWVzc2FnZTo6bmFt ZSgpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjpMb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhFbmhhbmNlZFByaXZhY3k6Om5hbWUoKQor ICAgICAgICB8fCBkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6U2V0TmV0d29ya1JlcXVlc3RzSW5Qcm9ncmVzczo6bmFtZSgpCisjaWYgUExBVEZPUk0oQ09D T0EpCisgICAgICAgIHx8IGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjpSZWdpc3RlcldlYlByb2Nlc3NBY2Nlc3NpYmlsaXR5VG9rZW46Om5hbWUoKQorI2Vu ZGlmCisgICAgICAgICkKKyAgICB7CisgICAgICAgIG1fcGFnZS5kaWRSZWNlaXZlTWVzc2FnZShj b25uZWN0aW9uLCBkZWNvZGVyKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChk ZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U3RhcnRVUkxT Y2hlbWVUYXNrOjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OlN0YXJ0VVJMU2NoZW1lVGFzaz4oZGVjb2RlciwgdGhpcywgJlByb3Zp c2lvbmFsUGFnZVByb3h5OjpzdGFydFVSTFNjaGVtZVRhc2spOworICAgICAgICByZXR1cm47Cisg ICAgfQorCisgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjpEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmM6Om5hbWUoKSkgewor ICAgICAgICBJUEM6OmhhbmRsZU1lc3NhZ2U8TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGVjaWRl UG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkFzeW5jPihkZWNvZGVyLCB0aGlzLCAmUHJvdmlzaW9u YWxQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Bc3luYyk7CisgICAg ICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRlY2lkZVBvbGljeUZvclJlc3BvbnNlOjpuYW1lKCkpIHsK KyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRlY2lk ZVBvbGljeUZvclJlc3BvbnNlPihkZWNvZGVyLCB0aGlzLCAmUHJvdmlzaW9uYWxQYWdlUHJveHk6 OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAg IGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlk Q2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFu ZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDaGFuZ2VQcm92aXNpb25hbFVS TEZvckZyYW1lPihkZWNvZGVyLCB0aGlzLCAmUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZENoYW5n ZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAg aWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRO YXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxl TWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9u RGF0YT4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWROYXZpZ2F0ZVdp dGhOYXZpZ2F0aW9uRGF0YSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVj b2Rlci5tZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFBlcmZvcm1D bGllbnRSZWRpcmVjdDo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpEaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3Q+KGRlY29kZXIsIHRo aXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0KTsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VOYW1lKCkgPT0g TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ3JlYXRlTWFpbkZyYW1lOjpuYW1lKCkpIHsKKyAg ICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENyZWF0 ZU1haW5GcmFtZT4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVh dGVNYWluRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGRlY29kZXIu bWVzc2FnZU5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRTdGFydFByb3Zpc2lv bmFsTG9hZEZvckZyYW1lOjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU+KGRl Y29kZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExv YWRGb3JGcmFtZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGVjb2Rlci5t ZXNzYWdlTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZEZhaWxQcm92aXNpb25h bExvYWRGb3JGcmFtZTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZTxNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpEaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU+KGRlY29k ZXIsIHRoaXMsICZQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkZWNvZGVyLm1lc3Nh Z2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ29tbWl0TG9hZEZvckZyYW1l OjpuYW1lKCkpIHsKKyAgICAgICAgSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OkRpZENvbW1pdExvYWRGb3JGcmFtZT4oZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFs UGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAg fQorCisgICAgTE9HKFByb2Nlc3NTd2FwcGluZywgIlVuaGFuZGxlZCBtZXNzYWdlICVzOjolcyBm cm9tIHByb3Zpc2lvbmFsIHByb2Nlc3MiLCBkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKS50 b1N0cmluZygpLmRhdGEoKSwgZGVjb2Rlci5tZXNzYWdlTmFtZSgpLnRvU3RyaW5nKCkuZGF0YSgp KTsKK30KKwordm9pZCBQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdl KElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBzdGQ6 OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVyPiYgcmVwbHlFbmNvZGVyKQoreworICAgIGlmIChkZWNv ZGVyLm1lc3NhZ2VOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6QmFja0ZvcndhcmRH b1RvSXRlbTo6bmFtZSgpKSB7CisgICAgICAgIElQQzo6aGFuZGxlTWVzc2FnZUxlZ2FjeVN5bmM8 TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6QmFja0ZvcndhcmRHb1RvSXRlbT4oZGVjb2RlciwgKnJl cGx5RW5jb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpiYWNrRm9yd2FyZEdvVG9J dGVtKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIG1fcGFnZS5kaWRSZWNlaXZlU3lu Y01lc3NhZ2UoY29ubmVjdGlvbiwgZGVjb2RlciwgcmVwbHlFbmNvZGVyKTsKK30KKworfSAvLyBu YW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92 aXNpb25hbFBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQ YWdlUHJveHkuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kZDE1MTllMDVhMzAxZGRkZTViNDk0MzQ5Y2JmYmZlMGRk ZTA3NzJhCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlz aW9uYWxQYWdlUHJveHkuaApAQCAtMCwwICsxLDEwMyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykg MjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRp b24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Cisg KiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNl IGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4g UmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBj b3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBm b2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90 aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJ UyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JT IGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9G IE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NF IEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05U UklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5U QUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRF IEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVT SU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkg T0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwg T1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJ TiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNF RCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNwcmFnbWEg b25jZQorCisjaW5jbHVkZSAiTWVzc2FnZVJlY2VpdmVyLmgiCisjaW5jbHVkZSA8d3RmL1dlYWtQ dHIuaD4KKworbmFtZXNwYWNlIFdlYkNvcmUgeworY2xhc3MgUmVzb3VyY2VSZXF1ZXN0OworfQor CituYW1lc3BhY2UgV2ViS2l0IHsKKworY2xhc3MgRHJhd2luZ0FyZWFQcm94eTsKK2NsYXNzIFN1 c3BlbmRlZFBhZ2VQcm94eTsKK2NsYXNzIFdlYkZyYW1lUHJveHk7CitzdHJ1Y3QgV2ViTmF2aWdh dGlvbkRhdGFTdG9yZTsKK2NsYXNzIFdlYlBhZ2VQcm94eTsKK2NsYXNzIFdlYlByb2Nlc3NQcm94 eTsKKworY2xhc3MgUHJvdmlzaW9uYWxQYWdlUHJveHkgOiBwdWJsaWMgSVBDOjpNZXNzYWdlUmVj ZWl2ZXIsIHB1YmxpYyBDYW5NYWtlV2Vha1B0cjxQcm92aXNpb25hbFBhZ2VQcm94eT4geworICAg IFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOworcHVibGljOgorICAgIFByb3Zpc2lvbmFsUGFnZVBy b3h5KFdlYlBhZ2VQcm94eSYsIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYsIHN0ZDo6dW5pcXVlX3B0 cjxTdXNwZW5kZWRQYWdlUHJveHk+LCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGJvb2wgaXNTZXJ2 ZXJSZWRpcmVjdCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgUHJvY2Vzc1N3YXBS ZXF1ZXN0ZWRCeUNsaWVudCk7CisgICAgflByb3Zpc2lvbmFsUGFnZVByb3h5KCk7CisKKyAgICBX ZWJQYWdlUHJveHkmIHBhZ2UoKSB7IHJldHVybiBtX3BhZ2U7IH0KKyAgICBXZWJGcmFtZVByb3h5 KiBtYWluRnJhbWUoKSBjb25zdCB7IHJldHVybiBtX21haW5GcmFtZS5nZXQoKTsgfQorICAgIFdl YlByb2Nlc3NQcm94eSYgcHJvY2VzcygpIHsgcmV0dXJuIG1fcHJvY2Vzcy5nZXQoKTsgfQorICAg IFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVu dCgpIGNvbnN0IHsgcmV0dXJuIG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDsgfQorICAg IHVpbnQ2NF90IG5hdmlnYXRpb25JRCgpIGNvbnN0IHsgcmV0dXJuIG1fbmF2aWdhdGlvbklEOyB9 CisKKyAgICBEcmF3aW5nQXJlYVByb3h5KiBkcmF3aW5nQXJlYSgpIGNvbnN0IHsgcmV0dXJuIG1f ZHJhd2luZ0FyZWEuZ2V0KCk7IH0KKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94 eT4gdGFrZURyYXdpbmdBcmVhKCk7CisKKyAgICB2b2lkIGxvYWREYXRhKEFQSTo6TmF2aWdhdGlv biYsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNv bnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpPYmplY3Qq IHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0 KTsKKyAgICB2b2lkIGxvYWRSZXF1ZXN0KEFQSTo6TmF2aWdhdGlvbiYsIFdlYkNvcmU6OlJlc291 cmNlUmVxdWVzdCYmLCBXZWJDb3JlOjpTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6 Ok9iamVjdCogdXNlckRhdGEsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgPSBXVEY6 Om51bGxvcHQpOworICAgIHZvaWQgZ29Ub0JhY2tGb3J3YXJkSXRlbShBUEk6Ok5hdmlnYXRpb24m LCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtJiwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4m Jik7CisgICAgdm9pZCBjYW5jZWwoKTsKKworICAgIHZvaWQgcHJvY2Vzc0RpZEZpbmlzaExhdW5j aGluZygpOworICAgIHZvaWQgcHJvY2Vzc0RpZFRlcm1pbmF0ZSgpOworCitwcml2YXRlOgorICAg IC8vIElQQzo6TWVzc2FnZVJlY2VpdmVyCisgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6 OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImKSBmaW5hbDsKKyAgICB2b2lkIGRpZFJlY2VpdmVT eW5jTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImLCBzdGQ6OnVuaXF1ZV9w dHI8SVBDOjpFbmNvZGVyPiYpIGZpbmFsOworCisgICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uQXN5bmModWludDY0X3QgZnJhbWVJRCwgV2ViQ29yZTo6U2VjdXJpdHlPcmln aW5EYXRhJiYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBOYXZp Z2F0aW9uQWN0aW9uRGF0YSYmLCBGcmFtZUluZm9EYXRhJiYsIHVpbnQ2NF90IG9yaWdpbmF0aW5n UGFnZUlELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVxdWVzdCwg V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIElQQzo6Rm9ybURhdGFSZWZlcmVuY2UmJiByZXF1 ZXN0Qm9keSwgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYmIHJlZGlyZWN0UmVzcG9uc2UsIGNv bnN0IFVzZXJEYXRhJiwgdWludDY0X3QgbGlzdGVuZXJJRCk7CisgICAgdm9pZCBkZWNpZGVQb2xp Y3lGb3JSZXNwb25zZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9y aWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdCYsIGJvb2wgY2FuU2hvd01JTUVUeXBlLCB1aW50NjRfdCBsaXN0ZW5lcklELCBjb25zdCBV c2VyRGF0YSYpOworICAgIHZvaWQgZGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZSh1aW50 NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmKTsKKyAgICB2b2lkIGRp ZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhKGNvbnN0IFdlYk5hdmlnYXRpb25EYXRhU3RvcmUm LCB1aW50NjRfdCBmcmFtZUlEKTsKKyAgICB2b2lkIGRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdChj b25zdCBTdHJpbmcmIHNvdXJjZVVSTFN0cmluZywgY29uc3QgU3RyaW5nJiBkZXN0aW5hdGlvblVS TFN0cmluZywgdWludDY0X3QgZnJhbWVJRCk7CisgICAgdm9pZCBkaWRDcmVhdGVNYWluRnJhbWUo dWludDY0X3QgZnJhbWVJRCk7CisgICAgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgVVJMJiYsIFVSTCYm IHVucmVhY2hhYmxlVVJMLCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkQ29tbWl0TG9h ZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3Qg U3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWlu dDMyX3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiwgYm9v bCBjb250YWluc1BsdWdpbkRvY3VtZW50LCBPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNv bnRlbnQ+IGZvcmNlZEhhc0luc2VjdXJlQ29udGVudCwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2 b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25z dCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2 NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2Vi Q29yZTo6UmVzb3VyY2VFcnJvciYsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBzdGFydFVS TFNjaGVtZVRhc2soVVJMU2NoZW1lVGFza1BhcmFtZXRlcnMmJik7CisgICAgdm9pZCBiYWNrRm9y d2FyZEdvVG9JdGVtKGNvbnN0IFdlYkNvcmU6OkJhY2tGb3J3YXJkSXRlbUlkZW50aWZpZXImLCBT YW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUmKTsKKworICAgIHZvaWQgaW5pdGlhbGl6ZVdlYlBhZ2Uo KTsKKyAgICB2b2lkIGZpbmlzaEluaXRpYWxpemluZ1dlYlBhZ2VBZnRlclByb2Nlc3NMYXVuY2go KTsKKworICAgIFdlYlBhZ2VQcm94eSYgbV9wYWdlOworICAgIFJlZjxXZWJQcm9jZXNzUHJveHk+ IG1fcHJvY2VzczsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gbV9kcmF3 aW5nQXJlYTsKKyAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9tYWluRnJhbWU7CisgICAgdWlu dDY0X3QgbV9uYXZpZ2F0aW9uSUQ7CisgICAgYm9vbCBtX2lzU2VydmVyUmVkaXJlY3Q7CisgICAg V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IG1fcmVxdWVzdDsKKyAgICBQcm9jZXNzU3dhcFJlcXVl c3RlZEJ5Q2xpZW50IG1fcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDsKKyAgICBib29sIG1f d2FzQ29tbWl0dGVkIHsgZmFsc2UgfTsKKyAgICBVUkwgbV9wcm92aXNpb25hbExvYWRVUkw7CisK KyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIFByb2Nlc3NUaHJvdHRsZXI6OkZvcmVncm91 bmRBY3Rpdml0eVRva2VuIG1fc3VzcGVuc2lvblRva2VuOworI2VuZGlmCit9OworCit9IC8vIG5h bWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90 ZUxheWVyVHJlZS9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5LmggYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQ cm94eS5oCmluZGV4IDMyZjI4ODY0ZmNhMTBkNThkM2YyYzBlMTE2NTZkYWFhNWVlZTkzMTguLmY5 NGFkM2Y4NmE3NjkzM2M2MTExMjJiOGU4ODZiODVmMWIxMmJjZTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllclRyZWVEcmF3aW5n QXJlYVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVl L1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHkuaApAQCAtNDAsNyArNDAsNyBAQCBjbGFz cyBSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclRyYW5zYWN0aW9uOwogCiBjbGFzcyBSZW1vdGVM YXllclRyZWVEcmF3aW5nQXJlYVByb3h5IGZpbmFsIDogcHVibGljIERyYXdpbmdBcmVhUHJveHkg ewogcHVibGljOgotICAgIGV4cGxpY2l0IFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHko V2ViUGFnZVByb3h5Jik7CisgICAgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eShXZWJQ YWdlUHJveHkmLCBXZWJQcm9jZXNzUHJveHkmKTsKICAgICB2aXJ0dWFsIH5SZW1vdGVMYXllclRy ZWVEcmF3aW5nQXJlYVByb3h5KCk7CiAKICAgICBjb25zdCBSZW1vdGVMYXllclRyZWVIb3N0JiBy ZW1vdGVMYXllclRyZWVIb3N0KCkgY29uc3QgeyByZXR1cm4gKm1fcmVtb3RlTGF5ZXJUcmVlSG9z dDsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVl L1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHkubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tbQpp bmRleCAzNTk0NmJiM2RjN2M5MWU2NmMwY2Y3ODU2NzMyMzQ2MDA4YmEwNjc4Li5hMzgwYTUwM2Fl OWRhM2I5NmUzZWU4NjcxYzc4NGJhODQ4ZDkxYTE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94 eS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3Rl TGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tbQpAQCAtMTA1LDggKzEwNSw4IEBAIG5hbWVzcGFj ZSBXZWJLaXQgewogdXNpbmcgbmFtZXNwYWNlIElQQzsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3Jl OwogCi1SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5OjpSZW1vdGVMYXllclRyZWVEcmF3 aW5nQXJlYVByb3h5KFdlYlBhZ2VQcm94eSYgd2ViUGFnZVByb3h5KQotICAgIDogRHJhd2luZ0Fy ZWFQcm94eShEcmF3aW5nQXJlYVR5cGVSZW1vdGVMYXllclRyZWUsIHdlYlBhZ2VQcm94eSkKK1Jl bW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVh UHJveHkoV2ViUGFnZVByb3h5JiB3ZWJQYWdlUHJveHksIFdlYlByb2Nlc3NQcm94eSYgcHJvY2Vz cykKKyAgICA6IERyYXdpbmdBcmVhUHJveHkoRHJhd2luZ0FyZWFUeXBlUmVtb3RlTGF5ZXJUcmVl LCB3ZWJQYWdlUHJveHksIHByb2Nlc3MpCiAgICAgLCBtX3JlbW90ZUxheWVyVHJlZUhvc3Qoc3Rk OjptYWtlX3VuaXF1ZTxSZW1vdGVMYXllclRyZWVIb3N0PigqdGhpcykpCiB7CiAjaWYgSEFWRShJ T1NVUkZBQ0UpCkBAIC0xMTUsNyArMTE1LDcgQEAgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQ cm94eTo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eShXZWJQYWdlUHJveHkmIHcKICAg ICBJT1N1cmZhY2VQb29sOjpzaGFyZWRQb29sKCkuc2V0UG9vbFNpemUoMCk7CiAjZW5kaWYKIAot ICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6 OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwg bV93ZWJQYWdlUHJveHkucGFnZUlEKCksICp0aGlzKTsKKyAgICBwcm9jZXNzLmFkZE1lc3NhZ2VS ZWNlaXZlcihNZXNzYWdlczo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6bWVzc2Fn ZVJlY2VpdmVyTmFtZSgpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSwgKnRoaXMpOwogCiAgICAg aWYgKG1fd2ViUGFnZVByb3h5LnByZWZlcmVuY2VzKCkudGlsZWRTY3JvbGxpbmdJbmRpY2F0b3JW aXNpYmxlKCkpCiAgICAgICAgIGluaXRpYWxpemVEZWJ1Z0luZGljYXRvcigpOwpAQCAtMTI0LDcg KzEyNCw3IEBAIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6OlJlbW90ZUxheWVyVHJl ZURyYXdpbmdBcmVhUHJveHkoV2ViUGFnZVByb3h5JiB3CiBSZW1vdGVMYXllclRyZWVEcmF3aW5n QXJlYVByb3h5Ojp+UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eSgpCiB7CiAgICAgbV9j YWxsYmFja3MuaW52YWxpZGF0ZShDYWxsYmFja0Jhc2U6OkVycm9yOjpPd25lcldhc0ludmFsaWRh dGVkKTsKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkucmVtb3ZlTWVzc2FnZVJlY2VpdmVy KE1lc3NhZ2VzOjpSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5OjptZXNzYWdlUmVjZWl2 ZXJOYW1lKCksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKKyAgICBwcm9jZXNzKCkucmVtb3Zl TWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5 OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKIAogI2lm IFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgW21fZGlzcGxheUxpbmtIYW5kbGVyIGludmFsaWRh dGVdOwpAQCAtMTYxLDcgKzE2MSw3IEBAIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQ cm94eTo6c2l6ZURpZENoYW5nZSgpCiAKIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQ cm94eTo6ZGV2aWNlU2NhbGVGYWN0b3JEaWRDaGFuZ2UoKQogewotICAgIG1fd2ViUGFnZVByb3h5 LnByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6U2V0RGV2aWNlU2NhbGVGYWN0 b3IobV93ZWJQYWdlUHJveHkuZGV2aWNlU2NhbGVGYWN0b3IoKSksIG1fd2ViUGFnZVByb3h5LnBh Z2VJRCgpKTsKKyAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6OlNldERl dmljZVNjYWxlRmFjdG9yKG1fd2ViUGFnZVByb3h5LmRldmljZVNjYWxlRmFjdG9yKCkpLCBtX3dl YlBhZ2VQcm94eS5wYWdlSUQoKSk7CiB9CiAKIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0Fy ZWFQcm94eTo6ZGlkVXBkYXRlR2VvbWV0cnkoKQpAQCAtMTc5LDcgKzE3OSw3IEBAIHZvaWQgUmVt b3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6ZGlkVXBkYXRlR2VvbWV0cnkoKQogdm9pZCBS ZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5OjpzZW5kVXBkYXRlR2VvbWV0cnkoKQogewog ICAgIG1fbGFzdFNlbnRTaXplID0gbV9zaXplOwotICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3Mo KS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6VXBkYXRlR2VvbWV0cnkobV9zaXplLCBmYWxz ZSAvKiBmbHVzaFN5bmNocm9ub3VzbHkgKi8sIE1hY2hTZW5kUmlnaHQoKSksIG1fd2ViUGFnZVBy b3h5LnBhZ2VJRCgpKTsKKyAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6 OlVwZGF0ZUdlb21ldHJ5KG1fc2l6ZSwgZmFsc2UgLyogZmx1c2hTeW5jaHJvbm91c2x5ICovLCBN YWNoU2VuZFJpZ2h0KCkpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CiAgICAgbV9pc1dhaXRp bmdGb3JEaWRVcGRhdGVHZW9tZXRyeSA9IHRydWU7CiB9CiAKQEAgLTI2NCwxMiArMjY0LDEyIEBA IHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6Y29tbWl0TGF5ZXJUcmVlKGNv bnN0IFJlbW90ZUxheWVyVHJlZVRyYW5zCiAKIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0Fy ZWFQcm94eTo6YWNjZWxlcmF0ZWRBbmltYXRpb25EaWRTdGFydCh1aW50NjRfdCBsYXllcklELCBj b25zdCBTdHJpbmcmIGtleSwgTW9ub3RvbmljVGltZSBzdGFydFRpbWUpCiB7Ci0gICAgbV93ZWJQ YWdlUHJveHkucHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpBY2NlbGVyYXRl ZEFuaW1hdGlvbkRpZFN0YXJ0KGxheWVySUQsIGtleSwgc3RhcnRUaW1lKSwgbV93ZWJQYWdlUHJv eHkucGFnZUlEKCkpOworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6 QWNjZWxlcmF0ZWRBbmltYXRpb25EaWRTdGFydChsYXllcklELCBrZXksIHN0YXJ0VGltZSksIG1f d2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKIH0KIAogdm9pZCBSZW1vdGVMYXllclRyZWVEcmF3aW5n QXJlYVByb3h5OjphY2NlbGVyYXRlZEFuaW1hdGlvbkRpZEVuZCh1aW50NjRfdCBsYXllcklELCBj b25zdCBTdHJpbmcmIGtleSkKIHsKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc2VuZChN ZXNzYWdlczo6RHJhd2luZ0FyZWE6OkFjY2VsZXJhdGVkQW5pbWF0aW9uRGlkRW5kKGxheWVySUQs IGtleSksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKKyAgICBwcm9jZXNzKCkuc2VuZChNZXNz YWdlczo6RHJhd2luZ0FyZWE6OkFjY2VsZXJhdGVkQW5pbWF0aW9uRGlkRW5kKGxheWVySUQsIGtl eSksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKIH0KIAogc3RhdGljIGNvbnN0IGZsb2F0IGlu ZGljYXRvckluc2V0ID0gMTA7CkBAIC00MzAsNyArNDMwLDcgQEAgdm9pZCBSZW1vdGVMYXllclRy ZWVEcmF3aW5nQXJlYVByb3h5OjpkaWRSZWZyZXNoRGlzcGxheSgpCiAgICAgLy8gV2FpdGluZyBm b3IgQ0EgdG8gY29tbWl0IGlzIGluc3VmZmljaWVudCwgYmVjYXVzZSB0aGUgcmVuZGVyIHNlcnZl ciBjYW4gc3RpbGwgYmUKICAgICAvLyB1c2luZyBvdXIgYmFja2luZyBzdG9yZS4gV2UgY2FuIGlt cHJvdmUgdGhpcyBieSB3YWl0aW5nIGZvciB0aGUgcmVuZGVyIHNlcnZlciB0byBjb21taXQKICAg ICAvLyBpZiB3ZSBmaW5kIEFQSSB0byBkbyBzbywgYnV0IGZvciBub3cgd2Ugd2lsbCBtYWtlIGV4 dHJhIGJ1ZmZlcnMgaWYgbmVlZCBiZS4KLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc2Vu ZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6OkRpZFVwZGF0ZSgpLCBtX3dlYlBhZ2VQcm94eS5wYWdl SUQoKSk7CisgICAgcHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpEaWRVcGRh dGUoKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOwogCiAgICAgbV9sYXN0VmlzaWJsZVRyYW5z YWN0aW9uSUQgPSBtX3RyYW5zYWN0aW9uSURGb3JQZW5kaW5nQ0FDb21taXQ7CiAKQEAgLTQ1OCw3 ICs0NTgsNyBAQCB2b2lkIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHk6OndhaXRGb3JE aWRVcGRhdGVBY3Rpdml0eVN0YXRlKEFjdGl2aXR5U3RhdAogICAgIH0oKTsKIAogICAgIGF1dG8g c3RhcnRUaW1lID0gTW9ub3RvbmljVGltZTo6bm93KCk7Ci0gICAgd2hpbGUgKG1fd2ViUGFnZVBy b3h5LnByb2Nlc3MoKS5jb25uZWN0aW9uKCktPndhaXRGb3JBbmREaXNwYXRjaEltbWVkaWF0ZWx5 PE1lc3NhZ2VzOjpSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5OjpDb21taXRMYXllclRy ZWU+KG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpLCBhY3Rpdml0eVN0YXRlVXBkYXRlVGltZW91dCAt IChNb25vdG9uaWNUaW1lOjpub3coKSAtIHN0YXJ0VGltZSksIElQQzo6V2FpdEZvck9wdGlvbjo6 SW50ZXJydXB0V2FpdGluZ0lmU3luY01lc3NhZ2VBcnJpdmVzKSkgeworICAgIHdoaWxlIChwcm9j ZXNzKCkuY29ubmVjdGlvbigpLT53YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVseTxNZXNzYWdl czo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6Q29tbWl0TGF5ZXJUcmVlPihtX3dl YlBhZ2VQcm94eS5wYWdlSUQoKSwgYWN0aXZpdHlTdGF0ZVVwZGF0ZVRpbWVvdXQgLSAoTW9ub3Rv bmljVGltZTo6bm93KCkgLSBzdGFydFRpbWUpLCBJUEM6OldhaXRGb3JPcHRpb246OkludGVycnVw dFdhaXRpbmdJZlN5bmNNZXNzYWdlQXJyaXZlcykpIHsKICAgICAgICAgaWYgKGFjdGl2aXR5U3Rh dGVDaGFuZ2VJRCA9PSBBY3Rpdml0eVN0YXRlQ2hhbmdlQXN5bmNocm9ub3VzIHx8IGFjdGl2aXR5 U3RhdGVDaGFuZ2VJRCA8PSBtX2FjdGl2aXR5U3RhdGVDaGFuZ2VJRCkKICAgICAgICAgICAgIHJl dHVybjsKICAgICB9CkBAIC00NzEsNyArNDcxLDcgQEAgdm9pZCBSZW1vdGVMYXllclRyZWVEcmF3 aW5nQXJlYVByb3h5OjpkaXNwYXRjaEFmdGVyRW5zdXJpbmdEcmF3aW5nKFdURjo6RnVuY3Rpb24K ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5z ZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6QWRkVHJhbnNhY3Rpb25DYWxsYmFja0lEKG1fY2Fs bGJhY2tzLnB1dChXVEZNb3ZlKGNhbGxiYWNrRnVuY3Rpb24pLCBtX3dlYlBhZ2VQcm94eS5wcm9j ZXNzKCkudGhyb3R0bGVyKCkuYmFja2dyb3VuZEFjdGl2aXR5VG9rZW4oKSkpLCBtX3dlYlBhZ2VQ cm94eS5wYWdlSUQoKSk7CisgICAgcHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVh OjpBZGRUcmFuc2FjdGlvbkNhbGxiYWNrSUQobV9jYWxsYmFja3MucHV0KFdURk1vdmUoY2FsbGJh Y2tGdW5jdGlvbiksIHByb2Nlc3MoKS50aHJvdHRsZXIoKS5iYWNrZ3JvdW5kQWN0aXZpdHlUb2tl bigpKSksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKIH0KIAogdm9pZCBSZW1vdGVMYXllclRy ZWVEcmF3aW5nQXJlYVByb3h5OjpoaWRlQ29udGVudFVudGlsUGVuZGluZ1VwZGF0ZSgpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcAppbmRleCBmMTk4 YTgxNTMzZjc2YjJlOGUyYmY3MWQ0YTNiOWQyNzQwYzk1MDc4Li5mZjc2ZDlmN2Y5N2FjNmZhNGZi YjMwMmY2NDY2NjFkMTY3OGFlMjU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1 c3BlbmRlZFBhZ2VQcm94eS5jcHAKQEAgLTEwMCw3ICsxMDAsOSBAQCBTdXNwZW5kZWRQYWdlUHJv eHk6On5TdXNwZW5kZWRQYWdlUHJveHkoKQogICAgIC8vIElmIHRoZSBzdXNwZW5kZWQgcGFnZSB3 YXMgbm90IGNvbnN1bWVkIGJlZm9yZSBnZXR0aW5nIGRlc3Ryb3llZCwgdGhlbiBjbG9zZSB0aGUg Y29ycmVzcG9uZGluZyBwYWdlCiAgICAgLy8gb24gdGhlIFdlYlByb2Nlc3Mgc2lkZS4KICAgICBt X3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNsb3NlKCksIG1fcGFnZS5wYWdlSUQo KSk7Ci0gICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCisgICAg aWYgKG1fc3VzcGVuc2lvblN0YXRlID09IFN1c3BlbnNpb25TdGF0ZTo6U3VzcGVuZGluZykKKyAg ICAgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQ cm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOwogCiAgICAgLy8g V2UgY2FsbCBtYXliZVNodXREb3duKCkgYXN5bmNocm9ub3VzbHkgc2luY2UgdGhlIFN1c3BlbmRl ZFBhZ2UgaXMgY3VycmVudGx5IGJlaW5nIHJlbW92ZWQgZnJvbSB0aGUgV2ViUHJvY2Vzc1Bvb2wK ICAgICAvLyBhbmQgd2Ugd2FudCB0byBhdm9pZCByZS1lbnRlcmluZyBXZWJQcm9jZXNzUG9vbCBt ZXRob2RzLgpAQCAtMTM0LDcgKzEzNiw2IEBAIHZvaWQgU3VzcGVuZGVkUGFnZVByb3h5Ojp1bnN1 c3BlbmQoKQogICAgIEFTU0VSVChtX3N1c3BlbnNpb25TdGF0ZSA9PSBTdXNwZW5zaW9uU3RhdGU6 OlN1c3BlbmRlZCk7CiAKICAgICBtX3N1c3BlbnNpb25TdGF0ZSA9IFN1c3BlbnNpb25TdGF0ZTo6 UmVzdW1lZDsKLSAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSk7CiAg ICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRJc1N1c3BlbmRlZChmYWxz ZSksIG1fcGFnZS5wYWdlSUQoKSk7CiB9CiAKQEAgLTE1MSw2ICsxNTIsOCBAQCB2b2lkIFN1c3Bl bmRlZFBhZ2VQcm94eTo6ZGlkUHJvY2Vzc1JlcXVlc3RUb1N1c3BlbmQoU3VzcGVuc2lvblN0YXRl IG5ld1N1c3BlbnNpbwogICAgIG1fc3VzcGVuc2lvblRva2VuID0gbnVsbHB0cjsKICNlbmRpZgog CisgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQ cm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCkpOworCiAgICAgaWYg KG1fcmVhZHlUb1Vuc3VzcGVuZEhhbmRsZXIpCiAgICAgICAgIG1fcmVhZHlUb1Vuc3VzcGVuZEhh bmRsZXIodGhpcyk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJG cmFtZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3Bw CmluZGV4IGM3N2EyNmI3NDI3YzMxYzgyOGUyZWFhMjIxZjgwNzBiNzdhZGQyNjIuLjUzYzcxOTZj MmFhMGEzM2QyMjA3NTgxOTBjZDRiZDk1YTVjZDAyNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYkZyYW1lUHJveHkuY3BwCkBAIC0yNyw2ICsyNyw3IEBACiAjaW5jbHVkZSAiV2ViRnJh bWVQcm94eS5oIgogCiAjaW5jbHVkZSAiQVBJTmF2aWdhdGlvbi5oIgorI2luY2x1ZGUgIlByb3Zp c2lvbmFsUGFnZVByb3h5LmgiCiAjaW5jbHVkZSAiV2ViQ2VydGlmaWNhdGVJbmZvLmgiCiAjaW5j bHVkZSAiV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5LmgiCiAjaW5jbHVkZSAiV2ViUGFnZU1l c3NhZ2VzLmgiCkBAIC03NCw3ICs3NSw3IEBAIGJvb2wgV2ViRnJhbWVQcm94eTo6aXNNYWluRnJh bWUoKSBjb25zdAogICAgIGlmICghbV9wYWdlKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAg ICByZXR1cm4gdGhpcyA9PSBtX3BhZ2UtPm1haW5GcmFtZSgpOworICAgIHJldHVybiB0aGlzID09 IG1fcGFnZS0+bWFpbkZyYW1lKCkgfHwgKG1fcGFnZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKSAm JiB0aGlzID09IG1fcGFnZS0+cHJvdmlzaW9uYWxQYWdlUHJveHkoKS0+bWFpbkZyYW1lKCkpOwog fQogCiB2b2lkIFdlYkZyYW1lUHJveHk6OmxvYWRVUkwoY29uc3QgVVJMJiB1cmwpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCAwYzhhNjg3NmYyNWFhZjRhMDAw YzVjMjBiMjNmOTQzMThjNWRkMThjLi4zYmJmNjhjZGJjMzRjMDk0YjI5M2ZkN2MxMTI4ZWFhN2Jh Y2MwY2Q5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTc3 LDYgKzc3LDcgQEAKICNpbmNsdWRlICJQbHVnaW5JbmZvcm1hdGlvbi5oIgogI2luY2x1ZGUgIlBs dWdpblByb2Nlc3NNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiUHJpbnRJbmZvLmgiCisjaW5jbHVkZSAi UHJvdmlzaW9uYWxQYWdlUHJveHkuaCIKICNpbmNsdWRlICJTYWZlQnJvd3NpbmdXYXJuaW5nLmgi CiAjaW5jbHVkZSAiU2hhcmVTaGVldENhbGxiYWNrSUQuaCIKICNpbmNsdWRlICJTaGFyZWRCdWZm ZXJEYXRhUmVmZXJlbmNlLmgiCkBAIC0yMzYsOCArMjM3LDggQEAKIC8vIFRoaXMgY29udHJvbHMg d2hhdCBzdHJhdGVneSB3ZSB1c2UgZm9yIG1vdXNlIHdoZWVsIGNvYWxlc2NpbmcuCiAjZGVmaW5l IE1FUkdFX1dIRUVMX0VWRU5UUyAxCiAKLSNkZWZpbmUgTUVTU0FHRV9DSEVDSyhhc3NlcnRpb24p IE1FU1NBR0VfQ0hFQ0tfQkFTRShhc3NlcnRpb24sIG1fcHJvY2Vzcy0+Y29ubmVjdGlvbigpKQot I2RlZmluZSBNRVNTQUdFX0NIRUNLX1VSTCh1cmwpIE1FU1NBR0VfQ0hFQ0tfQkFTRShjaGVja1VS TFJlY2VpdmVkRnJvbUN1cnJlbnRPclByZXZpb3VzV2ViUHJvY2Vzcyh1cmwpLCBtX3Byb2Nlc3Mt PmNvbm5lY3Rpb24oKSkKKyNkZWZpbmUgTUVTU0FHRV9DSEVDSyhwcm9jZXNzLCBhc3NlcnRpb24p IE1FU1NBR0VfQ0hFQ0tfQkFTRShhc3NlcnRpb24sIHByb2Nlc3MuY29ubmVjdGlvbigpKQorI2Rl ZmluZSBNRVNTQUdFX0NIRUNLX1VSTChwcm9jZXNzLCB1cmwpIE1FU1NBR0VfQ0hFQ0tfQkFTRShj aGVja1VSTFJlY2VpdmVkRnJvbUN1cnJlbnRPclByZXZpb3VzV2ViUHJvY2Vzcyhwcm9jZXNzLCB1 cmwpLCBwcm9jZXNzLmNvbm5lY3Rpb24oKSkKIAogI2RlZmluZSBSRUxFQVNFX0xPR19JRl9BTExP V0VEKGNoYW5uZWwsIGZtdCwgLi4uKSBSRUxFQVNFX0xPR19JRihpc0Fsd2F5c09uTG9nZ2luZ0Fs bG93ZWQoKSwgY2hhbm5lbCwgIiVwIC0gV2ViUGFnZVByb3h5OjoiIGZtdCwgdGhpcywgIyNfX1ZB X0FSR1NfXykKIApAQCAtNTQ1LDYgKzU0NiwxMyBAQCBQQUw6OlNlc3Npb25JRCBXZWJQYWdlUHJv eHk6OnNlc3Npb25JRCgpIGNvbnN0CiAgICAgcmV0dXJuIG1fd2Vic2l0ZURhdGFTdG9yZS0+c2Vz c2lvbklEKCk7CiB9CiAKK0RyYXdpbmdBcmVhUHJveHkqIFdlYlBhZ2VQcm94eTo6cHJvdmlzaW9u YWxEcmF3aW5nQXJlYSgpIGNvbnN0Cit7CisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlICYmIG1f cHJvdmlzaW9uYWxQYWdlLT5kcmF3aW5nQXJlYSgpKQorICAgICAgICByZXR1cm4gbV9wcm92aXNp b25hbFBhZ2UtPmRyYXdpbmdBcmVhKCk7CisgICAgcmV0dXJuIGRyYXdpbmdBcmVhKCk7Cit9CisK IHZvaWQgV2ViUGFnZVByb3h5OjpjaGFuZ2VXZWJzaXRlRGF0YVN0b3JlKFdlYnNpdGVEYXRhU3Rv cmUmIHdlYnNpdGVEYXRhU3RvcmUpCiB7CiAgICAgbV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgpLnBh Z2VFbmRVc2luZ1dlYnNpdGVEYXRhU3RvcmUoKnRoaXMpOwpAQCAtNzY4LDM4ICs3NzYsMjYgQEAg Ym9vbCBXZWJQYWdlUHJveHk6OnN1c3BlbmRDdXJyZW50UGFnZUlmUG9zc2libGUoQVBJOjpOYXZp Z2F0aW9uJiBuYXZpZ2F0aW9uLCBPcHQKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBXZWJQ YWdlUHJveHk6OnN3YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNz LCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmIGRlc3RpbmF0aW9uU3VzcGVu ZGVkUGFnZSwgSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9pZCBX ZWJQYWdlUHJveHk6OnN3YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9j ZXNzLCBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4mJiBkcmF3aW5nQXJlYSwgUmVm UHRyPFdlYkZyYW1lUHJveHk+JiYgbWFpbkZyYW1lKQogewogICAgIEFTU0VSVCghbV9pc0Nsb3Nl ZCk7CiAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAic3dhcFRvV2ViUHJvY2Vz czogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRl bnRpZmllcigpLCBtX3BhZ2VJRCk7CiAKICAgICBtX3Byb2Nlc3MgPSBXVEZNb3ZlKHByb2Nlc3Mp OworICAgIEFTU0VSVCghbV9kcmF3aW5nQXJlYSk7CisgICAgc2V0RHJhd2luZ0FyZWEoV1RGTW92 ZShkcmF3aW5nQXJlYSkpOworICAgIEFTU0VSVCghbV9tYWluRnJhbWUpOworICAgIG1fbWFpbkZy YW1lID0gV1RGTW92ZShtYWluRnJhbWUpOwogICAgIG1faXNWYWxpZCA9IHRydWU7CiAKLSAgICAv LyBJZiB3ZSBhcmUgcmVhdHRhY2hpbmcgdG8gYSBTdXNwZW5kZWRQYWdlLCB0aGVuIHRoZSBXZWJQ cm9jZXNzJyBXZWJQYWdlIGFscmVhZHkgZXhpc3RzIGFuZAotICAgIC8vIFdlYlBhZ2VQcm94eTo6 ZGlkQ3JlYXRlTWFpbkZyYW1lKCkgd2lsbCBub3QgYmUgY2FsbGVkIHRvIGluaXRpYWxpemUgbV9t YWluRnJhbWUuIEluIHN1Y2gKLSAgICAvLyBjYXNlLCB3ZSBuZWVkIHRvIGluaXRpYWxpemUgbV9t YWluRnJhbWUgdG8gcmVmbGVjdCB0aGUgZmFjdCB0aGUgdGhlIFdlYlByb2Nlc3MnIFdlYlBhZ2UK LSAgICAvLyBhbHJlYWR5IGV4aXN0cyBhbmQgYWxyZWFkeSBoYXMgYSBtYWluIGZyYW1lLgotICAg IGlmIChkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UpIHsKLSAgICAgICAgaWYgKCFkZXN0aW5hdGlv blN1c3BlbmRlZFBhZ2UtPmZhaWxlZFRvU3VzcGVuZCgpKSB7Ci0gICAgICAgICAgICBBU1NFUlQo IW1fbWFpbkZyYW1lKTsKLSAgICAgICAgICAgIEFTU0VSVCgmZGVzdGluYXRpb25TdXNwZW5kZWRQ YWdlLT5wcm9jZXNzKCkgPT0gbV9wcm9jZXNzLnB0cigpKTsKLSAgICAgICAgICAgIGRlc3RpbmF0 aW9uU3VzcGVuZGVkUGFnZS0+dW5zdXNwZW5kKCk7Ci0gICAgICAgICAgICBtX21haW5GcmFtZSA9 IFdlYkZyYW1lUHJveHk6OmNyZWF0ZSgqdGhpcywgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlLT5t YWluRnJhbWVJRCgpKTsKLSAgICAgICAgICAgIG1fcHJvY2Vzcy0+ZnJhbWVDcmVhdGVkKGRlc3Rp bmF0aW9uU3VzcGVuZGVkUGFnZS0+bWFpbkZyYW1lSUQoKSwgKm1fbWFpbkZyYW1lKTsKLSAgICAg ICAgfSBlbHNlIHsKLSAgICAgICAgICAgIC8vIFdlIGZhaWxlZCB0byBzdXNwZW5kIHRoZSBwYWdl IHNvIGRlc3Ryb3kgaXQgbm93IGFuZCBtZXJlbHkgcmV1c2UgaXRzIFdlYkNvbnRlbnQgcHJvY2Vz cy4KLSAgICAgICAgICAgIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSA9IG51bGxwdHI7Ci0gICAg ICAgIH0KLSAgICB9Ci0KICAgICBtX3Byb2Nlc3MtPmFkZEV4aXN0aW5nV2ViUGFnZSgqdGhpcywg bV9wYWdlSUQsIFdlYlByb2Nlc3NQcm94eTo6QmVnaW5zVXNpbmdEYXRhU3RvcmU6Ok5vKTsKICAg ICBtX3Byb2Nlc3MtPmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5Ojpt ZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZUlELCAqdGhpcyk7CiAKLSAgICBmaW5pc2hBdHRh Y2hpbmdUb1dlYlByb2Nlc3MoaXNTd2FwRnJvbVN1c3BlbmRlZCk7CisgICAgLy8gTm8gbmVlZCB0 byBpbml0aWFsaXplIHRoZSBXZWJQYWdlIHNpbmNlIGl0IHdhcyBjcmVhdGVkIHdoZW4gd2UgY3Jl YXRlZCB0aGUgUHJvdmlzaW9uYWxQYWdlUHJveHkuCisgICAgZmluaXNoQXR0YWNoaW5nVG9XZWJQ cm9jZXNzKFNob3VsZEluaXRpYWxpemVXZWJQYWdlOjpObyk7CiB9CiAKLXZvaWQgV2ViUGFnZVBy b3h5OjpmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nlc3MoSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3 YXBGcm9tU3VzcGVuZGVkKQordm9pZCBXZWJQYWdlUHJveHk6OmZpbmlzaEF0dGFjaGluZ1RvV2Vi UHJvY2VzcyhTaG91bGRJbml0aWFsaXplV2ViUGFnZSBzaG91bGRJbml0aWFsaXplUGFnZSkKIHsK ICAgICBBU1NFUlQobV9wcm9jZXNzLT5zdGF0ZSgpICE9IENoaWxkUHJvY2Vzc1Byb3h5OjpTdGF0 ZTo6VGVybWluYXRlZCk7CiAKQEAgLTgzNSw3ICs4MzEsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 ZmluaXNoQXR0YWNoaW5nVG9XZWJQcm9jZXNzKElzU3dhcEZyb21TdXNwZW5kZWQgaXNTd2FwRnJv bVN1cwogICAgIG1fZWRpdGFibGVJbWFnZUNvbnRyb2xsZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEVk aXRhYmxlSW1hZ2VDb250cm9sbGVyPigqdGhpcyk7CiAjZW5kaWYKIAotICAgIGluaXRpYWxpemVX ZWJQYWdlKGlzU3dhcEZyb21TdXNwZW5kZWQpOworICAgIGlmIChzaG91bGRJbml0aWFsaXplUGFn ZSA9PSBTaG91bGRJbml0aWFsaXplV2ViUGFnZTo6WWVzKQorICAgICAgICBpbml0aWFsaXplV2Vi UGFnZSgpOwogCiAgICAgbV9pbnNwZWN0b3ItPnVwZGF0ZUZvck5ld1BhZ2VQcm9jZXNzKHRoaXMp OwogCkBAIC05MDAsMTIgKzg5NywxMSBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdl UHJveHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNzV2l0aEl0ZW0oV2ViQmFja0ZvcndhcgogICAgIHJl dHVybiBXVEZNb3ZlKG5hdmlnYXRpb24pOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlh bGl6ZVdlYlBhZ2UoSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQordm9p ZCBXZWJQYWdlUHJveHk6OnNldERyYXdpbmdBcmVhKHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJl YVByb3h5PiYmIGRyYXdpbmdBcmVhKQogewotICAgIEFTU0VSVChpc1ZhbGlkKCkpOwotCi0gICAg bV9kcmF3aW5nQXJlYSA9IHBhZ2VDbGllbnQoKS5jcmVhdGVEcmF3aW5nQXJlYVByb3h5KCk7Ci0g ICAgQVNTRVJUKG1fZHJhd2luZ0FyZWEpOworICAgIG1fZHJhd2luZ0FyZWEgPSBXVEZNb3ZlKGRy YXdpbmdBcmVhKTsKKyAgICBpZiAoIW1fZHJhd2luZ0FyZWEpCisgICAgICAgIHJldHVybjsKIAog I2lmIEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpICYmIFBMQVRGT1JNKENPQ09BKQogICAgIGlmICht X2RyYXdpbmdBcmVhLT50eXBlKCkgPT0gRHJhd2luZ0FyZWFUeXBlUmVtb3RlTGF5ZXJUcmVlKSB7 CkBAIC05MTYsMTUgKzkxMiwxNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBh Z2UoSXNTd2FwRnJvbVN1c3BlbmRlZCBpc1N3YXBGcm9tU3VzcGVuZGVkKQogI2VuZGlmCiAgICAg fQogI2VuZGlmCit9CiAKLSAgICBhdXRvIHBhcmFtZXRlcnMgPSBjcmVhdGlvblBhcmFtZXRlcnMo KTsKLSAgICBwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQgPSBpc1N3YXBGcm9tU3VzcGVu ZGVkID09IElzU3dhcEZyb21TdXNwZW5kZWQ6OlllczsKK3ZvaWQgV2ViUGFnZVByb3h5Ojppbml0 aWFsaXplV2ViUGFnZSgpCit7CisgICAgQVNTRVJUKGlzVmFsaWQoKSk7CiAKLSNpZiBFTkFCTEUo U0VSVklDRV9XT1JLRVIpCi0gICAgcGFyYW1ldGVycy5oYXNSZWdpc3RlcmVkU2VydmljZVdvcmtl cnMgPSBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS5tYXlIYXZlUmVnaXN0ZXJlZFNlcnZpY2VXb3Jr ZXJzKG1fd2Vic2l0ZURhdGFTdG9yZSk7Ci0jZW5kaWYKKyAgICBzZXREcmF3aW5nQXJlYShwYWdl Q2xpZW50KCkuY3JlYXRlRHJhd2luZ0FyZWFQcm94eShtX3Byb2Nlc3MpKTsKKyAgICBBU1NFUlQo bV9kcmF3aW5nQXJlYSk7CiAKLSAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vz czo6Q3JlYXRlV2ViUGFnZShtX3BhZ2VJRCwgcGFyYW1ldGVycyksIDApOworICAgIHByb2Nlc3Mo KS5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpDcmVhdGVXZWJQYWdlKG1fcGFnZUlELCBjcmVh dGlvblBhcmFtZXRlcnMobV9wcm9jZXNzKSksIDApOwogCiAgICAgbV9uZWVkc1RvRmluaXNoSW5p dGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCA9IHRydWU7CiAgICAgZmluaXNoSW5p dGlhbGl6aW5nV2ViUGFnZUFmdGVyUHJvY2Vzc0xhdW5jaCgpOwpAQCAtMTAzNCwxMiArMTAzMSwx MiBAQCBib29sIFdlYlBhZ2VQcm94eTo6dHJ5Q2xvc2UoKQogICAgIHJldHVybiBmYWxzZTsKIH0K IAotYm9vbCBXZWJQYWdlUHJveHk6Om1heWJlSW5pdGlhbGl6ZVNhbmRib3hFeHRlbnNpb25IYW5k bGUoY29uc3QgVVJMJiB1cmwsIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYgc2FuZGJveEV4dGVu c2lvbkhhbmRsZSkKK2Jvb2wgV2ViUGFnZVByb3h5OjptYXliZUluaXRpYWxpemVTYW5kYm94RXh0 ZW5zaW9uSGFuZGxlKFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcywgY29uc3QgVVJMJiB1cmwsIFNh bmRib3hFeHRlbnNpb246OkhhbmRsZSYgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSkKIHsKICAgICBp ZiAoIXVybC5pc0xvY2FsRmlsZSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAo bV9wcm9jZXNzLT5oYXNBc3N1bWVkUmVhZEFjY2Vzc1RvVVJMKHVybCkpCisgICAgaWYgKHByb2Nl c3MuaGFzQXNzdW1lZFJlYWRBY2Nlc3NUb1VSTCh1cmwpKQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKICAgICAvLyBJbnNwZWN0b3IgcmVzb3VyY2VzIGFyZSBpbiBhIGRpcmVjdG9yeSB3aXRoIGFz c3VtZWQgYWNjZXNzLgpAQCAtMTA2MywyMCArMTA2MCwyMSBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0 aW9uPiBXZWJQYWdlUHJveHk6OmxvYWRSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3Qs IFNobwogICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImxvYWRSZXF1ZXN0OiB3 ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlm aWVyKCksIG1fcGFnZUlEKTsKIAogICAgIGF1dG8gbmF2aWdhdGlvbiA9IG1fbmF2aWdhdGlvblN0 YXRlLT5jcmVhdGVMb2FkUmVxdWVzdE5hdmlnYXRpb24oUmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3Qp LCBtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKSk7Ci0gICAgbG9hZFJlcXVlc3RXaXRo TmF2aWdhdGlvbihuYXZpZ2F0aW9uLmdldCgpLCBXVEZNb3ZlKHJlcXVlc3QpLCBzaG91bGRPcGVu RXh0ZXJuYWxVUkxzUG9saWN5LCB1c2VyRGF0YSwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2Fk OjpObyk7CisgICAgbG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvblNoYXJlZChtX3Byb2Nlc3MsIG5h dmlnYXRpb24uZ2V0KCksIFdURk1vdmUocmVxdWVzdCksIHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQ b2xpY3ksIHVzZXJEYXRhLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6Ok5vKTsKICAgICBy ZXR1cm4gV1RGTW92ZShuYXZpZ2F0aW9uKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRS ZXF1ZXN0V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBSZXNvdXJj ZVJlcXVlc3QmJiByZXF1ZXN0LCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5IHNob3VsZE9w ZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgU2hvdWxkVHJlYXRB c0NvbnRpbnVpbmdMb2FkIHNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vi c2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit2b2lkIFdlYlBhZ2VQcm94eTo6 bG9hZFJlcXVlc3RXaXRoTmF2aWdhdGlvblNoYXJlZChXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3Ms IEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwg U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5 LCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCBzaG91 bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYg d2Vic2l0ZVBvbGljaWVzKQogewogICAgIEFTU0VSVCghbV9pc0Nsb3NlZCk7CiAKLSAgICBSRUxF QVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uOiB3 ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlm aWVyKCksIG1fcGFnZUlEKTsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJs b2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0 LCBwcm9jZXNzLnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKIAogICAgIGF1dG8gdHJh bnNhY3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKIAogICAgIGF1dG8gdXJs ID0gcmVxdWVzdC51cmwoKTsKLSAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0UGVuZGluZ0FQSVJlcXVl c3RVUkwodHJhbnNhY3Rpb24sIHVybCk7CisgICAgaWYgKHNob3VsZFRyZWF0QXNDb250aW51aW5n TG9hZCAhPSBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6OlllcykKKyAgICAgICAgbV9wYWdl TG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCB1cmwpOwogCiAg ICAgaWYgKCFpc1ZhbGlkKCkpCiAgICAgICAgIHJlYXR0YWNoVG9XZWJQcm9jZXNzKCk7CkBAIC0x MDg1LDE5ICsxMDgzLDE5IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkUmVxdWVzdFdpdGhOYXZp Z2F0aW9uKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgUmVzb3VyCiAgICAgbG9hZFBhcmFt ZXRlcnMubmF2aWdhdGlvbklEID0gbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKTsKICAgICBsb2Fk UGFyYW1ldGVycy5yZXF1ZXN0ID0gV1RGTW92ZShyZXF1ZXN0KTsKICAgICBsb2FkUGFyYW1ldGVy cy5zaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5ID0gKHVpbnQ2NF90KXNob3VsZE9wZW5FeHRl cm5hbFVSTHNQb2xpY3k7Ci0gICAgbG9hZFBhcmFtZXRlcnMudXNlckRhdGEgPSBVc2VyRGF0YShw cm9jZXNzKCkudHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YSkuZ2V0KCkpOworICAg IGxvYWRQYXJhbWV0ZXJzLnVzZXJEYXRhID0gVXNlckRhdGEocHJvY2Vzcy50cmFuc2Zvcm1PYmpl Y3RzVG9IYW5kbGVzKHVzZXJEYXRhKS5nZXQoKSk7CiAgICAgbG9hZFBhcmFtZXRlcnMuc2hvdWxk VHJlYXRBc0NvbnRpbnVpbmdMb2FkID0gc2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkID09IFNo b3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzOwogICAgIGxvYWRQYXJhbWV0ZXJzLndlYnNp dGVQb2xpY2llcyA9IFdURk1vdmUod2Vic2l0ZVBvbGljaWVzKTsKICAgICBsb2FkUGFyYW1ldGVy cy5sb2NrSGlzdG9yeSA9IG5hdmlnYXRpb24ubG9ja0hpc3RvcnkoKTsKICAgICBsb2FkUGFyYW1l dGVycy5sb2NrQmFja0ZvcndhcmRMaXN0ID0gbmF2aWdhdGlvbi5sb2NrQmFja0ZvcndhcmRMaXN0 KCk7CiAgICAgbG9hZFBhcmFtZXRlcnMuY2xpZW50UmVkaXJlY3RTb3VyY2VGb3JIaXN0b3J5ID0g bmF2aWdhdGlvbi5jbGllbnRSZWRpcmVjdFNvdXJjZUZvckhpc3RvcnkoKTsKLSAgICBib29sIGNy ZWF0ZWRFeHRlbnNpb24gPSBtYXliZUluaXRpYWxpemVTYW5kYm94RXh0ZW5zaW9uSGFuZGxlKHVy bCwgbG9hZFBhcmFtZXRlcnMuc2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7CisgICAgYm9vbCBjcmVh dGVkRXh0ZW5zaW9uID0gbWF5YmVJbml0aWFsaXplU2FuZGJveEV4dGVuc2lvbkhhbmRsZShwcm9j ZXNzLCB1cmwsIGxvYWRQYXJhbWV0ZXJzLnNhbmRib3hFeHRlbnNpb25IYW5kbGUpOwogICAgIGlm IChjcmVhdGVkRXh0ZW5zaW9uKQotICAgICAgICB3aWxsQWNxdWlyZVVuaXZlcnNhbEZpbGVSZWFk U2FuZGJveEV4dGVuc2lvbigpOworICAgICAgICB3aWxsQWNxdWlyZVVuaXZlcnNhbEZpbGVSZWFk U2FuZGJveEV4dGVuc2lvbihwcm9jZXNzKTsKICAgICBhZGRQbGF0Zm9ybUxvYWRQYXJhbWV0ZXJz KGxvYWRQYXJhbWV0ZXJzKTsKIAotICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6TG9hZFJlcXVlc3QobG9hZFBhcmFtZXRlcnMpLCBtX3BhZ2VJRCk7Ci0gICAgbV9wcm9jZXNz LT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKKyAgICBwcm9jZXNzLnNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2U6OkxvYWRSZXF1ZXN0KGxvYWRQYXJhbWV0ZXJzKSwgbV9wYWdlSUQpOworICAg IHByb2Nlc3MucmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7CiB9CiAKIFJlZlB0cjxBUEk6 Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6bG9hZEZpbGUoY29uc3QgU3RyaW5nJiBmaWxlVVJM U3RyaW5nLCBjb25zdCBTdHJpbmcmIHJlc291cmNlRGlyZWN0b3J5VVJMU3RyaW5nLCBBUEk6Ok9i amVjdCogdXNlckRhdGEpCkBAIC0xMTYyLDEzICsxMTYwLDEzIEBAIFJlZlB0cjxBUEk6Ok5hdmln YXRpb24+IFdlYlBhZ2VQcm94eTo6bG9hZERhdGEoY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBk YXRhLCBjCiAgICAgfQogCiAgICAgYXV0byBuYXZpZ2F0aW9uID0gbV9uYXZpZ2F0aW9uU3RhdGUt PmNyZWF0ZUxvYWREYXRhTmF2aWdhdGlvbihzdGQ6Om1ha2VfdW5pcXVlPEFQSTo6U3Vic3RpdHV0 ZURhdGE+KGRhdGEudmVjdG9yKCksIE1JTUVUeXBlLCBlbmNvZGluZywgYmFzZVVSTCwgdXNlckRh dGEpKTsKLSAgICBsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIGRhdGEsIE1JTUVU eXBlLCBlbmNvZGluZywgYmFzZVVSTCwgdXNlckRhdGEsIFNob3VsZFRyZWF0QXNDb250aW51aW5n TG9hZDo6Tm8pOworICAgIGxvYWREYXRhV2l0aE5hdmlnYXRpb25TaGFyZWQobV9wcm9jZXNzLCBu YXZpZ2F0aW9uLCBkYXRhLCBNSU1FVHlwZSwgZW5jb2RpbmcsIGJhc2VVUkwsIHVzZXJEYXRhLCBT aG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6Ok5vKTsKICAgICByZXR1cm4gV1RGTW92ZShuYXZp Z2F0aW9uKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmxvYWREYXRhV2l0aE5hdmlnYXRpb24o QVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRh dGEsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0 IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBTaG91bGRUcmVhdEFzQ29u dGludWluZ0xvYWQgc2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRl UG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKK3ZvaWQgV2ViUGFnZVByb3h5Ojpsb2Fk RGF0YVdpdGhOYXZpZ2F0aW9uU2hhcmVkKFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcywgQVBJOjpO YXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEsIGNv bnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmlu ZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBTaG91bGRUcmVhdEFzQ29udGludWlu Z0xvYWQgc2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNp ZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKIHsKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VE KExvYWRpbmcsICJsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0g JSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlEKTsKKyAg ICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJsb2FkRGF0YVdpdGhOYXZpZ2F0aW9u OiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0LCBwcm9jZXNzLnByb2Nlc3NJZGVudGlm aWVyKCksIG1fcGFnZUlEKTsKIAogICAgIEFTU0VSVCghbV9pc0Nsb3NlZCk7CiAKQEAgLTExODYs MTMgKzExODQsMTMgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxvYWREYXRhV2l0aE5hdmlnYXRpb24o QVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBjb25zdCBJUEMKICAgICBsb2FkUGFyYW1ldGVy cy5lbmNvZGluZ05hbWUgPSBlbmNvZGluZzsKICAgICBsb2FkUGFyYW1ldGVycy5iYXNlVVJMU3Ry aW5nID0gYmFzZVVSTDsKICAgICBsb2FkUGFyYW1ldGVycy5zaG91bGRUcmVhdEFzQ29udGludWlu Z0xvYWQgPSBzaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQgPT0gU2hvdWxkVHJlYXRBc0NvbnRp bnVpbmdMb2FkOjpZZXM7Ci0gICAgbG9hZFBhcmFtZXRlcnMudXNlckRhdGEgPSBVc2VyRGF0YShw cm9jZXNzKCkudHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YSkuZ2V0KCkpOworICAg IGxvYWRQYXJhbWV0ZXJzLnVzZXJEYXRhID0gVXNlckRhdGEocHJvY2Vzcy50cmFuc2Zvcm1PYmpl Y3RzVG9IYW5kbGVzKHVzZXJEYXRhKS5nZXQoKSk7CiAgICAgbG9hZFBhcmFtZXRlcnMud2Vic2l0 ZVBvbGljaWVzID0gV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpOwogICAgIGFkZFBsYXRmb3JtTG9h ZFBhcmFtZXRlcnMobG9hZFBhcmFtZXRlcnMpOwogCi0gICAgbV9wcm9jZXNzLT5hc3N1bWVSZWFk QWNjZXNzVG9CYXNlVVJMKCp0aGlzLCBiYXNlVVJMKTsKLSAgICBtX3Byb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OkxvYWREYXRhKGxvYWRQYXJhbWV0ZXJzKSwgbV9wYWdlSUQpOwotICAg IG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7CisgICAgcHJvY2Vzcy5h c3N1bWVSZWFkQWNjZXNzVG9CYXNlVVJMKCp0aGlzLCBiYXNlVVJMKTsKKyAgICBwcm9jZXNzLnNl bmQoTWVzc2FnZXM6OldlYlBhZ2U6OkxvYWREYXRhKGxvYWRQYXJhbWV0ZXJzKSwgbV9wYWdlSUQp OworICAgIHByb2Nlc3MucmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7CiB9CiAKIHZvaWQg V2ViUGFnZVByb3h5Ojpsb2FkQWx0ZXJuYXRlSFRNTChjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2Um IGh0bWxEYXRhLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBVUkwmIGJhc2VVUkwsIGNv bnN0IFVSTCYgdW5yZWFjaGFibGVVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSkKQEAgLTEyOTQs NiArMTI5MiwxMCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c3RvcExvYWRpbmcoKQogICAgIH0KIAog ICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U3RvcExvYWRpbmcoKSwgbV9w YWdlSUQpOworICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZSkgeworICAgICAgICBtX3Byb3Zpc2lv bmFsUGFnZS0+Y2FuY2VsKCk7CisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlID0gbnVsbHB0cjsK KyAgICB9CiAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKIH0K IApAQCAtMTMwOSw5ICsxMzExLDkgQEAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gV2ViUGFnZVBy b3h5OjpyZWxvYWQoT3B0aW9uU2V0PFdlYkNvcmU6OlJlbG9hZE9wdGlvbj4gb3AKICAgICAgICAg bV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCB1cmwp OwogCiAgICAgICAgIC8vIFdlIG1heSBub3QgaGF2ZSBhbiBleHRlbnNpb24geWV0IGlmIGJhY2sv Zm9yd2FyZCBsaXN0IHdhcyByZWluc3RhdGVkIGFmdGVyIGEgV2ViUHJvY2VzcyBjcmFzaCBvciBh IGJyb3dzZXIgcmVsYXVuY2gKLSAgICAgICAgYm9vbCBjcmVhdGVkRXh0ZW5zaW9uID0gbWF5YmVJ bml0aWFsaXplU2FuZGJveEV4dGVuc2lvbkhhbmRsZShVUkwoVVJMKCksIHVybCksIHNhbmRib3hF eHRlbnNpb25IYW5kbGUpOworICAgICAgICBib29sIGNyZWF0ZWRFeHRlbnNpb24gPSBtYXliZUlu aXRpYWxpemVTYW5kYm94RXh0ZW5zaW9uSGFuZGxlKG1fcHJvY2VzcywgVVJMKFVSTCgpLCB1cmwp LCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsKICAgICAgICAgaWYgKGNyZWF0ZWRFeHRlbnNpb24p Ci0gICAgICAgICAgICB3aWxsQWNxdWlyZVVuaXZlcnNhbEZpbGVSZWFkU2FuZGJveEV4dGVuc2lv bigpOworICAgICAgICAgICAgd2lsbEFjcXVpcmVVbml2ZXJzYWxGaWxlUmVhZFNhbmRib3hFeHRl bnNpb24obV9wcm9jZXNzKTsKICAgICB9CiAKICAgICBpZiAoIWlzVmFsaWQoKSkKQEAgLTIwOTIs NyArMjA5NCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpwZXJmb3JtRHJhZ0NvbnRyb2xsZXJBY3Rp b24oRHJhZ0NvbnRyb2xsZXJBY3Rpb24gYWN0aW9uLCBEcmFnCiAKIHZvaWQgV2ViUGFnZVByb3h5 OjpkaWRQZXJmb3JtRHJhZ0NvbnRyb2xsZXJBY3Rpb24odWludDY0X3QgZHJhZ09wZXJhdGlvbiwg V2ViQ29yZTo6RHJhZ0hhbmRsaW5nTWV0aG9kIGRyYWdIYW5kbGluZ01ldGhvZCwgYm9vbCBtb3Vz ZUlzT3ZlckZpbGVJbnB1dCwgdW5zaWduZWQgbnVtYmVyT2ZJdGVtc1RvQmVBY2NlcHRlZCwgY29u c3QgSW50UmVjdCYgaW5zZXJ0aW9uUmVjdCwgY29uc3QgSW50UmVjdCYgZWRpdGFibGVFbGVtZW50 UmVjdCkKIHsKLSAgICBNRVNTQUdFX0NIRUNLKGRyYWdPcGVyYXRpb24gPD0gRHJhZ09wZXJhdGlv bkRlbGV0ZSk7CisgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGRyYWdPcGVyYXRp b24gPD0gRHJhZ09wZXJhdGlvbkRlbGV0ZSk7CiAKICAgICBtX2N1cnJlbnREcmFnT3BlcmF0aW9u ID0gc3RhdGljX2Nhc3Q8RHJhZ09wZXJhdGlvbj4oZHJhZ09wZXJhdGlvbik7CiAgICAgbV9jdXJy ZW50RHJhZ0hhbmRsaW5nTWV0aG9kID0gZHJhZ0hhbmRsaW5nTWV0aG9kOwpAQCAtMjQwNSw3ICsy NDA3LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmZpbmRQbHVnaW4oY29uc3QgU3RyaW5nJiBtaW1l VHlwZSwgdWludDMyX3QgcHJvY2Vzc1R5cGUsIGNvbnMKIHsKICAgICBQYWdlQ2xpZW50UHJvdGVj dG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCi0gICAgTUVTU0FHRV9DSEVDS19VUkwodXJs U3RyaW5nKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChwcm9jZXNzKCksIHVybFN0cmluZyk7CiAK ICAgICBVUkwgcGx1Z2luVVJMID0gVVJMIHsgVVJMKCksIHVybFN0cmluZyB9OwogICAgIFN0cmlu ZyBuZXdNaW1lVHlwZSA9IG1pbWVUeXBlLmNvbnZlcnRUb0FTQ0lJTG93ZXJjYXNlKCk7CkBAIC0y Njk4LDcgKzI3MDAsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVjZWl2ZWROYXZpZ2F0aW9uUG9s aWN5RGVjaXNpb24oV2ViUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbgogICAgICAgICB9CiAKICAg ICAgICAgaWYgKHByb2Nlc3NGb3JOYXZpZ2F0aW9uLnB0cigpICE9ICZwcm9jZXNzKCkpIHsKLSAg ICAgICAgICAgIHBvbGljeUFjdGlvbiA9IGlzUGFnZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxF bXB0eURvY3VtZW50KCkgPyBXZWJQb2xpY3lBY3Rpb246Oklnbm9yZSA6IFdlYlBvbGljeUFjdGlv bjo6U3VzcGVuZDsKKyAgICAgICAgICAgIHBvbGljeUFjdGlvbiA9IFdlYlBvbGljeUFjdGlvbjo6 SWdub3JlOwogICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBp bmcsICJkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uLCBzd2FwcGluZyBwcm9jZXNzICVp IHdpdGggcHJvY2VzcyAlaSBmb3IgbmF2aWdhdGlvbiwgcmVhc29uOiAle3B1YmxpY31zIiwgcHJv Y2Vzc0lkZW50aWZpZXIoKSwgcHJvY2Vzc0Zvck5hdmlnYXRpb24tPnByb2Nlc3NJZGVudGlmaWVy KCksIHJlYXNvbi51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgICAgIExPRyhQcm9jZXNzU3dhcHBp bmcsICIoUHJvY2Vzc1N3YXBwaW5nKSBTd2l0Y2hpbmcgZnJvbSBwcm9jZXNzICVpIHRvIG5ldyBw cm9jZXNzICglaSkgZm9yIG5hdmlnYXRpb24gJSIgUFJJdTY0ICIgJyVzJyIsIHByb2Nlc3NJZGVu dGlmaWVyKCksIHByb2Nlc3NGb3JOYXZpZ2F0aW9uLT5wcm9jZXNzSWRlbnRpZmllcigpLCBuYXZp Z2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi0+bG9nZ2luZ1N0cmluZygpKTsKICAg ICAgICAgfSBlbHNlCkBAIC0yNzA3LDggKzI3MDksMTQgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJl Y2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uKFdlYlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rp b24KICAgICAgICAgYm9vbCBzaG91bGRQcm9jZXNzU3dhcCA9IHByb2Nlc3NGb3JOYXZpZ2F0aW9u LnB0cigpICE9ICZwcm9jZXNzKCk7CiAgICAgICAgIHJlY2VpdmVkUG9saWN5RGVjaXNpb24ocG9s aWN5QWN0aW9uLCBuYXZpZ2F0aW9uLnB0cigpLCBzaG91bGRQcm9jZXNzU3dhcCA/IFdURjo6bnVs bG9wdCA6IFdURk1vdmUoZGF0YSksIFdURk1vdmUoc2VuZGVyKSk7CiAKLSAgICAgICAgaWYgKHNo b3VsZFByb2Nlc3NTd2FwKQotICAgICAgICAgICAgY29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9j ZXNzKG5hdmlnYXRpb24sIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSA/IHByb2Nlc3MoKS5wcm9j ZXNzUG9vbCgpLnRha2VTdXNwZW5kZWRQYWdlKCpkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UpIDog bnVsbHB0ciwgV1RGTW92ZShwcm9jZXNzRm9yTmF2aWdhdGlvbiksIHByb2Nlc3NTd2FwUmVxdWVz dGVkQnlDbGllbnQsIFdURk1vdmUoZGF0YSkpOworICAgICAgICBpZiAoIXNob3VsZFByb2Nlc3NT d2FwKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGF1dG8gc3VzcGVuZGVkUGFnZSA9 IGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZSA/IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLnRha2VT dXNwZW5kZWRQYWdlKCpkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UpIDogbnVsbHB0cjsKKyAgICAg ICAgaWYgKHN1c3BlbmRlZFBhZ2UgJiYgc3VzcGVuZGVkUGFnZS0+ZmFpbGVkVG9TdXNwZW5kKCkp CisgICAgICAgICAgICBzdXNwZW5kZWRQYWdlID0gbnVsbHB0cjsKKworICAgICAgICBjb250aW51 ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MobmF2aWdhdGlvbiwgV1RGTW92ZShzdXNwZW5kZWRQYWdl KSwgV1RGTW92ZShwcm9jZXNzRm9yTmF2aWdhdGlvbiksIHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlD bGllbnQsIFdURk1vdmUoZGF0YSkpOwogICAgIH0pOwogfQogCkBAIC0yNzQ0LDI0ICsyNzUyLDQ1 IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZFBvbGljeURlY2lzaW9uKFdlYlBvbGljeUFj dGlvbiBhY3Rpb24sIEFQSTo6TmF2aWdhdGlvCiAgICAgc2VuZGVyLT5zZW5kKGFjdGlvbiwgbmF2 aWdhdGlvbiA/IG5hdmlnYXRpb24tPm5hdmlnYXRpb25JRCgpIDogMCwgZG93bmxvYWRJRCwgV1RG TW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmNvbnRpbnVl TmF2aWdhdGlvbkluTmV3UHJvY2VzcyhBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIHN0ZDo6 dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYgc3VzcGVuZGVkUGFnZVByb3h5LCBSZWY8 V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQg cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0 YT4mJiB3ZWJzaXRlUG9saWNpZXMpCit2b2lkIFdlYlBhZ2VQcm94eTo6Y29tbWl0UHJvdmlzaW9u YWxQYWdlKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3Ry aW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMy X3QgZnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiBjZXJ0aWZp Y2F0ZUluZm8sIGJvb2wgY29udGFpbnNQbHVnaW5Eb2N1bWVudCwgT3B0aW9uYWw8V2ViQ29yZTo6 SGFzSW5zZWN1cmVDb250ZW50PiBmb3JjZWRIYXNJbnNlY3VyZUNvbnRlbnQsIGNvbnN0IFVzZXJE YXRhJiB1c2VyRGF0YSkKIHsKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJj b250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3M6IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQ Ukl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQpOwotICAgIExP RyhMb2FkaW5nLCAiQ29udGludWluZyBuYXZpZ2F0aW9uICUiIFBSSXU2NCAiICclcycgaW4gYSBu ZXcgd2ViIHByb2Nlc3MiLCBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBuYXZpZ2F0aW9uLmxv Z2dpbmdTdHJpbmcoKSk7CisgICAgQVNTRVJUKG1fcHJvdmlzaW9uYWxQYWdlKTsKKyAgICBSRUxF QVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJjb21taXRQcm92aXNpb25hbFBhZ2U6IHByZXZp b3VzUElEID0gJWksIG5ld1BJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQsIG1fcHJvY2Vzcy0+ cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wcm92aXNpb25hbFBhZ2UtPnByb2Nlc3MoKS5wcm9jZXNz SWRlbnRpZmllcigpLCBtX3BhZ2VJRCk7CiAKLSAgICBSZWY8V2ViUHJvY2Vzc1Byb3h5PiBwcmV2 aW91c1Byb2Nlc3MgPSBtX3Byb2Nlc3MuY29weVJlZigpOwogICAgIE9wdGlvbmFsPHVpbnQ2NF90 PiBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzID0gbV9tYWluRnJhbWUgPyBtYWtlT3B0aW9u YWwobV9tYWluRnJhbWUtPmZyYW1lSUQoKSkgOiBXVEY6Om51bGxvcHQ7Ci0gICAgYXV0byBtYWlu RnJhbWVVUkwgPSBtX21haW5GcmFtZSA/IG1fbWFpbkZyYW1lLT51cmwoKSA6IFVSTCgpOwogCi0g ICAgQVNTRVJUKG1fcHJvY2Vzcy5wdHIoKSAhPSBwcm9jZXNzLnB0cigpKTsKKyAgICBBU1NFUlQo bV9wcm9jZXNzLnB0cigpICE9ICZtX3Byb3Zpc2lvbmFsUGFnZS0+cHJvY2VzcygpKTsKIAogICAg IHByb2Nlc3NEaWRUZXJtaW5hdGUoUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpOYXZpZ2F0aW9u U3dhcCk7CiAKICAgICBtX3Byb2Nlc3MtPnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZUlEKTsKLSAgICBib29s IGRpZFN1c3BlbmRQcmV2aW91c1BhZ2UgPSBzdXNwZW5kQ3VycmVudFBhZ2VJZlBvc3NpYmxlKG5h dmlnYXRpb24sIG1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MsIHByb2Nlc3NTd2FwUmVxdWVz dGVkQnlDbGllbnQpOworICAgIGF1dG8qIG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uU3RhdGUoKS5u YXZpZ2F0aW9uKG1fcHJvdmlzaW9uYWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSk7CisgICAgYm9vbCBk aWRTdXNwZW5kUHJldmlvdXNQYWdlID0gbmF2aWdhdGlvbiA/IHN1c3BlbmRDdXJyZW50UGFnZUlm UG9zc2libGUoKm5hdmlnYXRpb24sIG1haW5GcmFtZUlESW5QcmV2aW91c1Byb2Nlc3MsIG1fcHJv dmlzaW9uYWxQYWdlLT5wcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KCkpIDogZmFsc2U7CiAg ICAgbV9wcm9jZXNzLT5yZW1vdmVXZWJQYWdlKCp0aGlzLCBtX3BhZ2VJRCwgV2ViUHJvY2Vzc1By b3h5OjpFbmRzVXNpbmdEYXRhU3RvcmU6Ok5vKTsKIAotICAgIHN3YXBUb1dlYlByb2Nlc3MoV1RG TW92ZShwcm9jZXNzKSwgV1RGTW92ZShzdXNwZW5kZWRQYWdlUHJveHkpLCBkaWRTdXNwZW5kUHJl dmlvdXNQYWdlID8gSXNTd2FwRnJvbVN1c3BlbmRlZDo6WWVzIDogSXNTd2FwRnJvbVN1c3BlbmRl ZDo6Tm8pOworICAgIC8vIFRoZXJlIGlzIG5vIHdheSB3ZSdsbCBiZSBhYmxlIHRvIHJldHVybiB0 byB0aGUgcGFnZSBpbiB0aGUgcHJldmlvdXMgcGFnZSBzbyBjbG9zZSBpdC4KKyAgICBpZiAoIWRp ZFN1c3BlbmRQcmV2aW91c1BhZ2UpCisgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6Q2xvc2UoKSwgcGFnZUlEKCkpOworCisgICAgc3dhcFRvV2ViUHJvY2VzcyhtX3By b3Zpc2lvbmFsUGFnZS0+cHJvY2VzcygpLCBtX3Byb3Zpc2lvbmFsUGFnZS0+dGFrZURyYXdpbmdB cmVhKCksIG1fcHJvdmlzaW9uYWxQYWdlLT5tYWluRnJhbWUoKSk7CisKKyAgICBkaWRDb21taXRM b2FkRm9yRnJhbWUoZnJhbWVJRCwgbmF2aWdhdGlvbklELCBtaW1lVHlwZSwgZnJhbWVIYXNDdXN0 b21Db250ZW50UHJvdmlkZXIsIGZyYW1lTG9hZFR5cGUsIGNlcnRpZmljYXRlSW5mbywgY29udGFp bnNQbHVnaW5Eb2N1bWVudCwgZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCB1c2VyRGF0YSk7CisK KyAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IG51bGxwdHI7Cit9CisKK3ZvaWQgV2ViUGFnZVByb3h5 Ojpjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0 aW9uLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmIHN1c3BlbmRlZFBhZ2VQ cm94eSwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBuZXdQcm9jZXNzLCBQcm9jZXNzU3dhcFJlcXVl c3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIE9wdGlvbmFsPFdlYnNp dGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0ZVBvbGljaWVzKQoreworICAgIFJFTEVBU0VfTE9HX0lG X0FMTE9XRUQoTG9hZGluZywgImNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2Vzczogd2ViUElE ID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigp LCBtX3BhZ2VJRCk7CisgICAgTE9HKExvYWRpbmcsICJDb250aW51aW5nIG5hdmlnYXRpb24gJSIg UFJJdTY0ICIgJyVzJyBpbiBhIG5ldyB3ZWIgcHJvY2VzcyIsIG5hdmlnYXRpb24ubmF2aWdhdGlv bklEKCksIG5hdmlnYXRpb24ubG9nZ2luZ1N0cmluZygpKTsKKworICAgIGlmIChtX3Byb3Zpc2lv bmFsUGFnZSkgeworICAgICAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UtPm5hdmlnYXRpb25JRCgp ICE9IG5hdmlnYXRpb24ubmF2aWdhdGlvbklEKCkpCisgICAgICAgICAgICBtX3Byb3Zpc2lvbmFs UGFnZS0+Y2FuY2VsKCk7CisgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlID0gbnVsbHB0cjsKKyAg ICB9CisKKyAgICBtX3Byb3Zpc2lvbmFsUGFnZSA9IHN0ZDo6bWFrZV91bmlxdWU8UHJvdmlzaW9u YWxQYWdlUHJveHk+KCp0aGlzLCBuZXdQcm9jZXNzLmNvcHlSZWYoKSwgV1RGTW92ZShzdXNwZW5k ZWRQYWdlUHJveHkpLCBuYXZpZ2F0aW9uLm5hdmlnYXRpb25JRCgpLCBuYXZpZ2F0aW9uLmN1cnJl bnRSZXF1ZXN0SXNSZWRpcmVjdCgpLCBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCksIHByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpOwogCiAgICAgaWYgKGF1dG8qIGl0ZW0gPSBuYXZpZ2F0 aW9uLnRhcmdldEl0ZW0oKSkgewogICAgICAgICBMT0coTG9hZGluZywgIldlYlBhZ2VQcm94eSAl cCBjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MgdG8gYmFjayBpdGVtIFVSTCAlcyIsIHRo aXMsIGl0ZW0tPnVybCgpLnV0ZjgoKS5kYXRhKCkpOwpAQCAtMjc2OSw2NyArMjc5OCwyMiBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKEFQSTo6TmF2 aWdhdGlvbiYgbmF2aWdhdGlvbiwgcwogICAgICAgICBhdXRvIHRyYW5zYWN0aW9uID0gbV9wYWdl TG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CiAgICAgICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5k aW5nQVBJUmVxdWVzdFVSTCh0cmFuc2FjdGlvbiwgaXRlbS0+dXJsKCkpOwogCi0gICAgICAgIGF1 dG8gaXRlbVN0YXRlcyA9IG1fYmFja0ZvcndhcmRMaXN0LT5maWx0ZXJlZEl0ZW1TdGF0ZXMoW3Ro aXMsIHRhcmdldEl0ZW0gPSBpdGVtXShXZWJCYWNrRm9yd2FyZExpc3RJdGVtJiBpdGVtKSB7Ci0g ICAgICAgICAgICBpZiAoYXV0byogcGFnZSA9IGl0ZW0uc3VzcGVuZGVkUGFnZSgpKSB7Ci0gICAg ICAgICAgICAgICAgaWYgKCZwYWdlLT5wcm9jZXNzKCkgPT0gbV9wcm9jZXNzLnB0cigpKQotICAg ICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAg ICByZXR1cm4gJml0ZW0gIT0gdGFyZ2V0SXRlbTsKLSAgICAgICAgfSk7Ci0gICAgICAgIG1fcHJv Y2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6VXBkYXRlQmFja0ZvcndhcmRMaXN0Rm9yUmVh dHRhY2goV1RGTW92ZShpdGVtU3RhdGVzKSksIG1fcGFnZUlEKTsKLSAgICAgICAgbV9wcm9jZXNz LT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtKG5hdmlnYXRpb24u bmF2aWdhdGlvbklEKCksIGl0ZW0tPml0ZW1JRCgpLCAqbmF2aWdhdGlvbi5iYWNrRm9yd2FyZEZy YW1lTG9hZFR5cGUoKSwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXMsIFdURk1vdmUo d2Vic2l0ZVBvbGljaWVzKSksIG1fcGFnZUlEKTsKLSAgICAgICAgbV9wcm9jZXNzLT5yZXNwb25z aXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKLQorICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZS0+Z29U b0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uLCAqaXRlbSwgV1RGTW92ZSh3ZWJzaXRlUG9saWNp ZXMpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGlmIChtX2JhY2tGb3J3YXJkTGlz dC0+Y3VycmVudEl0ZW0oKSAmJiAobmF2aWdhdGlvbi5sb2NrQmFja0ZvcndhcmRMaXN0KCkgPT0g TG9ja0JhY2tGb3J3YXJkTGlzdDo6WWVzIHx8IG5hdmlnYXRpb24ubG9ja0hpc3RvcnkoKSA9PSBM b2NrSGlzdG9yeTo6WWVzKSkgewogICAgICAgICAvLyBJZiBXZWJDb3JlIGlzIHN1cHBvc2VkIHRv IGxvY2sgdGhlIGhpc3RvcnkgZm9yIHRoaXMgbG9hZCwgdGhlbiB0aGUgbmV3IHByb2Nlc3MgbmVl ZHMgdG8ga25vdyBhYm91dCB0aGUgY3VycmVudCBoaXN0b3J5IGl0ZW0gc28gaXQgY2FuIHVwZGF0 ZQogICAgICAgICAvLyBpdCBpbnN0ZWFkIG9mIGNyZWF0aW5nIGEgbmV3IG9uZS4KLSAgICAgICAg bV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRDdXJyZW50SGlzdG9yeUl0ZW1G b3JSZWF0dGFjaChtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKS0+aXRlbVN0YXRlKCkp LCBtX3BhZ2VJRCk7CisgICAgICAgIG5ld1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6 OlNldEN1cnJlbnRIaXN0b3J5SXRlbUZvclJlYXR0YWNoKG1fYmFja0ZvcndhcmRMaXN0LT5jdXJy ZW50SXRlbSgpLT5pdGVtU3RhdGUoKSksIG1fcGFnZUlEKTsKICAgICB9CiAKICAgICAvLyBGSVhN RTogV29yayBvdXQgdGltaW5nIG9mIHJlc3BvbmRpbmcgd2l0aCB0aGUgbGFzdCBwb2xpY3kgZGVs ZWdhdGUsIGV0YwogICAgIEFTU0VSVCghbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpLmlzRW1w dHkoKSk7CiAgICAgaWYgKGF1dG8mIHN1YnN0aXR1dGVEYXRhID0gbmF2aWdhdGlvbi5zdWJzdGl0 dXRlRGF0YSgpKQotICAgICAgICBsb2FkRGF0YVdpdGhOYXZpZ2F0aW9uKG5hdmlnYXRpb24sIHsg c3Vic3RpdHV0ZURhdGEtPmNvbnRlbnQuZGF0YSgpLCBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5z aXplKCkgfSwgc3Vic3RpdHV0ZURhdGEtPk1JTUVUeXBlLCBzdWJzdGl0dXRlRGF0YS0+ZW5jb2Rp bmcsIHN1YnN0aXR1dGVEYXRhLT5iYXNlVVJMLCBzdWJzdGl0dXRlRGF0YS0+dXNlckRhdGEuZ2V0 KCksIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNpdGVQb2xp Y2llcykpOworICAgICAgICBtX3Byb3Zpc2lvbmFsUGFnZS0+bG9hZERhdGEobmF2aWdhdGlvbiwg eyBzdWJzdGl0dXRlRGF0YS0+Y29udGVudC5kYXRhKCksIHN1YnN0aXR1dGVEYXRhLT5jb250ZW50 LnNpemUoKSB9LCBzdWJzdGl0dXRlRGF0YS0+TUlNRVR5cGUsIHN1YnN0aXR1dGVEYXRhLT5lbmNv ZGluZywgc3Vic3RpdHV0ZURhdGEtPmJhc2VVUkwsIHN1YnN0aXR1dGVEYXRhLT51c2VyRGF0YS5n ZXQoKSwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKICAgICBlbHNlCi0gICAgICAgIGxvYWRS ZXF1ZXN0V2l0aE5hdmlnYXRpb24obmF2aWdhdGlvbiwgUmVzb3VyY2VSZXF1ZXN0IHsgbmF2aWdh dGlvbi5jdXJyZW50UmVxdWVzdCgpIH0sIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQ b2xpY3k6OlNob3VsZEFsbG93RXh0ZXJuYWxTY2hlbWVzLCBudWxscHRyLCBTaG91bGRUcmVhdEFz Q29udGludWluZ0xvYWQ6OlllcywgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKLQotICAgIEFT U0VSVCghbV9tYWluRnJhbWUpOwotICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVyID0gW3Ro aXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCBuYXZpZ2F0aW9uSUQgPSBuYXZpZ2F0 aW9uLm5hdmlnYXRpb25JRCgpLCByZXF1ZXN0ID0gIG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3Qo KSwgbWFpbkZyYW1lVVJMLCBpc1NlcnZlclJlZGlyZWN0ID0gbmF2aWdhdGlvbi5jdXJyZW50UmVx dWVzdElzUmVkaXJlY3QoKV0oKSBtdXRhYmxlIHsKLSAgICAgICAgaWYgKCF3ZWFrVGhpcykKLSAg ICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBBU1NFUlQobV9tYWluRnJhbWUpOwotICAgICAg ICAvLyBUaGlzIG5hdmlnYXRpb24gd2FzIGRlc3Ryb3llZCBzbyBubyBuZWVkIHRvIG5vdGlmeSBv ZiByZWRpcmVjdC4KLSAgICAgICAgaWYgKCFuYXZpZ2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG5h dmlnYXRpb25JRCkpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgLy8gUmVzdG9yZSB0 aGUgbWFpbiBmcmFtZSdzIGNvbW1pdHRlZCBVUkwgYXMgc29tZSBjbGllbnRzIG1heSByZWx5IG9u IGl0IHVudGlsIHRoZSBuZXh0IGxvYWQgaXMgY29tbWl0dGVkLgotICAgICAgICBtX21haW5GcmFt ZS0+ZnJhbWVMb2FkU3RhdGUoKS5zZXRVUkwobWFpbkZyYW1lVVJMKTsKLQotICAgICAgICAvLyBO b3JtYWxseSwgbm90aWZpY2F0aW9uIG9mIGEgc2VydmVyIHJlZGlyZWN0IGNvbWVzIGZyb20gdGhl IFdlYkNvbnRlbnQgcHJvY2Vzcy4KLSAgICAgICAgLy8gSWYgd2UgYXJlIHByb2Nlc3Mgc3dhcHBp bmcgaW4gcmVzcG9uc2UgdG8gYSBzZXJ2ZXIgcmVkaXJlY3QgdGhlbiB0aGF0IG5vdGlmaWNhdGlv biB3aWxsIG5vdCBjb21lIGZyb20gdGhlIG5ldyBXZWJDb250ZW50IHByb2Nlc3MuCi0gICAgICAg IC8vIEluIHRoaXMgY2FzZSB3ZSBoYXZlIHRoZSBVSVByb2Nlc3Mgc3ludGhlc2l6ZSB0aGUgcmVk aXJlY3Qgbm90aWZpY2F0aW9uIGF0IHRoZSBhcHByb3ByaWF0ZSB0aW1lLgotICAgICAgICBpZiAo aXNTZXJ2ZXJSZWRpcmVjdCkgewotICAgICAgICAgICAgbV9tYWluRnJhbWUtPmZyYW1lTG9hZFN0 YXRlKCkuZGlkU3RhcnRQcm92aXNpb25hbExvYWQocmVxdWVzdC51cmwoKSk7Ci0gICAgICAgICAg ICBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZShtX21h aW5GcmFtZS0+ZnJhbWVJRCgpLCBuYXZpZ2F0aW9uSUQsIFdURk1vdmUocmVxdWVzdCksIHsgfSk7 Ci0gICAgICAgIH0KLSAgICB9OwotCi0gICAgaWYgKCFtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCku Y29uZmlndXJhdGlvbigpLnByb2Nlc3NTd2Fwc09uV2luZG93T3BlbldpdGhPcGVuZXIoKSB8fCAh aXNQYWdlT3BlbmVkQnlET01TaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSB8fCAhbWFpbkZy YW1lSURJblByZXZpb3VzUHJvY2VzcykgewotICAgICAgICAvLyBUaGVyZSBpcyBubyB3YXkgd2Un bGwgYmUgYWJsZSB0byByZXR1cm4gdG8gdGhlIHBhZ2UgaW4gdGhlIHByZXZpb3VzIHBhZ2Ugc28g Y2xvc2UgaXQuCi0gICAgICAgIGlmICghZGlkU3VzcGVuZFByZXZpb3VzUGFnZSkKLSAgICAgICAg ICAgIHByZXZpb3VzUHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9w YWdlSUQpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgbV9tYWluRnJhbWVXaW5kb3dD cmVhdGlvbkhhbmRsZXIgPSBbdGhpcywgcHJldmlvdXNQcm9jZXNzID0gV1RGTW92ZShwcmV2aW91 c1Byb2Nlc3MpLCBtYWluRnJhbWVJREluUHJldmlvdXNQcm9jZXNzID0gKm1haW5GcmFtZUlESW5Q cmV2aW91c1Byb2Nlc3NdKGNvbnN0IEdsb2JhbFdpbmRvd0lkZW50aWZpZXImIHdpbmRvd0lkZW50 aWZpZXIpIHsKLSAgICAgICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKLSAgICAgICAgR2xvYmFsRnJh bWVJZGVudGlmaWVyIG5hdmlnYXRlZEZyYW1lSWRlbnRpZmllckluTmV3UHJvY2VzcyB7IHBhZ2VJ RCgpLCBtX21haW5GcmFtZS0+ZnJhbWVJRCgpIH07Ci0gICAgICAgIHByZXZpb3VzUHJvY2Vzcy0+ c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RnJhbWVCZWNhbWVSZW1vdGUobWFpbkZyYW1lSURJblBy ZXZpb3VzUHJvY2VzcywgbmF2aWdhdGVkRnJhbWVJZGVudGlmaWVySW5OZXdQcm9jZXNzLCB3aW5k b3dJZGVudGlmaWVyKSwgcGFnZUlEKCkpOwotICAgIH07CisgICAgICAgIG1fcHJvdmlzaW9uYWxQ YWdlLT5sb2FkUmVxdWVzdChuYXZpZ2F0aW9uLCBSZXNvdXJjZVJlcXVlc3QgeyBuYXZpZ2F0aW9u LmN1cnJlbnRSZXF1ZXN0KCkgfSwgV2ViQ29yZTo6U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGlj eTo6U2hvdWxkQWxsb3dFeHRlcm5hbFNjaGVtZXMsIG51bGxwdHIsIFdURk1vdmUod2Vic2l0ZVBv bGljaWVzKSk7CiB9CiAKIGJvb2wgV2ViUGFnZVByb3h5Ojppc1BhZ2VPcGVuZWRCeURPTVNob3dp bmdJbml0aWFsRW1wdHlEb2N1bWVudCgpIGNvbnN0CkBAIC0zNjg3LDI1ICszNjcxLDIwIEBAIHZv aWQgV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUodWludDY0X3QgZnJhbWVJRCkKIAog ICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKLSAgICBN RVNTQUdFX0NIRUNLKCFtX21haW5GcmFtZSk7Ci0gICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3Mt PmNhbkNyZWF0ZUZyYW1lKGZyYW1lSUQpKTsKKyAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5n ZXQoKSwgIW1fbWFpbkZyYW1lKTsKKyAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwg bV9wcm9jZXNzLT5jYW5DcmVhdGVGcmFtZShmcmFtZUlEKSk7CiAKICAgICBtX21haW5GcmFtZSA9 IFdlYkZyYW1lUHJveHk6OmNyZWF0ZSgqdGhpcywgZnJhbWVJRCk7CiAKICAgICAvLyBBZGQgdGhl IGZyYW1lIHRvIHRoZSBwcm9jZXNzIHdpZGUgbWFwLgogICAgIG1fcHJvY2Vzcy0+ZnJhbWVDcmVh dGVkKGZyYW1lSUQsICptX21haW5GcmFtZSk7Ci0KLSAgICBpZiAobV9tYWluRnJhbWVDcmVhdGlv bkhhbmRsZXIpIHsKLSAgICAgICAgbV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIoKTsKLSAgICAg ICAgbV9tYWluRnJhbWVDcmVhdGlvbkhhbmRsZXIgPSBudWxscHRyOwotICAgIH0KIH0KIAogdm9p ZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVN1YmZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCiB7CiAg ICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAotICAgIE1F U1NBR0VfQ0hFQ0sobV9tYWluRnJhbWUpOworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdl dCgpLCBtX21haW5GcmFtZSk7CiAKICAgICAvLyBUaGUgRGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlv bkFjdGlvblN5bmMgSVBDIGlzIHN5bmNocm9ub3VzIGFuZCBtYXkgdGhlcmVmb3JlIGdldCBwcm9j ZXNzZWQgYmVmb3JlIHRoZSBEaWRDcmVhdGVTdWJmcmFtZSBvbmUuCiAgICAgLy8gV2hlbiB0aGlz IGhhcHBlbnMsIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25TeW5jKCkgY2FsbHMgZGlk Q3JlYXRlU3ViZnJhbWUoKSBhbmQgd2UgbmVlZCB0byBpZ25vcmUgdGhlIERpZENyZWF0ZVN1YmZy YW1lCkBAIC0zNzEzLDcgKzM2OTIsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlU3Vi ZnJhbWUodWludDY0X3QgZnJhbWVJRCkKICAgICBpZiAobV9wcm9jZXNzLT53ZWJGcmFtZShmcmFt ZUlEKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MtPmNh bkNyZWF0ZUZyYW1lKGZyYW1lSUQpKTsKKyAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQo KSwgbV9wcm9jZXNzLT5jYW5DcmVhdGVGcmFtZShmcmFtZUlEKSk7CiAgICAgCiAgICAgYXV0byBz dWJGcmFtZSA9IFdlYkZyYW1lUHJveHk6OmNyZWF0ZSgqdGhpcywgZnJhbWVJRCk7CiAKQEAgLTM3 MjMsMTAgKzM3MDIsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlU3ViZnJhbWUodWlu dDY0X3QgZnJhbWVJRCkKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVdpbmRvdyh1aW50 NjRfdCBmcmFtZUlELCBHbG9iYWxXaW5kb3dJZGVudGlmaWVyJiYgd2luZG93SWRlbnRpZmllcikK IHsKLSAgICBpZiAobV9tYWluRnJhbWUgJiYgbV9tYWluRnJhbWUtPmZyYW1lSUQoKSA9PSBmcmFt ZUlEKSB7Ci0gICAgICAgIGlmIChhdXRvIG1haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlciA9 IFdURk1vdmUobV9tYWluRnJhbWVXaW5kb3dDcmVhdGlvbkhhbmRsZXIpKQotICAgICAgICAgICAg bWFpbkZyYW1lV2luZG93Q3JlYXRpb25IYW5kbGVyKHdpbmRvd0lkZW50aWZpZXIpOwotICAgIH0K IH0KIAogZG91YmxlIFdlYlBhZ2VQcm94eTo6ZXN0aW1hdGVkUHJvZ3Jlc3MoKSBjb25zdApAQCAt Mzc3OSwzMyArMzc1NCwzNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRGVzdHJveU5hdmlnYXRp b24odWludDY0X3QgbmF2aWdhdGlvbklEKQogewogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJv dGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKKyAgICAvLyBPbiBwcm9jZXNzLXN3YXAsIHRoZSBwcmV2 aW91cyBwcm9jZXNzIHRyaWVzIHRvIGRlc3Ryb3kgdGhlIG5hdmlnYXRpb24gYnV0IHRoZSBwcm92 aXNpb25hbCBwcm9jZXNzIGlzIGFjdHVhbGx5IHRha2luZyBvdmVyIHRoZSBuYXZpZ2F0aW9uLgor ICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZSAmJiBtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlv bklEKCkgPT0gbmF2aWdhdGlvbklEKQorICAgICAgICByZXR1cm47CisKICAgICAvLyBGSVhNRTog TWVzc2FnZSBjaGVjayB0aGUgbmF2aWdhdGlvbklELgogICAgIG1fbmF2aWdhdGlvblN0YXRlLT5k aWREZXN0cm95TmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94 eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50 NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmIHVybCwgVVJMJiYgdW5yZWFjaGFibGVVUkwsIGNvbnN0 IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lU2hhcmVkKG1fcHJvY2VzcywgZnJhbWVJRCwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKHVybCks IFdURk1vdmUodW5yZWFjaGFibGVVUkwpLCB1c2VyRGF0YSk7Cit9CisKK3ZvaWQgV2ViUGFnZVBy b3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKFdlYlByb2Nlc3NQcm94 eSYgcHJvY2VzcywgdWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwm JiB1cmwsIFVSTCYmIHVucmVhY2hhYmxlVVJMLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCiB7 CiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAotICAg IFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKLSAg ICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKLSAgICBNRVNTQUdFX0NIRUNLX1VSTCh1cmwpOworICAg IFdlYkZyYW1lUHJveHkqIGZyYW1lID0gcHJvY2Vzcy53ZWJGcmFtZShmcmFtZUlEKTsKKyAgICBN RVNTQUdFX0NIRUNLKHByb2Nlc3MsIGZyYW1lKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChwcm9j ZXNzLCB1cmwpOwogCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBtZXNzYWdlIGNoZWNrIHRoYXQg bmF2aWdhdGlvbklEIGlzIG5vdCB6ZXJvIGhlcmUsIGJ1dCBpdCdzIGN1cnJlbnRseSB6ZXJvIGZv ciBzb21lIG5hdmlnYXRpb25zIHRocm91Z2ggdGhlIHBhZ2UgY2FjaGUuCiAgICAgUmVmUHRyPEFQ STo6TmF2aWdhdGlvbj4gbmF2aWdhdGlvbjsKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkg JiYgbmF2aWdhdGlvbklEKQogICAgICAgICBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0YXRlKCku bmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpOwogCi0gICAgLy8gSWYgdGhpcyBzZWVtaW5nbHkgbmV3 IGxvYWQgaXMgYWN0dWFsbHkgY29udGludWluZyBhIHNlcnZlciByZWRpcmVjdCBmb3IgYSBwcmV2 aW91cyBuYXZpZ2F0aW9uIGluIGEgbmV3IHByb2Nlc3MsCi0gICAgLy8gdGhlbiB3ZSBpZ25vcmUg dGhpcyBub3RpZmljYXRpb24uCi0gICAgaWYgKG5hdmlnYXRpb24gJiYgbmF2aWdhdGlvbi0+Y3Vy cmVudFJlcXVlc3RJc1JlZGlyZWN0KCkpIHsKLSAgICAgICAgYXV0byBuYXZpZ2F0aW9uUHJvY2Vz c0lkZW50aWZpZXIgPSBuYXZpZ2F0aW9uLT5jdXJyZW50UmVxdWVzdFByb2Nlc3NJZGVudGlmaWVy KCk7Ci0gICAgICAgIGlmIChuYXZpZ2F0aW9uUHJvY2Vzc0lkZW50aWZpZXIgJiYgKm5hdmlnYXRp b25Qcm9jZXNzSWRlbnRpZmllciAhPSBtX3Byb2Nlc3MtPmNvcmVQcm9jZXNzSWRlbnRpZmllcigp KQotICAgICAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIExPRyhMb2FkaW5nLCAiV2ViUGFn ZVByb3h5ICUiIFBSSXU2NCAiIGluIHByb2Nlc3MgcGlkICVpIGRpZFN0YXJ0UHJvdmlzaW9uYWxM b2FkRm9yRnJhbWUgdG8gZnJhbWVJRCAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEICUiIFBSSXU2 NCAiLCB1cmwgJXMiLCBtX3BhZ2VJRCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBm cmFtZUlELCBuYXZpZ2F0aW9uSUQsIHVybC5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKLSAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQ Ukl1NjQsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbV9wYWdlSUQsIGZyYW1lSUQp OworICAgIExPRyhMb2FkaW5nLCAiV2ViUGFnZVByb3h5ICUiIFBSSXU2NCAiIGluIHByb2Nlc3Mg cGlkICVpIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUgdG8gZnJhbWVJRCAlIiBQUkl1 NjQgIiwgbmF2aWdhdGlvbklEICUiIFBSSXU2NCAiLCB1cmwgJXMiLCBtX3BhZ2VJRCwgcHJvY2Vz cy5wcm9jZXNzSWRlbnRpZmllcigpLCBmcmFtZUlELCBuYXZpZ2F0aW9uSUQsIHVybC5zdHJpbmco KS51dGY4KCkuZGF0YSgpKTsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJk aWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOiB3ZWJQSUQgPSAlaSwgcGFnZUlEID0gJSIg UFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQsIHByb2Nlc3MucHJvY2Vzc0lkZW50aWZpZXIo KSwgbV9wYWdlSUQsIGZyYW1lSUQpOwogCiAgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFnZUxv YWRTdGF0ZS50cmFuc2FjdGlvbigpOwogCkBAIC0zODI0LDIxICszODAwLDI2IEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1l SUQsIHVpbnQ2NF90IG5hCiAKICAgICBtX3BhZ2VMb2FkU3RhdGUuY29tbWl0Q2hhbmdlcygpOwog ICAgIGlmIChtX2xvYWRlckNsaWVudCkKLSAgICAgICAgbV9sb2FkZXJDbGllbnQtPmRpZFN0YXJ0 UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoKnRoaXMsICpmcmFtZSwgbmF2aWdhdGlvbi5nZXQoKSwg bV9wcm9jZXNzLT50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVzZXJEYXRhLm9iamVjdCgpKS5n ZXQoKSk7CisgICAgICAgIG1fbG9hZGVyQ2xpZW50LT5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lKCp0aGlzLCAqZnJhbWUsIG5hdmlnYXRpb24uZ2V0KCksIHByb2Nlc3MudHJhbnNmb3Jt SGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOwogICAgIGVsc2UgaWYg KGZyYW1lLT5pc01haW5GcmFtZSgpKQotICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZFN0 YXJ0UHJvdmlzaW9uYWxOYXZpZ2F0aW9uKCp0aGlzLCBuYXZpZ2F0aW9uLmdldCgpLCBtX3Byb2Nl c3MtPnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHModXNlckRhdGEub2JqZWN0KCkpLmdldCgpKTsK KyAgICAgICAgbV9uYXZpZ2F0aW9uQ2xpZW50LT5kaWRTdGFydFByb3Zpc2lvbmFsTmF2aWdhdGlv bigqdGhpcywgbmF2aWdhdGlvbi5nZXQoKSwgcHJvY2Vzcy50cmFuc2Zvcm1IYW5kbGVzVG9PYmpl Y3RzKHVzZXJEYXRhLm9iamVjdCgpKS5nZXQoKSk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5Ojpk aWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRf dCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFJlc291cmNlUmVxdWVzdCYmIHJlcXVl c3QsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3sKKyAgICBkaWRSZWNlaXZlU2VydmVyUmVk aXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZVNoYXJlZChtX3Byb2Nlc3MsIGZyYW1lSUQs IG5hdmlnYXRpb25JRCwgV1RGTW92ZShyZXF1ZXN0KSwgdXNlckRhdGEpOworfQorCit2b2lkIFdl YlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWVTaGFyZWQoV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzLCB1aW50NjRfdCBmcmFtZUlELCB1 aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIGNvbnN0IFVz ZXJEYXRhJiB1c2VyRGF0YSkKIHsKICAgICBMT0coTG9hZGluZywgIldlYlBhZ2VQcm94eTo6ZGlk UmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUgdG8gZnJhbWVJ RCAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEICUiIFBSSXU2NCAiLCB1cmwgJXMiLCBmcmFtZUlE LCBuYXZpZ2F0aW9uSUQsIHJlcXVlc3QudXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7Ci0g ICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5nLCAiZGlkUmVjZWl2ZVNlcnZlclJlZGly ZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQ Ukl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmll cigpLCBtX3BhZ2VJRCwgZnJhbWVJRCk7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2Fk aW5nLCAiZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6 IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCwg cHJvY2Vzcy5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCwgZnJhbWVJRCk7CiAKICAgICBQ YWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCi0gICAgV2ViRnJh bWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NB R0VfQ0hFQ0soZnJhbWUpOwotICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHJlcXVlc3QudXJsKCkpOwor ICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gcHJvY2Vzcy53ZWJGcmFtZShmcmFtZUlEKTsKKyAg ICBNRVNTQUdFX0NIRUNLKHByb2Nlc3MsIGZyYW1lKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChw cm9jZXNzLCByZXF1ZXN0LnVybCgpKTsKIAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbWVzc2Fn ZSBjaGVjayB0aGF0IG5hdmlnYXRpb25JRCBpcyBub3QgemVybyBoZXJlLCBidXQgaXQncyBjdXJy ZW50bHkgemVybyBmb3Igc29tZSBuYXZpZ2F0aW9ucyB0aHJvdWdoIHRoZSBwYWdlIGNhY2hlLgog ICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uSUQgPyBu YXZpZ2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCkgOiBudWxscHRyOwpAQCAt Mzg1NCw5ICszODM1LDkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVTZXJ2ZXJSZWRp cmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGYKIAogICAgIG1fcGFnZUxv YWRTdGF0ZS5jb21taXRDaGFuZ2VzKCk7CiAgICAgaWYgKG1fbG9hZGVyQ2xpZW50KQotICAgICAg ICBtX2xvYWRlckNsaWVudC0+ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxM b2FkRm9yRnJhbWUoKnRoaXMsICpmcmFtZSwgZnJhbWUtPmlzTWFpbkZyYW1lKCkgPyBuYXZpZ2F0 aW9uLmdldCgpIDogbnVsbHB0ciwgbV9wcm9jZXNzLT50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3Rz KHVzZXJEYXRhLm9iamVjdCgpKS5nZXQoKSk7CisgICAgICAgIG1fbG9hZGVyQ2xpZW50LT5kaWRS ZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSgqdGhpcywgKmZy YW1lLCBmcmFtZS0+aXNNYWluRnJhbWUoKSA/IG5hdmlnYXRpb24uZ2V0KCkgOiBudWxscHRyLCBw cm9jZXNzLnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHModXNlckRhdGEub2JqZWN0KCkpLmdldCgp KTsKICAgICBlbHNlIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSkKLSAgICAgICAgbV9uYXZpZ2F0 aW9uQ2xpZW50LT5kaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbE5hdmlnYXRp b24oKnRoaXMsIG5hdmlnYXRpb24uZ2V0KCksIG1fcHJvY2Vzcy0+dHJhbnNmb3JtSGFuZGxlc1Rv T2JqZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOworICAgICAgICBtX25hdmlnYXRpb25D bGllbnQtPmRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTmF2aWdhdGlvbigq dGhpcywgbmF2aWdhdGlvbi5nZXQoKSwgcHJvY2Vzcy50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3Rz KHVzZXJEYXRhLm9iamVjdCgpKS5nZXQoKSk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5Ojp3aWxs UGVyZm9ybUNsaWVudFJlZGlyZWN0Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU3Ry aW5nJiB1cmwsIGRvdWJsZSBkZWxheSwgV2ViQ29yZTo6TG9ja0JhY2tGb3J3YXJkTGlzdCkKQEAg LTM4NjYsNyArMzg0Nyw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp3aWxsUGVyZm9ybUNsaWVudFJl ZGlyZWN0Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU3RyCiAgICAgUGFnZUNsaWVu dFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAogICAgIFdlYkZyYW1lUHJveHkq IGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNL KGZyYW1lKTsKKyAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgZnJhbWUpOwogCiAg ICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpKQogICAgICAgICBtX25hdmlnYXRpb25DbGllbnQt PndpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3QoKnRoaXMsIHVybCwgZGVsYXkpOwpAQCAtMzg3OSwy MCArMzg2MCwyNSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3RG b3JGcmFtZSh1aW50NjRfdCBmcmFtZUlEKQogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVj dG9yKHBhZ2VDbGllbnQoKSk7CiAKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vz cy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CisgICAgTUVT U0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKIAogICAgIGlmIChmcmFtZS0+aXNN YWluRnJhbWUoKSkKICAgICAgICAgbV9uYXZpZ2F0aW9uQ2xpZW50LT5kaWRDYW5jZWxDbGllbnRS ZWRpcmVjdCgqdGhpcyk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpkaWRDaGFuZ2VQcm92aXNp b25hbFVSTEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90LCBVUkwmJiB1cmwpCit2 b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZSh1aW50NjRf dCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmIHVybCkKK3sKKyAgICBkaWRD aGFuZ2VQcm92aXNpb25hbFVSTEZvckZyYW1lU2hhcmVkKG1fcHJvY2VzcywgZnJhbWVJRCwgbmF2 aWdhdGlvbklELCBXVEZNb3ZlKHVybCkpOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ2hh bmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZVNoYXJlZChXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3Ms IHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90LCBVUkwmJiB1cmwpCiB7CiAgICAgUGFnZUNsaWVu dFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAotICAgIFdlYkZyYW1lUHJveHkq IGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNL KGZyYW1lKTsKLSAgICBNRVNTQUdFX0NIRUNLKGZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLnN0YXRl KCkgPT0gRnJhbWVMb2FkU3RhdGU6OlN0YXRlOjpQcm92aXNpb25hbCk7Ci0gICAgTUVTU0FHRV9D SEVDS19VUkwodXJsKTsKKyAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IHByb2Nlc3Mud2ViRnJh bWUoZnJhbWVJRCk7CisgICAgTUVTU0FHRV9DSEVDSyhwcm9jZXNzLCBmcmFtZSk7CisgICAgTUVT U0FHRV9DSEVDSyhwcm9jZXNzLCBmcmFtZS0+ZnJhbWVMb2FkU3RhdGUoKS5zdGF0ZSgpID09IEZy YW1lTG9hZFN0YXRlOjpTdGF0ZTo6UHJvdmlzaW9uYWwpOworICAgIE1FU1NBR0VfQ0hFQ0tfVVJM KHByb2Nlc3MsIHVybCk7CiAKICAgICBhdXRvIHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRl LnRyYW5zYWN0aW9uKCk7CiAKQEAgLTM5MDYsMTYgKzM4OTIsMjYgQEAgdm9pZCBXZWJQYWdlUHJv eHk6OmRpZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWlu dDY0X3QsIFUKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JG cmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2Vj dXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNp b25hbFVSTCwgY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IsIGNvbnN0IFVzZXJEYXRhJiB1c2Vy RGF0YSkKIHsKLSAgICBMT0coTG9hZGluZywgIihMb2FkaW5nKSBXZWJQYWdlUHJveHkgJSIgUFJJ dTY0ICIgaW4gd2ViIHByb2Nlc3MgcGlkICVpIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFt ZSB0byBwcm92aXNpb25hbFVSTCAlcyIsIG1fcGFnZUlELCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVu dGlmaWVyKCksIHByb3Zpc2lvbmFsVVJMLnV0ZjgoKS5kYXRhKCkpOwotICAgIFJFTEVBU0VfTE9H X0lGX0FMTE9XRUQoUHJvY2VzcywgImRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZTogd2Vi UElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIGRv bWFpbiA9ICVzLCBjb2RlID0gJWQiLCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1f cGFnZUlELCBmcmFtZUlELCBlcnJvci5kb21haW4oKS51dGY4KCkuZGF0YSgpLCBlcnJvci5lcnJv ckNvZGUoKSk7CisgICAgaWYgKG1fcHJvdmlzaW9uYWxQYWdlICYmIG1fcHJvdmlzaW9uYWxQYWdl LT5uYXZpZ2F0aW9uSUQoKSA9PSBuYXZpZ2F0aW9uSUQpIHsKKyAgICAgICAgLy8gVGhlIGxvYWQg ZGlkIG5vdCBmYWlsLCBpdCBpcyBtZXJlbHkgaGFwcGVuaW5nIGluIGEgbmV3IHByb3Zpc2lvbmFs IHByb2Nlc3MuCisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBkaWRGYWlsUHJvdmlzaW9u YWxMb2FkRm9yRnJhbWVTaGFyZWQobV9wcm9jZXNzLCBmcmFtZUlELCBmcmFtZVNlY3VyaXR5T3Jp Z2luLCBuYXZpZ2F0aW9uSUQsIHByb3Zpc2lvbmFsVVJMLCBlcnJvciwgdXNlckRhdGEpOworfQor Cit2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVk KFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcywgdWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2VjdXJp dHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQs IGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwsIGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9y LCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCit7CisgICAgTE9HKExvYWRpbmcsICIoTG9hZGlu ZykgV2ViUGFnZVByb3h5ICUiIFBSSXU2NCAiIGluIHdlYiBwcm9jZXNzIHBpZCAlaSBkaWRGYWls UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUgdG8gcHJvdmlzaW9uYWxVUkwgJXMiLCBtX3BhZ2VJRCwg cHJvY2Vzcy5wcm9jZXNzSWRlbnRpZmllcigpLCBwcm92aXNpb25hbFVSTC51dGY4KCkuZGF0YSgp KTsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3MsICJkaWRGYWlsUHJvdmlzaW9u YWxMb2FkRm9yRnJhbWU6IHdlYlBJRCA9ICVpLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJ RCA9ICUiIFBSSXU2NCAiLCBkb21haW4gPSAlcywgY29kZSA9ICVkIiwgcHJvY2Vzcy5wcm9jZXNz SWRlbnRpZmllcigpLCBtX3BhZ2VJRCwgZnJhbWVJRCwgZXJyb3IuZG9tYWluKCkudXRmOCgpLmRh dGEoKSwgZXJyb3IuZXJyb3JDb2RlKCkpOwogCiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90 ZWN0b3IocGFnZUNsaWVudCgpKTsKIAotICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9wcm9j ZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKKyAgICBX ZWJGcmFtZVByb3h5KiBmcmFtZSA9IHByb2Nlc3Mud2ViRnJhbWUoZnJhbWVJRCk7CisgICAgTUVT U0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKIAogICAgIGlmIChtX2NvbnRyb2xs ZWRCeUF1dG9tYXRpb24pIHsKLSAgICAgICAgaWYgKGF1dG8qIGF1dG9tYXRpb25TZXNzaW9uID0g cHJvY2VzcygpLnByb2Nlc3NQb29sKCkuYXV0b21hdGlvblNlc3Npb24oKSkKKyAgICAgICAgaWYg KGF1dG8qIGF1dG9tYXRpb25TZXNzaW9uID0gcHJvY2Vzcy5wcm9jZXNzUG9vbCgpLmF1dG9tYXRp b25TZXNzaW9uKCkpCiAgICAgICAgICAgICBhdXRvbWF0aW9uU2Vzc2lvbi0+bmF2aWdhdGlvbk9j Y3VycmVkRm9yRnJhbWUoKmZyYW1lKTsKICAgICB9CiAKQEAgLTM5NDAsMTUgKzM5MzYsMTkgQEAg dm9pZCBXZWJQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRf dCBmcmFtZUlELCBjb25zdCBTZWN1cmkKICAgICBtX2ZhaWxpbmdQcm92aXNpb25hbExvYWRVUkwg PSBwcm92aXNpb25hbFVSTDsKIAogICAgIGlmIChtX2xvYWRlckNsaWVudCkKLSAgICAgICAgbV9s b2FkZXJDbGllbnQtPmRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZSgqdGhp cywgKmZyYW1lLCBuYXZpZ2F0aW9uLmdldCgpLCBlcnJvciwgbV9wcm9jZXNzLT50cmFuc2Zvcm1I YW5kbGVzVG9PYmplY3RzKHVzZXJEYXRhLm9iamVjdCgpKS5nZXQoKSk7CisgICAgICAgIG1fbG9h ZGVyQ2xpZW50LT5kaWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWUoKnRoaXMs ICpmcmFtZSwgbmF2aWdhdGlvbi5nZXQoKSwgZXJyb3IsIHByb2Nlc3MudHJhbnNmb3JtSGFuZGxl c1RvT2JqZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOwogICAgIGVsc2UgaWYgKGZyYW1l LT5pc01haW5GcmFtZSgpKQotICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZEZhaWxQcm92 aXNpb25hbE5hdmlnYXRpb25XaXRoRXJyb3IoKnRoaXMsICpmcmFtZSwgbmF2aWdhdGlvbi5nZXQo KSwgZXJyb3IsIG1fcHJvY2Vzcy0+dHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5v YmplY3QoKSkuZ2V0KCkpOworICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZEZhaWxQcm92 aXNpb25hbE5hdmlnYXRpb25XaXRoRXJyb3IoKnRoaXMsICpmcmFtZSwgbmF2aWdhdGlvbi5nZXQo KSwgZXJyb3IsIHByb2Nlc3MudHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5vYmpl Y3QoKSkuZ2V0KCkpOwogICAgIGVsc2UgewotICAgICAgICAgICAgLy8gRklYTUU6IEdldCB0aGUg bWFpbiBmcmFtZSdzIGN1cnJlbnQgbmF2aWdhdGlvbi4KLSAgICAgICAgICAgIG1fbmF2aWdhdGlv bkNsaWVudC0+ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEluU3ViZnJhbWVXaXRoRXJyb3IoKnRoaXMs ICpmcmFtZSwgZnJhbWVTZWN1cml0eU9yaWdpbiwgbnVsbHB0ciwgZXJyb3IsIG1fcHJvY2Vzcy0+ dHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOworICAg ICAgICAvLyBGSVhNRTogR2V0IHRoZSBtYWluIGZyYW1lJ3MgY3VycmVudCBuYXZpZ2F0aW9uLgor ICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZEZhaWxQcm92aXNpb25hbExvYWRJblN1YmZy YW1lV2l0aEVycm9yKCp0aGlzLCAqZnJhbWUsIGZyYW1lU2VjdXJpdHlPcmlnaW4sIG51bGxwdHIs IGVycm9yLCBwcm9jZXNzLnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHModXNlckRhdGEub2JqZWN0 KCkpLmdldCgpKTsKICAgICB9CiAKICAgICBtX2ZhaWxpbmdQcm92aXNpb25hbExvYWRVUkwgPSB7 IH07CisKKyAgICAvLyBJZiB0aGUgcHJvdmlzaW9uYWwgcGFnZSdzIGxvYWQgZmFpbHMgdGhlbiB3 ZSBkZXN0cm95IHRoZSBwcm92aXNpb25hbCBwYWdlLgorICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFn ZSAmJiBtX3Byb3Zpc2lvbmFsUGFnZS0+bWFpbkZyYW1lKCkgPT0gZnJhbWUpCisgICAgICAgIG1f cHJvdmlzaW9uYWxQYWdlID0gbnVsbHB0cjsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmNsZWFy TG9hZERlcGVuZGVudENhbGxiYWNrcygpCkBAIC0zOTY5LDcgKzM5NjksNyBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90 IG5hdmlnYXRpb25JRAogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGll bnQoKSk7CiAKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUo ZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CisgICAgTUVTU0FHRV9DSEVDSyht X3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKIAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbWVzc2Fn ZSBjaGVjayB0aGF0IG5hdmlnYXRpb25JRCBpcyBub3QgemVybyBoZXJlLCBidXQgaXQncyBjdXJy ZW50bHkgemVybyBmb3Igc29tZSBuYXZpZ2F0aW9ucyB0aHJvdWdoIHRoZSBwYWdlIGNhY2hlLgog ICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IG5hdmlnYXRpb247CkBAIC00MDYzLDcgKzQwNjMs NyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUodWlu dDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aQogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJv dGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJv Y2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CisgICAg TUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKIAogICAgIGlmIChtX2NvbnRy b2xsZWRCeUF1dG9tYXRpb24pIHsKICAgICAgICAgaWYgKGF1dG8qIGF1dG9tYXRpb25TZXNzaW9u ID0gcHJvY2VzcygpLnByb2Nlc3NQb29sKCkuYXV0b21hdGlvblNlc3Npb24oKSkKQEAgLTQwODcs NyArNDA4Nyw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGaW5pc2hMb2FkRm9yRnJhbWUodWlu dDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklECiAgICAgUGFnZUNsaWVudFByb3Rl Y3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1l ID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNLKGZyYW1l KTsKKyAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgZnJhbWUpOwogCiAgICAgLy8g RklYTUU6IFdlIHNob3VsZCBtZXNzYWdlIGNoZWNrIHRoYXQgbmF2aWdhdGlvbklEIGlzIG5vdCB6 ZXJvIGhlcmUsIGJ1dCBpdCdzIGN1cnJlbnRseSB6ZXJvIGZvciBzb21lIG5hdmlnYXRpb25zIHRo cm91Z2ggdGhlIHBhZ2UgY2FjaGUuCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gbmF2aWdh dGlvbjsKQEAgLTQxMzIsNyArNDEzMiw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGYWlsTG9h ZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwKICAgICBQ YWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCiAgICAgV2ViRnJh bWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NB R0VfQ0hFQ0soZnJhbWUpOworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBmcmFt ZSk7CiAKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIG1lc3NhZ2UgY2hlY2sgdGhhdCBuYXZpZ2F0 aW9uSUQgaXMgbm90IHplcm8gaGVyZSwgYnV0IGl0J3MgY3VycmVudGx5IHplcm8gZm9yIHNvbWUg bmF2aWdhdGlvbnMgdGhyb3VnaCB0aGUgcGFnZSBjYWNoZS4KICAgICBSZWZQdHI8QVBJOjpOYXZp Z2F0aW9uPiBuYXZpZ2F0aW9uOwpAQCAtNDE3NCw4ICs0MTc0LDggQEAgdm9pZCBXZWJQYWdlUHJv eHk6OmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1 aW50NjRfdAogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7 CiAKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJ RCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7Ci0gICAgTUVTU0FHRV9DSEVDS19VUkwodXJs KTsKKyAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgZnJhbWUpOworICAgIE1FU1NB R0VfQ0hFQ0tfVVJMKHByb2Nlc3MoKSwgdXJsKTsKIAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQg bWVzc2FnZSBjaGVjayB0aGF0IG5hdmlnYXRpb25JRCBpcyBub3QgemVybyBoZXJlLCBidXQgaXQn cyBjdXJyZW50bHkgemVybyBmb3Igc29tZSBuYXZpZ2F0aW9ucyB0aHJvdWdoIHRoZSBwYWdlIGNh Y2hlLgogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IG5hdmlnYXRpb247CkBAIC00MjI3LDcg KzQyMjcsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWUodWlu dDY0X3QgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiB0aXRsZQogICAgIFBhZ2VDbGllbnRQcm90ZWN0 b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9 IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7 CisgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKIAogICAgIGF1dG8g dHJhbnNhY3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKIApAQCAtNDI1Myw3 ICs0MjUzLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxh eW91dEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnMKICAgICBQYWdlQ2xpZW50UHJvdGVj dG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUg PSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUp OworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBmcmFtZSk7CiAKICAgICBpZiAo bV9sb2FkZXJDbGllbnQpCiAgICAgICAgIG1fbG9hZGVyQ2xpZW50LT5kaWRGaXJzdFZpc3VhbGx5 Tm9uRW1wdHlMYXlvdXRGb3JGcmFtZSgqdGhpcywgKmZyYW1lLCBtX3Byb2Nlc3MtPnRyYW5zZm9y bUhhbmRsZXNUb09iamVjdHModXNlckRhdGEub2JqZWN0KCkpLmdldCgpKTsKQEAgLTQyODQsNyAr NDI4NCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWREaXNwbGF5SW5zZWN1cmVDb250ZW50Rm9y RnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgVXNlCiAgICAgUGFnZUNsaWVudFByb3RlY3Rv ciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0g bV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsK KyAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgZnJhbWUpOwogCiAgICAgYXV0byB0 cmFuc2FjdGlvbiA9IG1fcGFnZUxvYWRTdGF0ZS50cmFuc2FjdGlvbigpOwogICAgIG1fcGFnZUxv YWRTdGF0ZS5kaWREaXNwbGF5T3JSdW5JbnNlY3VyZUNvbnRlbnQodHJhbnNhY3Rpb24pOwpAQCAt NDI5OCw3ICs0Mjk4LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJ1bkluc2VjdXJlQ29udGVu dEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFVzZXJEYXQKICAgICBQYWdlQ2xpZW50 UHJvdGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCiAgICAgV2ViRnJhbWVQcm94eSog ZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0VfQ0hFQ0so ZnJhbWUpOworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBmcmFtZSk7CiAKICAg ICBhdXRvIHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CiAgICAg bV9wYWdlTG9hZFN0YXRlLmRpZERpc3BsYXlPclJ1bkluc2VjdXJlQ29udGVudCh0cmFuc2FjdGlv bik7CkBAIC00MzIxLDcgKzQzMjEsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZnJhbWVEaWRCZWNv bWVGcmFtZVNldCh1aW50NjRfdCBmcmFtZUlELCBib29sIHZhbHVlKQogICAgIFBhZ2VDbGllbnRQ cm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKICAgICBXZWJGcmFtZVByb3h5KiBm cmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhm cmFtZSk7CisgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKIAogICAg IGZyYW1lLT5zZXRJc0ZyYW1lU2V0KHZhbHVlKTsKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1l KCkpCkBAIC00MzM3LDE1ICs0MzM3LDIwIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpiZWdpblNhZmVC cm93c2luZ0NoZWNrKGNvbnN0IFVSTCYsIGJvb2wsIFdlYkZyYW1lUG9saWN5TGlzdGVuCiAKIHZv aWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmModWlu dDY0X3QgZnJhbWVJRCwgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiYgZnJhbWVTZWN1cml0 eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBOYXZpZ2F0aW9uQWN0aW9uRGF0YSYmIG5h dmlnYXRpb25BY3Rpb25EYXRhLCBGcmFtZUluZm9EYXRhJiYgZnJhbWVJbmZvRGF0YSwgdWludDY0 X3Qgb3JpZ2luYXRpbmdQYWdlSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3Jp Z2luYWxSZXF1ZXN0LCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBJUEM6OkZv cm1EYXRhUmVmZXJlbmNlJiYgcmVxdWVzdEJvZHksIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2Um JiByZWRpcmVjdFJlc3BvbnNlLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEsIHVpbnQ2NF90IGxp c3RlbmVySUQpCiB7Ci0gICAgYXV0byogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1l SUQpOwotICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOworICAgIGRlY2lkZVBvbGljeUZvck5hdmln YXRpb25BY3Rpb25Bc3luY1NoYXJlZChtX3Byb2Nlc3MsIGZyYW1lSUQsIFdURk1vdmUoZnJhbWVT ZWN1cml0eU9yaWdpbiksIG5hdmlnYXRpb25JRCwgV1RGTW92ZShuYXZpZ2F0aW9uQWN0aW9uRGF0 YSksIFdURk1vdmUoZnJhbWVJbmZvRGF0YSksIG9yaWdpbmF0aW5nUGFnZUlELCBvcmlnaW5hbFJl cXVlc3QsIFdURk1vdmUocmVxdWVzdCksIFdURk1vdmUocmVxdWVzdEJvZHkpLCBXVEZNb3ZlKHJl ZGlyZWN0UmVzcG9uc2UpLCB1c2VyRGF0YSwgbGlzdGVuZXJJRCk7Cit9CisKK3ZvaWQgV2ViUGFn ZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmNTaGFyZWQoV2ViUHJv Y2Vzc1Byb3h5JiBwcm9jZXNzLCB1aW50NjRfdCBmcmFtZUlELCBXZWJDb3JlOjpTZWN1cml0eU9y aWdpbkRhdGEmJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIE5h dmlnYXRpb25BY3Rpb25EYXRhJiYgbmF2aWdhdGlvbkFjdGlvbkRhdGEsIEZyYW1lSW5mb0RhdGEm JiBmcmFtZUluZm9EYXRhLCB1aW50NjRfdCBvcmlnaW5hdGluZ1BhZ2VJRCwgY29uc3QgV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0JiBvcmlnaW5hbFJlcXVlc3QsIFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdCYmIHJlcXVlc3QsIElQQzo6Rm9ybURhdGFSZWZlcmVuY2UmJiByZXF1ZXN0Qm9keSwgV2Vi Q29yZTo6UmVzb3VyY2VSZXNwb25zZSYmIHJlZGlyZWN0UmVzcG9uc2UsIGNvbnN0IFVzZXJEYXRh JiB1c2VyRGF0YSwgdWludDY0X3QgbGlzdGVuZXJJRCkKK3sKKyAgICBhdXRvKiBmcmFtZSA9IHBy b2Nlc3Mud2ViRnJhbWUoZnJhbWVJRCk7CisgICAgTUVTU0FHRV9DSEVDSyhwcm9jZXNzLCBmcmFt ZSk7CiAKLSAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKCpmcmFtZSwgV1RGTW92 ZShmcmFtZVNlY3VyaXR5T3JpZ2luKSwgbmF2aWdhdGlvbklELCBXVEZNb3ZlKG5hdmlnYXRpb25B Y3Rpb25EYXRhKSwgV1RGTW92ZShmcmFtZUluZm9EYXRhKSwgb3JpZ2luYXRpbmdQYWdlSUQsIG9y aWdpbmFsUmVxdWVzdCwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShyZXF1ZXN0Qm9keSksIFdU Rk1vdmUocmVkaXJlY3RSZXNwb25zZSksIHVzZXJEYXRhLCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6 Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxp c3RlbmVySURdIChhdXRvLi4uIGFyZ3MpIHsKLSAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlOjpEaWRSZWNlaXZlUG9saWN5RGVjaXNpb24oZnJhbWVJRCwgbGlzdGVuZXJJ RCwgYXJncy4uLiksIG1fcGFnZUlEKTsKKyAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uKHByb2Nlc3MsICpmcmFtZSwgV1RGTW92ZShmcmFtZVNlY3VyaXR5T3JpZ2luKSwgbmF2aWdh dGlvbklELCBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb25EYXRhKSwgV1RGTW92ZShmcmFtZUluZm9E YXRhKSwgb3JpZ2luYXRpbmdQYWdlSUQsIG9yaWdpbmFsUmVxdWVzdCwgV1RGTW92ZShyZXF1ZXN0 KSwgV1RGTW92ZShyZXF1ZXN0Qm9keSksIFdURk1vdmUocmVkaXJlY3RSZXNwb25zZSksIHVzZXJE YXRhLCBQb2xpY3lEZWNpc2lvblNlbmRlcjo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0g bWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIHByb2Nlc3MgPSBtYWtlUmVmKHBy b2Nlc3MpXSAoYXV0by4uLiBhcmdzKSB7CisgICAgICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6 OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5lcklELCBh cmdzLi4uKSwgbV9wYWdlSUQpOwogICAgIH0pKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV2ViRnJhbWVQcm94eSYgZnJhbWUsIFdlYkNv cmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5h dmlnYXRpb25JRCwgTmF2aWdhdGlvbkFjdGlvbkRhdGEmJiBuYXZpZ2F0aW9uQWN0aW9uRGF0YSwg RnJhbWVJbmZvRGF0YSYmIG9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0YSwgdWludDY0X3Qgb3JpZ2lu YXRpbmdQYWdlSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1 ZXN0LCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBJUEM6OkZvcm1EYXRhUmVm ZXJlbmNlJiYgcmVxdWVzdEJvZHksIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmJiByZWRpcmVj dFJlc3BvbnNlLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEsIFJlZjxQb2xpY3lEZWNpc2lvblNl bmRlcj4mJiBzZW5kZXIpCit2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdh dGlvbkFjdGlvbihXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIFdlYkZyYW1lUHJveHkmIGZyYW1l LCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50 NjRfdCBuYXZpZ2F0aW9uSUQsIE5hdmlnYXRpb25BY3Rpb25EYXRhJiYgbmF2aWdhdGlvbkFjdGlv bkRhdGEsIEZyYW1lSW5mb0RhdGEmJiBvcmlnaW5hdGluZ0ZyYW1lSW5mb0RhdGEsIHVpbnQ2NF90 IG9yaWdpbmF0aW5nUGFnZUlELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIG9yaWdp bmFsUmVxdWVzdCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgSVBDOjpGb3Jt RGF0YVJlZmVyZW5jZSYmIHJlcXVlc3RCb2R5LCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYg cmVkaXJlY3RSZXNwb25zZSwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhLCBSZWY8UG9saWN5RGVj aXNpb25TZW5kZXI+JiYgc2VuZGVyKQogewogICAgIExPRyhMb2FkaW5nLCAiV2ViUGFnZVByb3h5 OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uIC0gT3JpZ2luYWwgVVJMICVzLCBjdXJy ZW50IHRhcmdldCBVUkwgJXMiLCBvcmlnaW5hbFJlcXVlc3QudXJsKCkuc3RyaW5nKCkudXRmOCgp LmRhdGEoKSwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKIApAQCAtNDM2 MCw4ICs0MzY1LDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb24oV2ViRnJhbWVQcm94eSYgZnJhbWUsIFdlYkNvcmUKICAgICBpZiAoIWZyb21BUEkp CiAgICAgICAgIG1fcGFnZUxvYWRTdGF0ZS5jbGVhclBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5z YWN0aW9uKTsKIAotICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHJlcXVlc3QudXJsKCkpOwotICAgIE1F U1NBR0VfQ0hFQ0tfVVJMKG9yaWdpbmFsUmVxdWVzdC51cmwoKSk7CisgICAgTUVTU0FHRV9DSEVD S19VUkwocHJvY2VzcywgcmVxdWVzdC51cmwoKSk7CisgICAgTUVTU0FHRV9DSEVDS19VUkwocHJv Y2Vzcywgb3JpZ2luYWxSZXF1ZXN0LnVybCgpKTsKIAogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRp b24+IG5hdmlnYXRpb247CiAgICAgaWYgKG5hdmlnYXRpb25JRCkKQEAgLTQzODcsNyArNDM5Miw3 IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdl YkZyYW1lUHJveHkmIGZyYW1lLCBXZWJDb3JlCiAgICAgfQogCiAgICAgdWludDY0X3QgbmV3TmF2 aWdhdGlvbklEID0gbmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCk7Ci0gICAgbmF2aWdhdGlvbi0+ c2V0Q3VycmVudFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3QpLCBtX3Byb2Nlc3MtPmNv cmVQcm9jZXNzSWRlbnRpZmllcigpKTsKKyAgICBuYXZpZ2F0aW9uLT5zZXRDdXJyZW50UmVxdWVz dChSZXNvdXJjZVJlcXVlc3QocmVxdWVzdCksIHByb2Nlc3MuY29yZVByb2Nlc3NJZGVudGlmaWVy KCkpOwogICAgIG5hdmlnYXRpb24tPnNldExhc3ROYXZpZ2F0aW9uQWN0aW9uKG5hdmlnYXRpb25B Y3Rpb25EYXRhKTsKICAgICBuYXZpZ2F0aW9uLT5zZXRPcmlnaW5hdGluZ0ZyYW1lSW5mbyhvcmln aW5hdGluZ0ZyYW1lSW5mb0RhdGEpOwogICAgIG5hdmlnYXRpb24tPnNldERlc3RpbmF0aW9uRnJh bWVTZWN1cml0eU9yaWdpbihmcmFtZVNlY3VyaXR5T3JpZ2luKTsKQEAgLTQ0NDYsNyArNDQ1MSw3 IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdl YkZyYW1lUHJveHkmIGZyYW1lLCBXZWJDb3JlCiAgICAgICAgIGJlZ2luU2FmZUJyb3dzaW5nQ2hl Y2socmVxdWVzdC51cmwoKSwgZnJhbWUuaXNNYWluRnJhbWUoKSwgbGlzdGVuZXIpOwogCiAgICAg QVBJOjpOYXZpZ2F0aW9uKiBtYWluRnJhbWVOYXZpZ2F0aW9uID0gZnJhbWUuaXNNYWluRnJhbWUo KSA/IG5hdmlnYXRpb24uZ2V0KCkgOiBudWxscHRyOwotICAgIFdlYkZyYW1lUHJveHkqIG9yaWdp bmF0aW5nRnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKG9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0 YS5mcmFtZUlEKTsKKyAgICBXZWJGcmFtZVByb3h5KiBvcmlnaW5hdGluZ0ZyYW1lID0gcHJvY2Vz cy53ZWJGcmFtZShvcmlnaW5hdGluZ0ZyYW1lSW5mb0RhdGEuZnJhbWVJRCk7CiAKICNpZiBFTkFC TEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQogICAgIGlmIChhdXRvKiByZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmUgPSB3ZWJzaXRlRGF0YVN0b3JlKCkucmVzb3VyY2VMb2FkU3RhdGlzdGlj cygpKQpAQCAtNDQ1NSwyMSArNDQ2MCwyMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXZWJGcmFtZVByb3h5JiBmcmFtZSwgV2ViQ29yZQogI2Vu ZGlmCiAKICAgICBpZiAobV9wb2xpY3lDbGllbnQpCi0gICAgICAgIG1fcG9saWN5Q2xpZW50LT5k ZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKCp0aGlzLCAmZnJhbWUsIFdURk1vdmUobmF2 aWdhdGlvbkFjdGlvbkRhdGEpLCBvcmlnaW5hdGluZ0ZyYW1lLCBvcmlnaW5hbFJlcXVlc3QsIFdU Rk1vdmUocmVxdWVzdCksIFdURk1vdmUobGlzdGVuZXIpLCBtX3Byb2Nlc3MtPnRyYW5zZm9ybUhh bmRsZXNUb09iamVjdHModXNlckRhdGEub2JqZWN0KCkpLmdldCgpKTsKKyAgICAgICAgbV9wb2xp Y3lDbGllbnQtPmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oKnRoaXMsICZmcmFtZSwg V1RGTW92ZShuYXZpZ2F0aW9uQWN0aW9uRGF0YSksIG9yaWdpbmF0aW5nRnJhbWUsIG9yaWdpbmFs UmVxdWVzdCwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShsaXN0ZW5lciksIHByb2Nlc3MudHJh bnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOwogICAgIGVs c2UgewogICAgICAgICBhdXRvIGRlc3RpbmF0aW9uRnJhbWVJbmZvID0gQVBJOjpGcmFtZUluZm86 OmNyZWF0ZShmcmFtZSwgZnJhbWVTZWN1cml0eU9yaWdpbi5zZWN1cml0eU9yaWdpbigpKTsKICAg ICAgICAgUmVmUHRyPEFQSTo6RnJhbWVJbmZvPiBzb3VyY2VGcmFtZUluZm87CiAgICAgICAgIGlm ICghZnJvbUFQSSAmJiBvcmlnaW5hdGluZ0ZyYW1lID09ICZmcmFtZSkKICAgICAgICAgICAgIHNv dXJjZUZyYW1lSW5mbyA9IGRlc3RpbmF0aW9uRnJhbWVJbmZvLmNvcHlSZWYoKTsKICAgICAgICAg ZWxzZSBpZiAoIWZyb21BUEkpCi0gICAgICAgICAgICBzb3VyY2VGcmFtZUluZm8gPSBBUEk6OkZy YW1lSW5mbzo6Y3JlYXRlKG9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0YSwgb3JpZ2luYXRpbmdQYWdl SUQgPyBtX3Byb2Nlc3MtPndlYlBhZ2Uob3JpZ2luYXRpbmdQYWdlSUQpIDogbnVsbHB0cik7Cisg ICAgICAgICAgICBzb3VyY2VGcmFtZUluZm8gPSBBUEk6OkZyYW1lSW5mbzo6Y3JlYXRlKG9yaWdp bmF0aW5nRnJhbWVJbmZvRGF0YSwgb3JpZ2luYXRpbmdQYWdlSUQgPyBwcm9jZXNzLndlYlBhZ2Uo b3JpZ2luYXRpbmdQYWdlSUQpIDogbnVsbHB0cik7CiAKLSAgICAgICAgYXV0byB1c2VySW5pdGlh dGVkQWN0aXZpdHkgPSBtX3Byb2Nlc3MtPnVzZXJJbml0aWF0ZWRBY3Rpdml0eShuYXZpZ2F0aW9u QWN0aW9uRGF0YS51c2VyR2VzdHVyZVRva2VuSWRlbnRpZmllcik7CisgICAgICAgIGF1dG8gdXNl ckluaXRpYXRlZEFjdGl2aXR5ID0gcHJvY2Vzcy51c2VySW5pdGlhdGVkQWN0aXZpdHkobmF2aWdh dGlvbkFjdGlvbkRhdGEudXNlckdlc3R1cmVUb2tlbklkZW50aWZpZXIpOwogICAgICAgICBib29s IHNob3VsZE9wZW5BcHBMaW5rcyA9ICFtX3Nob3VsZFN1cHByZXNzQXBwTGlua3NJbk5leHROYXZp Z2F0aW9uUG9saWN5RGVjaXNpb24gJiYgZGVzdGluYXRpb25GcmFtZUluZm8tPmlzTWFpbkZyYW1l KCkgJiYgIWhvc3RzQXJlRXF1YWwoVVJMKHsgfSwgbV9tYWluRnJhbWUtPnVybCgpKSwgcmVxdWVz dC51cmwoKSkgJiYgbmF2aWdhdGlvbkFjdGlvbkRhdGEubmF2aWdhdGlvblR5cGUgIT0gV2ViQ29y ZTo6TmF2aWdhdGlvblR5cGU6OkJhY2tGb3J3YXJkOwogCiAgICAgICAgIGF1dG8gbmF2aWdhdGlv bkFjdGlvbiA9IEFQSTo6TmF2aWdhdGlvbkFjdGlvbjo6Y3JlYXRlKFdURk1vdmUobmF2aWdhdGlv bkFjdGlvbkRhdGEpLCBzb3VyY2VGcmFtZUluZm8uZ2V0KCksIGRlc3RpbmF0aW9uRnJhbWVJbmZv LnB0cigpLCBXVEY6Om51bGxvcHQsIFdURk1vdmUocmVxdWVzdCksIG9yaWdpbmFsUmVxdWVzdC51 cmwoKSwgc2hvdWxkT3BlbkFwcExpbmtzLCBXVEZNb3ZlKHVzZXJJbml0aWF0ZWRBY3Rpdml0eSks IG1haW5GcmFtZU5hdmlnYXRpb24pOwogCi0gICAgICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ZGVj aWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbigqdGhpcywgV1RGTW92ZShuYXZpZ2F0aW9uQWN0 aW9uKSwgV1RGTW92ZShsaXN0ZW5lciksIG1fcHJvY2Vzcy0+dHJhbnNmb3JtSGFuZGxlc1RvT2Jq ZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOworICAgICAgICBtX25hdmlnYXRpb25DbGll bnQtPmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oKnRoaXMsIFdURk1vdmUobmF2aWdh dGlvbkFjdGlvbiksIFdURk1vdmUobGlzdGVuZXIpLCBwcm9jZXNzLnRyYW5zZm9ybUhhbmRsZXNU b09iamVjdHModXNlckRhdGEub2JqZWN0KCkpLmdldCgpKTsKICAgICB9CiAKICAgICBtX3Nob3Vs ZFN1cHByZXNzQXBwTGlua3NJbk5leHROYXZpZ2F0aW9uUG9saWN5RGVjaXNpb24gPSBmYWxzZTsK QEAgLTQ1MjMsNyArNDUyOCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JO YXZpZ2F0aW9uQWN0aW9uU3luYyh1aW50NjRfdCBmcmFtZUlELCBib29sIGlzCiAgICAgICAgIFJF TEVBU0VfQVNTRVJUKGZyYW1lKTsKICAgICB9CiAKLSAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0 aW9uQWN0aW9uKCpmcmFtZSwgV1RGTW92ZShmcmFtZVNlY3VyaXR5T3JpZ2luKSwgbmF2aWdhdGlv bklELCBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb25EYXRhKSwgV1RGTW92ZShmcmFtZUluZm9EYXRh KSwgb3JpZ2luYXRpbmdQYWdlSUQsIG9yaWdpbmFsUmVxdWVzdCwgV1RGTW92ZShyZXF1ZXN0KSwg V1RGTW92ZShyZXF1ZXN0Qm9keSksIFdURk1vdmUocmVkaXJlY3RSZXNwb25zZSksIHVzZXJEYXRh LCBzZW5kZXIuY29weVJlZigpKTsKKyAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9u KG1fcHJvY2VzcywgKmZyYW1lLCBXVEZNb3ZlKGZyYW1lU2VjdXJpdHlPcmlnaW4pLCBuYXZpZ2F0 aW9uSUQsIFdURk1vdmUobmF2aWdhdGlvbkFjdGlvbkRhdGEpLCBXVEZNb3ZlKGZyYW1lSW5mb0Rh dGEpLCBvcmlnaW5hdGluZ1BhZ2VJRCwgb3JpZ2luYWxSZXF1ZXN0LCBXVEZNb3ZlKHJlcXVlc3Qp LCBXVEZNb3ZlKHJlcXVlc3RCb2R5KSwgV1RGTW92ZShyZWRpcmVjdFJlc3BvbnNlKSwgdXNlckRh dGEsIHNlbmRlci5jb3B5UmVmKCkpOwogCiAgICAgLy8gSWYgdGhlIGNsaWVudCBkaWQgbm90IHJl c3BvbmQgc3luY2hyb25vdXNseSwgcHJvY2VlZCB3aXRoIHRoZSBsb2FkLgogICAgIHNlbmRlci0+ c2VuZChXZWJQb2xpY3lBY3Rpb246OlVzZSwgbmF2aWdhdGlvbklELCBEb3dubG9hZElEKCksIFdU Rjo6bnVsbG9wdCk7CkBAIC00NTM0LDggKzQ1MzksOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVj aWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3Vy aQogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKICAg ICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0g ICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7Ci0gICAgTUVTU0FHRV9DSEVDS19VUkwocmVxdWVzdC51 cmwoKSk7CisgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKKyAgICBN RVNTQUdFX0NIRUNLX1VSTChwcm9jZXNzKCksIHJlcXVlc3QudXJsKCkpOwogCiAgICAgYXV0byBs aXN0ZW5lciA9IG1ha2VSZWYoZnJhbWUtPnNldFVwUG9saWN5TGlzdGVuZXJQcm94eShbdGhpcywg cHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBsaXN0ZW5lcklELCBmcmFtZUlEXSAoV2Vi UG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbiwgQVBJOjpXZWJzaXRlUG9saWNpZXMqLCBQcm9jZXNz U3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFJlZlB0 cjxTYWZlQnJvd3NpbmdXYXJuaW5nPiYmIHNhZmVCcm93c2luZ1dhcm5pbmcpIG11dGFibGUgewog ICAgICAgICAvLyBGSVhNRTogQXNzZXJ0IHRoZSBBUEk6OldlYnNpdGVQb2xpY2llcyogaXMgbnVs bHB0ciBoZXJlIG9uY2UgY2xpZW50cyBvZiBXS0ZyYW1lUG9saWN5TGlzdGVuZXJVc2VXaXRoUG9s aWNpZXMgZ28gYXdheS4KQEAgLTQ1NjQsMzEgKzQ1NjksMzYgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OmRlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbih1aW50NjRfdCBmcmFtZUlELCBjb25zdCBT ZWN1cmkKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlKHVp bnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9y aWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNw b25zZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBib29sIGNhblNob3dNSU1FVHlw ZSwgdWludDY0X3QgbGlzdGVuZXJJRCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQoreworICAg IGRlY2lkZVBvbGljeUZvclJlc3BvbnNlU2hhcmVkKG1fcHJvY2VzcywgZnJhbWVJRCwgZnJhbWVT ZWN1cml0eU9yaWdpbiwgbmF2aWdhdGlvbklELCByZXNwb25zZSwgcmVxdWVzdCwgY2FuU2hvd01J TUVUeXBlLCBsaXN0ZW5lcklELCB1c2VyRGF0YSk7Cit9CisKK3ZvaWQgV2ViUGFnZVByb3h5Ojpk ZWNpZGVQb2xpY3lGb3JSZXNwb25zZVNoYXJlZChXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIHVp bnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYgZnJhbWVTZWN1cml0eU9y aWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNw b25zZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBib29sIGNhblNob3dNSU1FVHlw ZSwgdWludDY0X3QgbGlzdGVuZXJJRCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQogewogICAg IFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKICAgICBtX2Rl Y2lkZVBvbGljeUZvclJlc3BvbnNlUmVxdWVzdCA9IHJlcXVlc3Q7CiAKLSAgICBXZWJGcmFtZVBy b3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9D SEVDSyhmcmFtZSk7Ci0gICAgTUVTU0FHRV9DSEVDS19VUkwocmVxdWVzdC51cmwoKSk7Ci0gICAg TUVTU0FHRV9DSEVDS19VUkwocmVzcG9uc2UudXJsKCkpOworICAgIFdlYkZyYW1lUHJveHkqIGZy YW1lID0gcHJvY2Vzcy53ZWJGcmFtZShmcmFtZUlEKTsKKyAgICBNRVNTQUdFX0NIRUNLKHByb2Nl c3MsIGZyYW1lKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChwcm9jZXNzLCByZXF1ZXN0LnVybCgp KTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChwcm9jZXNzLCByZXNwb25zZS51cmwoKSk7CiAKICAg ICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvbklEID8gbV9u YXZpZ2F0aW9uU3RhdGUtPm5hdmlnYXRpb24obmF2aWdhdGlvbklEKSA6IG51bGxwdHI7Ci0gICAg YXV0byBsaXN0ZW5lciA9IG1ha2VSZWYoZnJhbWUtPnNldFVwUG9saWN5TGlzdGVuZXJQcm94eShb dGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBmcmFtZUlELCBsaXN0ZW5lcklE LCBuYXZpZ2F0aW9uID0gV1RGTW92ZShuYXZpZ2F0aW9uKV0gKFdlYlBvbGljeUFjdGlvbiBwb2xp Y3lBY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNs aWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBSZWZQdHI8U2FmZUJyb3dzaW5nV2Fy bmluZz4mJiBzYWZlQnJvd3NpbmdXYXJuaW5nKSBtdXRhYmxlIHsKKyAgICBhdXRvIGxpc3RlbmVy ID0gbWFrZVJlZihmcmFtZS0+c2V0VXBQb2xpY3lMaXN0ZW5lclByb3h5KFt0aGlzLCBwcm90ZWN0 ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySUQsIG5hdmlnYXRpb24g PSBXVEZNb3ZlKG5hdmlnYXRpb24pLCBwcm9jZXNzID0gbWFrZVJlZihwcm9jZXNzKV0gKFdlYlBv bGljeUFjdGlvbiBwb2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwgUHJvY2Vzc1N3 YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBSZWZQdHI8 U2FmZUJyb3dzaW5nV2FybmluZz4mJiBzYWZlQnJvd3NpbmdXYXJuaW5nKSBtdXRhYmxlIHsKICAg ICAgICAgLy8gRklYTUU6IEFzc2VydCB0aGUgQVBJOjpXZWJzaXRlUG9saWNpZXMqIGlzIG51bGxw dHIgaGVyZSBvbmNlIGNsaWVudHMgb2YgV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNlV2l0aFBvbGlj aWVzIGdvIGF3YXkuCiAgICAgICAgIFJFTEVBU0VfQVNTRVJUKHByb2Nlc3NTd2FwUmVxdWVzdGVk QnlDbGllbnQgPT0gUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDo6Tm8pOwogICAgICAgICBB U1NFUlRfVU5VU0VEKHNhZmVCcm93c2luZ1dhcm5pbmcsICFzYWZlQnJvd3NpbmdXYXJuaW5nKTsK LSAgICAgICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24sIG5hdmlnYXRpb24u Z2V0KCksIFdURjo6bnVsbG9wdCwgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShbdGhpcywg cHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGZyYW1lSUQsIGxpc3RlbmVy SURdIChhdXRvLi4uIGFyZ3MpIHsKLSAgICAgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdl czo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQs IGFyZ3MuLi4pLCBtX3BhZ2VJRCk7CisgICAgICAgIHJlY2VpdmVkUG9saWN5RGVjaXNpb24ocG9s aWN5QWN0aW9uLCBuYXZpZ2F0aW9uLmdldCgpLCBXVEY6Om51bGxvcHQsIFBvbGljeURlY2lzaW9u U2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRo aXMpLCBmcmFtZUlELCBsaXN0ZW5lcklELCBwcm9jZXNzID0gV1RGTW92ZShwcm9jZXNzKV0gKGF1 dG8uLi4gYXJncykgeworICAgICAgICAgICAgcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQsIGFyZ3MuLi4p LCBtX3BhZ2VJRCk7CiAgICAgICAgIH0pKTsKICAgICB9LCBTaG91bGRFeHBlY3RTYWZlQnJvd3Np bmdSZXN1bHQ6Ok5vKSk7CiAKICAgICBpZiAobV9wb2xpY3lDbGllbnQpCi0gICAgICAgIG1fcG9s aWN5Q2xpZW50LT5kZWNpZGVQb2xpY3lGb3JSZXNwb25zZSgqdGhpcywgKmZyYW1lLCByZXNwb25z ZSwgcmVxdWVzdCwgY2FuU2hvd01JTUVUeXBlLCBXVEZNb3ZlKGxpc3RlbmVyKSwgbV9wcm9jZXNz LT50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVzZXJEYXRhLm9iamVjdCgpKS5nZXQoKSk7Cisg ICAgICAgIG1fcG9saWN5Q2xpZW50LT5kZWNpZGVQb2xpY3lGb3JSZXNwb25zZSgqdGhpcywgKmZy YW1lLCByZXNwb25zZSwgcmVxdWVzdCwgY2FuU2hvd01JTUVUeXBlLCBXVEZNb3ZlKGxpc3RlbmVy KSwgcHJvY2Vzcy50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVzZXJEYXRhLm9iamVjdCgpKS5n ZXQoKSk7CiAgICAgZWxzZSB7CiAgICAgICAgIGF1dG8gbmF2aWdhdGlvblJlc3BvbnNlID0gQVBJ OjpOYXZpZ2F0aW9uUmVzcG9uc2U6OmNyZWF0ZShBUEk6OkZyYW1lSW5mbzo6Y3JlYXRlKCpmcmFt ZSwgZnJhbWVTZWN1cml0eU9yaWdpbi5zZWN1cml0eU9yaWdpbigpKS5nZXQoKSwgcmVxdWVzdCwg cmVzcG9uc2UsIGNhblNob3dNSU1FVHlwZSk7Ci0gICAgICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvblJlc3BvbnNlKCp0aGlzLCBXVEZNb3ZlKG5hdmlnYXRp b25SZXNwb25zZSksIFdURk1vdmUobGlzdGVuZXIpLCBtX3Byb2Nlc3MtPnRyYW5zZm9ybUhhbmRs ZXNUb09iamVjdHModXNlckRhdGEub2JqZWN0KCkpLmdldCgpKTsKKyAgICAgICAgbV9uYXZpZ2F0 aW9uQ2xpZW50LT5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2UoKnRoaXMsIFdURk1v dmUobmF2aWdhdGlvblJlc3BvbnNlKSwgV1RGTW92ZShsaXN0ZW5lciksIHByb2Nlc3MudHJhbnNm b3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOwogICAgIH0KIH0K IApAQCAtNDU5Nyw3ICs0NjA3LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnVuYWJsZVRvSW1wbGVt ZW50UG9saWN5KHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFJlc291cmNlRXJyb3IKICAgICBQYWdl Q2xpZW50UHJvdGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCiAgICAgV2ViRnJhbWVQ cm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0Vf Q0hFQ0soZnJhbWUpOworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBmcmFtZSk7 CiAKICAgICBpZiAoIW1fcG9saWN5Q2xpZW50KQogICAgICAgICByZXR1cm47CkBAIC00NjA5LDEw ICs0NjE5LDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp1bmFibGVUb0ltcGxlbWVudFBvbGljeSh1 aW50NjRfdCBmcmFtZUlELCBjb25zdCBSZXNvdXJjZUVycm9yCiB2b2lkIFdlYlBhZ2VQcm94eTo6 d2lsbFN1Ym1pdEZvcm0odWludDY0X3QgZnJhbWVJRCwgdWludDY0X3Qgc291cmNlRnJhbWVJRCwg Y29uc3QgVmVjdG9yPHN0ZDo6cGFpcjxTdHJpbmcsIFN0cmluZz4+JiB0ZXh0RmllbGRWYWx1ZXMs IHVpbnQ2NF90IGxpc3RlbmVySUQsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKIHsKICAgICBX ZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAg TUVTU0FHRV9DSEVDSyhmcmFtZSk7CisgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCks IGZyYW1lKTsKIAogICAgIFdlYkZyYW1lUHJveHkqIHNvdXJjZUZyYW1lID0gbV9wcm9jZXNzLT53 ZWJGcmFtZShzb3VyY2VGcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNLKHNvdXJjZUZyYW1lKTsK KyAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgc291cmNlRnJhbWUpOwogCiAgICAg bV9mb3JtQ2xpZW50LT53aWxsU3VibWl0Rm9ybSgqdGhpcywgKmZyYW1lLCAqc291cmNlRnJhbWUs IHRleHRGaWVsZFZhbHVlcywgbV9wcm9jZXNzLT50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHVz ZXJEYXRhLm9iamVjdCgpKS5nZXQoKSwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0 aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRF0oKSB7CiAgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChN ZXNzYWdlczo6V2ViUGFnZTo6Q29udGludWVXaWxsU3VibWl0Rm9ybShmcmFtZUlELCBsaXN0ZW5l cklEKSwgbV9wYWdlSUQpOwpAQCAtNDYyNiwzOSArNDYzNiw0OSBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6Y29udGVudFJ1bGVMaXN0Tm90aWZpY2F0aW9uKFVSTCYmIHVybCwgVmVjdG9yPFN0cmluZz4m JiBpZGVudAogICAgIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZE5hdmlnYXRlV2l0aE5hdmlnYXRp b25EYXRhKGNvbnN0IFdlYk5hdmlnYXRpb25EYXRhU3RvcmUmIHN0b3JlLCB1aW50NjRfdCBmcmFt ZUlEKSAKIHsKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJkaWROYXZpZ2F0 ZVdpdGhOYXZpZ2F0aW9uRGF0YTogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9w cm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBtX3BhZ2VJRCk7CisgICAgZGlkTmF2aWdhdGVX aXRoTmF2aWdhdGlvbkRhdGFTaGFyZWQobV9wcm9jZXNzLCBzdG9yZSwgZnJhbWVJRCk7Cit9CisK K3ZvaWQgV2ViUGFnZVByb3h5OjpkaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YVNoYXJlZChX ZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIGNvbnN0IFdlYk5hdmlnYXRpb25EYXRhU3RvcmUmIHN0 b3JlLCB1aW50NjRfdCBmcmFtZUlEKQoreworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9h ZGluZywgImRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhU2hhcmVkOiB3ZWJQSUQgPSAlaSwg cGFnZUlEID0gJSIgUFJJdTY0LCBwcm9jZXNzLnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlE KTsKIAogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAK LSAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7 Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZS0+cGFn ZSgpID09IHRoaXMpOworICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gcHJvY2Vzcy53ZWJGcmFt ZShmcmFtZUlEKTsKKyAgICBNRVNTQUdFX0NIRUNLKHByb2Nlc3MsIGZyYW1lKTsKKyAgICBNRVNT QUdFX0NIRUNLKHByb2Nlc3MsIGZyYW1lLT5wYWdlKCkgPT0gdGhpcyk7CiAKICAgICBpZiAoZnJh bWUtPmlzTWFpbkZyYW1lKCkpCiAgICAgICAgIG1faGlzdG9yeUNsaWVudC0+ZGlkTmF2aWdhdGVX aXRoTmF2aWdhdGlvbkRhdGEoKnRoaXMsIHN0b3JlKTsKLSAgICBwcm9jZXNzKCkucHJvY2Vzc1Bv b2woKS5oaXN0b3J5Q2xpZW50KCkuZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGEocHJvY2Vz cygpLnByb2Nlc3NQb29sKCksICp0aGlzLCBzdG9yZSwgKmZyYW1lKTsKKyAgICBwcm9jZXNzLnBy b2Nlc3NQb29sKCkuaGlzdG9yeUNsaWVudCgpLmRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRh KHByb2Nlc3MucHJvY2Vzc1Bvb2woKSwgKnRoaXMsIHN0b3JlLCAqZnJhbWUpOwogfQogCiB2b2lk IFdlYlBhZ2VQcm94eTo6ZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0KGNvbnN0IFN0cmluZyYgc291 cmNlVVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIGRlc3RpbmF0aW9uVVJMU3RyaW5nLCB1aW50NjRf dCBmcmFtZUlEKQogewotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImRpZFBl cmZvcm1DbGllbnRSZWRpcmVjdDogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBm cmFtZUlEID0gJSIgUFJJdTY0LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFn ZUlELCBmcmFtZUlEKTsKKyAgICBkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3RTaGFyZWQobV9wcm9j ZXNzLCBzb3VyY2VVUkxTdHJpbmcsIGRlc3RpbmF0aW9uVVJMU3RyaW5nLCBmcmFtZUlEKTsKK30K Kwordm9pZCBXZWJQYWdlUHJveHk6OmRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdFNoYXJlZChXZWJQ cm9jZXNzUHJveHkmIHByb2Nlc3MsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMU3RyaW5nLCBjb25z dCBTdHJpbmcmIGRlc3RpbmF0aW9uVVJMU3RyaW5nLCB1aW50NjRfdCBmcmFtZUlEKQoreworICAg IFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImRpZFBlcmZvcm1DbGllbnRSZWRpcmVj dFNoYXJlZDogd2ViUElEID0gJWksIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIg UFJJdTY0LCBwcm9jZXNzLnByb2Nlc3NJZGVudGlmaWVyKCksIG1fcGFnZUlELCBmcmFtZUlEKTsK IAogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKICAg ICBpZiAoc291cmNlVVJMU3RyaW5nLmlzRW1wdHkoKSB8fCBkZXN0aW5hdGlvblVSTFN0cmluZy5p c0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKICAgICAKLSAgICBXZWJGcmFtZVByb3h5KiBmcmFt ZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFt ZSk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZS0+cGFnZSgpID09IHRoaXMpOwotICAgIE1FU1NB R0VfQ0hFQ0tfVVJMKHNvdXJjZVVSTFN0cmluZyk7Ci0gICAgTUVTU0FHRV9DSEVDS19VUkwoZGVz dGluYXRpb25VUkxTdHJpbmcpOworICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gcHJvY2Vzcy53 ZWJGcmFtZShmcmFtZUlEKTsKKyAgICBNRVNTQUdFX0NIRUNLKHByb2Nlc3MsIGZyYW1lKTsKKyAg ICBNRVNTQUdFX0NIRUNLKHByb2Nlc3MsIGZyYW1lLT5wYWdlKCkgPT0gdGhpcyk7CisgICAgTUVT U0FHRV9DSEVDS19VUkwocHJvY2Vzcywgc291cmNlVVJMU3RyaW5nKTsKKyAgICBNRVNTQUdFX0NI RUNLX1VSTChwcm9jZXNzLCBkZXN0aW5hdGlvblVSTFN0cmluZyk7CiAKICAgICBpZiAoZnJhbWUt PmlzTWFpbkZyYW1lKCkpIHsKICAgICAgICAgbV9oaXN0b3J5Q2xpZW50LT5kaWRQZXJmb3JtQ2xp ZW50UmVkaXJlY3QoKnRoaXMsIHNvdXJjZVVSTFN0cmluZywgZGVzdGluYXRpb25VUkxTdHJpbmcp OwogICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdCgq dGhpcywgc291cmNlVVJMU3RyaW5nLCBkZXN0aW5hdGlvblVSTFN0cmluZyk7CiAgICAgfQotICAg IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLmhpc3RvcnlDbGllbnQoKS5kaWRQZXJmb3JtQ2xpZW50 UmVkaXJlY3QocHJvY2VzcygpLnByb2Nlc3NQb29sKCksICp0aGlzLCBzb3VyY2VVUkxTdHJpbmcs IGRlc3RpbmF0aW9uVVJMU3RyaW5nLCAqZnJhbWUpOworICAgIHByb2Nlc3MucHJvY2Vzc1Bvb2wo KS5oaXN0b3J5Q2xpZW50KCkuZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0KHByb2Nlc3MucHJvY2Vz c1Bvb2woKSwgKnRoaXMsIHNvdXJjZVVSTFN0cmluZywgZGVzdGluYXRpb25VUkxTdHJpbmcsICpm cmFtZSk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRQZXJmb3JtU2VydmVyUmVkaXJlY3Qo Y29uc3QgU3RyaW5nJiBzb3VyY2VVUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgZGVzdGluYXRpb25V UkxTdHJpbmcsIHVpbnQ2NF90IGZyYW1lSUQpCkBAIC00NjcxLDExICs0NjkxLDExIEBAIHZvaWQg V2ViUGFnZVByb3h5OjpkaWRQZXJmb3JtU2VydmVyUmVkaXJlY3QoY29uc3QgU3RyaW5nJiBzb3Vy Y2VVUkxTdHJpbmcsIGNvbnN0CiAgICAgICAgIHJldHVybjsKICAgICAKICAgICBXZWJGcmFtZVBy b3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9D SEVDSyhmcmFtZSk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZS0+cGFnZSgpID09IHRoaXMpOwor ICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBmcmFtZSk7CisgICAgTUVTU0FHRV9D SEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lLT5wYWdlKCkgPT0gdGhpcyk7CiAKLSAgICBNRVNT QUdFX0NIRUNLX1VSTChzb3VyY2VVUkxTdHJpbmcpOwotICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKGRl c3RpbmF0aW9uVVJMU3RyaW5nKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChwcm9jZXNzKCksIHNv dXJjZVVSTFN0cmluZyk7CisgICAgTUVTU0FHRV9DSEVDS19VUkwocHJvY2VzcygpLCBkZXN0aW5h dGlvblVSTFN0cmluZyk7CiAKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpCiAgICAgICAg IG1faGlzdG9yeUNsaWVudC0+ZGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0KCp0aGlzLCBzb3VyY2VV UkxTdHJpbmcsIGRlc3RpbmF0aW9uVVJMU3RyaW5nKTsKQEAgLTQ2ODcsMTAgKzQ3MDcsMTAgQEAg dm9pZCBXZWJQYWdlUHJveHk6OmRpZFVwZGF0ZUhpc3RvcnlUaXRsZShjb25zdCBTdHJpbmcmIHRp dGxlLCBjb25zdCBTdHJpbmcmIHVybCwKICAgICBQYWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3Rv cihwYWdlQ2xpZW50KCkpOwogCiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3Mt PndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOwotICAgIE1FU1NB R0VfQ0hFQ0soZnJhbWUtPnBhZ2UoKSA9PSB0aGlzKTsKKyAgICBNRVNTQUdFX0NIRUNLKG1fcHJv Y2Vzcy5nZXQoKSwgZnJhbWUpOworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBm cmFtZS0+cGFnZSgpID09IHRoaXMpOwogCi0gICAgTUVTU0FHRV9DSEVDS19VUkwodXJsKTsKKyAg ICBNRVNTQUdFX0NIRUNLX1VSTChwcm9jZXNzKCksIHVybCk7CiAKICAgICBpZiAoZnJhbWUtPmlz TWFpbkZyYW1lKCkpCiAgICAgICAgIG1faGlzdG9yeUNsaWVudC0+ZGlkVXBkYXRlSGlzdG9yeVRp dGxlKCp0aGlzLCB0aXRsZSwgdXJsKTsKQEAgLTQ3MDEsNyArNDcyMSw3IEBAIHZvaWQgV2ViUGFn ZVByb3h5OjpkaWRVcGRhdGVIaXN0b3J5VGl0bGUoY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3Qg U3RyaW5nJiB1cmwsCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpjcmVhdGVOZXdQYWdlKGNvbnN0IEZy YW1lSW5mb0RhdGEmIG9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0YSwgdWludDY0X3Qgb3JpZ2luYXRp bmdQYWdlSUQsIFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFdpbmRvd0ZlYXR1cmVzJiYgd2lu ZG93RmVhdHVyZXMsIE5hdmlnYXRpb25BY3Rpb25EYXRhJiYgbmF2aWdhdGlvbkFjdGlvbkRhdGEs IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkNyZWF0ZU5ld1BhZ2U6OkRlbGF5ZWRSZXBseSYmIHJl cGx5KQogewotICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLT53ZWJGcmFtZShvcmlnaW5hdGlu Z0ZyYW1lSW5mb0RhdGEuZnJhbWVJRCkpOworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdl dCgpLCBtX3Byb2Nlc3MtPndlYkZyYW1lKG9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0YS5mcmFtZUlE KSk7CiAgICAgYXV0byBvcmlnaW5hdGluZ0ZyYW1lSW5mbyA9IEFQSTo6RnJhbWVJbmZvOjpjcmVh dGUob3JpZ2luYXRpbmdGcmFtZUluZm9EYXRhLCBtX3Byb2Nlc3MtPndlYlBhZ2Uob3JpZ2luYXRp bmdQYWdlSUQpKTsKIAogICAgIGF1dG8gbWFpbkZyYW1lVVJMID0gbV9tYWluRnJhbWUtPnVybCgp OwpAQCAtNDcxNCw3ICs0NzM0LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNyZWF0ZU5ld1BhZ2Uo Y29uc3QgRnJhbWVJbmZvRGF0YSYgb3JpZ2luYXRpbmdGcmFtZUluZm9EYXRhLAogCiAgICAgICAg IG5ld1BhZ2UtPnNldE9wZW5lZEJ5RE9NKCk7CiAKLSAgICAgICAgcmVwbHkobmV3UGFnZS0+cGFn ZUlEKCksIG5ld1BhZ2UtPmNyZWF0aW9uUGFyYW1ldGVycygpKTsKKyAgICAgICAgcmVwbHkobmV3 UGFnZS0+cGFnZUlEKCksIG5ld1BhZ2UtPmNyZWF0aW9uUGFyYW1ldGVycyhtX3Byb2Nlc3MpKTsK IAogICAgICAgICBXZWJzaXRlRGF0YVN0b3JlOjpjbG9uZVNlc3Npb25EYXRhKCp0aGlzLCAqbmV3 UGFnZSk7CiAgICAgICAgIG5ld1BhZ2UtPm1fc2hvdWxkU3VwcHJlc3NBcHBMaW5rc0luTmV4dE5h dmlnYXRpb25Qb2xpY3lEZWNpc2lvbiA9IGhvc3RzQXJlRXF1YWwoVVJMKHsgfSwgbWFpbkZyYW1l VVJMKSwgcmVxdWVzdC51cmwoKSk7CkBAIC00NzY2LDcgKzQ3ODYsNyBAQCB2b2lkIFdlYlBhZ2VQ cm94eTo6Y2xvc2VQYWdlKGJvb2wgc3RvcFJlc3BvbnNpdmVuZXNzVGltZXIpCiB2b2lkIFdlYlBh Z2VQcm94eTo6cnVuSmF2YVNjcmlwdEFsZXJ0KHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3Vy aXR5T3JpZ2luRGF0YSYgc2VjdXJpdHlPcmlnaW4sIGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgTWVz c2FnZXM6OldlYlBhZ2VQcm94eTo6UnVuSmF2YVNjcmlwdEFsZXJ0OjpEZWxheWVkUmVwbHkmJiBy ZXBseSkKIHsKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUo ZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CisgICAgTUVTU0FHRV9DSEVDSyht X3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAg ZXhpdEZ1bGxzY3JlZW5JbW1lZGlhdGVseSgpOwpAQCAtNDc4NSw3ICs0ODA1LDcgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OnJ1bkphdmFTY3JpcHRBbGVydCh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBT ZWN1cml0eU9yaWdpbkRhdGEKIHZvaWQgV2ViUGFnZVByb3h5OjpydW5KYXZhU2NyaXB0Q29uZmly bSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIHNlY3VyaXR5T3Jp Z2luLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlJ1bkph dmFTY3JpcHRDb25maXJtOjpEZWxheWVkUmVwbHkmJiByZXBseSkKIHsKICAgICBXZWJGcmFtZVBy b3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9D SEVDSyhmcmFtZSk7CisgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsK IAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgZXhpdEZ1bGxzY3JlZW5JbW1lZGlhdGVs eSgpOwpAQCAtNDgwNSw3ICs0ODI1LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJ1bkphdmFTY3Jp cHRDb25maXJtKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaXR5T3JpZ2luRGEKIHZvaWQg V2ViUGFnZVByb3h5OjpydW5KYXZhU2NyaXB0UHJvbXB0KHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0 IFNlY3VyaXR5T3JpZ2luRGF0YSYgc2VjdXJpdHlPcmlnaW4sIGNvbnN0IFN0cmluZyYgbWVzc2Fn ZSwgY29uc3QgU3RyaW5nJiBkZWZhdWx0VmFsdWUsIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlJ1 bkphdmFTY3JpcHRQcm9tcHQ6OkRlbGF5ZWRSZXBseSYmIHJlcGx5KQogewogICAgIFdlYkZyYW1l UHJveHkqIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBNRVNTQUdF X0NIRUNLKGZyYW1lKTsKKyAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgZnJhbWUp OwogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBleGl0RnVsbHNjcmVlbkltbWVkaWF0 ZWx5KCk7CkBAIC00ODU2LDEwICs0ODc2LDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpwcm9jZXNz RGlkRmluaXNoTGF1bmNoaW5nKCkKICNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKIHZv aWQgV2ViUGFnZVByb3h5Ojp1bmF2YWlsYWJsZVBsdWdpbkJ1dHRvbkNsaWNrZWQodWludDMyX3Qg b3BhcXVlUGx1Z2luVW5hdmFpbGFiaWxpdHlSZWFzb24sIGNvbnN0IFN0cmluZyYgbWltZVR5cGUs IGNvbnN0IFN0cmluZyYgcGx1Z2luVVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIHBsdWdpbnNwYWdl QXR0cmlidXRlVVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIGZyYW1lVVJMU3RyaW5nLCBjb25zdCBT dHJpbmcmIHBhZ2VVUkxTdHJpbmcpCiB7Ci0gICAgTUVTU0FHRV9DSEVDS19VUkwocGx1Z2luVVJM U3RyaW5nKTsKLSAgICBNRVNTQUdFX0NIRUNLX1VSTChwbHVnaW5zcGFnZUF0dHJpYnV0ZVVSTFN0 cmluZyk7Ci0gICAgTUVTU0FHRV9DSEVDS19VUkwoZnJhbWVVUkxTdHJpbmcpOwotICAgIE1FU1NB R0VfQ0hFQ0tfVVJMKHBhZ2VVUkxTdHJpbmcpOworICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHByb2Nl c3MoKSwgcGx1Z2luVVJMU3RyaW5nKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChwcm9jZXNzKCks IHBsdWdpbnNwYWdlQXR0cmlidXRlVVJMU3RyaW5nKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChw cm9jZXNzKCksIGZyYW1lVVJMU3RyaW5nKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChwcm9jZXNz KCksIHBhZ2VVUkxTdHJpbmcpOwogCiAgICAgU3RyaW5nIG5ld01pbWVUeXBlID0gbWltZVR5cGU7 CiAgICAgUGx1Z2luTW9kdWxlSW5mbyBwbHVnaW4gPSBtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCku cGx1Z2luSW5mb1N0b3JlKCkuZmluZFBsdWdpbihuZXdNaW1lVHlwZSwgVVJMKFVSTCgpLCBwbHVn aW5VUkxTdHJpbmcpKTsKQEAgLTQ5ODUsNyArNTAwNSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpy b290Vmlld1RvQWNjZXNzaWJpbGl0eVNjcmVlbihjb25zdCBJbnRSZWN0JiB2aWV3UmVjdCwgSW50 UmVjCiB2b2lkIFdlYlBhZ2VQcm94eTo6cnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsKHVpbnQ2 NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYgc2VjdXJpdHlPcmlnaW4sIGNv bnN0IFN0cmluZyYgbWVzc2FnZSwgTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UnVuQmVmb3JlVW5s b2FkQ29uZmlybVBhbmVsOjpEZWxheWVkUmVwbHkmJiByZXBseSkKIHsKICAgICBXZWJGcmFtZVBy b3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9D SEVDSyhmcmFtZSk7CisgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsK IAogICAgIC8vIFBlciDCpzE4IFVzZXIgUHJvbXB0cyBpbiB0aGUgV2ViRHJpdmVyIHNwZWMsICJV c2VyIHByb21wdHMgdGhhdCBhcmUgc3Bhd25lZCBmcm9tIGJlZm9yZXVubG9hZAogICAgIC8vIGV2 ZW50IGhhbmRsZXJzLCBhcmUgZGlzbWlzc2VkIGltcGxpY2l0bHkgdXBvbiBuYXZpZ2F0aW9uIG9y IGNsb3NlIHdpbmRvdywgcmVnYXJkbGVzcyBvZiB0aGUKQEAgLTUwMzAsNyArNTA1MCw3IEBAIHZv aWQgV2ViUGFnZVByb3h5OjpydW5PcGVuUGFuZWwodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2Vj dXJpdHlPcmlnaW5EYXRhJiBmcmFtCiAgICAgfQogCiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUg PSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUp OworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBmcmFtZSk7CiAKICAgICBSZWY8 QVBJOjpPcGVuUGFuZWxQYXJhbWV0ZXJzPiBwYXJhbWV0ZXJzID0gQVBJOjpPcGVuUGFuZWxQYXJh bWV0ZXJzOjpjcmVhdGUoc2V0dGluZ3MpOwogICAgIG1fb3BlblBhbmVsUmVzdWx0TGlzdGVuZXIg PSBXZWJPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lclByb3h5OjpjcmVhdGUodGhpcyk7CkBAIC01MDY3 LDcgKzUwODcsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cHJpbnRGcmFtZSh1aW50NjRfdCBmcmFt ZUlEKQogICAgIG1faXNQZXJmb3JtaW5nRE9NUHJpbnRPcGVyYXRpb24gPSB0cnVlOwogCiAgICAg V2ViRnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAg IE1FU1NBR0VfQ0hFQ0soZnJhbWUpOworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgp LCBmcmFtZSk7CiAKICAgICBtX3VpQ2xpZW50LT5wcmludEZyYW1lKCp0aGlzLCAqZnJhbWUpOwog CkBAIC01MzU1LDE0ICs1Mzc1LDE5IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpiYWNrRm9yd2FyZEFk ZEl0ZW0oQmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlJiYgaXRlbVN0YXRlKQogfQogCiB2b2lkIFdl YlBhZ2VQcm94eTo6YmFja0ZvcndhcmRHb1RvSXRlbShjb25zdCBCYWNrRm9yd2FyZEl0ZW1JZGVu dGlmaWVyJiBpdGVtSUQsIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYgc2FuZGJveEV4dGVuc2lv bkhhbmRsZSkKK3sKKyAgICBiYWNrRm9yd2FyZEdvVG9JdGVtU2hhcmVkKG1fcHJvY2VzcywgaXRl bUlELCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsKK30KKwordm9pZCBXZWJQYWdlUHJveHk6OmJh Y2tGb3J3YXJkR29Ub0l0ZW1TaGFyZWQoV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzLCBjb25zdCBC YWNrRm9yd2FyZEl0ZW1JZGVudGlmaWVyJiBpdGVtSUQsIFNhbmRib3hFeHRlbnNpb246OkhhbmRs ZSYgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSkKIHsKICAgICBXZWJCYWNrRm9yd2FyZExpc3RJdGVt KiBpdGVtID0gbV9iYWNrRm9yd2FyZExpc3QtPml0ZW1Gb3JJRChpdGVtSUQpOwogICAgIGlmICgh aXRlbSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgYm9vbCBjcmVhdGVkRXh0ZW5zaW9uID0gbWF5 YmVJbml0aWFsaXplU2FuZGJveEV4dGVuc2lvbkhhbmRsZShVUkwoVVJMKCksIGl0ZW0tPnVybCgp KSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7CisgICAgYm9vbCBjcmVhdGVkRXh0ZW5zaW9uID0g bWF5YmVJbml0aWFsaXplU2FuZGJveEV4dGVuc2lvbkhhbmRsZShwcm9jZXNzLCBVUkwoVVJMKCks IGl0ZW0tPnVybCgpKSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7CiAgICAgaWYgKGNyZWF0ZWRF eHRlbnNpb24pCi0gICAgICAgIHdpbGxBY3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0 ZW5zaW9uKCk7CisgICAgICAgIHdpbGxBY3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0 ZW5zaW9uKHByb2Nlc3MpOwogICAgIG1fYmFja0ZvcndhcmRMaXN0LT5nb1RvSXRlbSgqaXRlbSk7 CiB9CiAKQEAgLTU4NDEsNyArNTg2Niw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpnZXRHdWVzc2Vz Rm9yV29yZChjb25zdCBTdHJpbmcmIHdvcmQsIGNvbnN0IFN0cmluZyYgY29udGV4dCwKIAogdm9p ZCBXZWJQYWdlUHJveHk6OmxlYXJuV29yZChjb25zdCBTdHJpbmcmIHdvcmQpCiB7Ci0gICAgTUVT U0FHRV9DSEVDSyhtX3BlbmRpbmdMZWFybk9ySWdub3JlV29yZE1lc3NhZ2VDb3VudCk7CisgICAg TUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIG1fcGVuZGluZ0xlYXJuT3JJZ25vcmVXb3Jk TWVzc2FnZUNvdW50KTsKICAgICAtLW1fcGVuZGluZ0xlYXJuT3JJZ25vcmVXb3JkTWVzc2FnZUNv dW50OwogCiAgICAgVGV4dENoZWNrZXI6OmxlYXJuV29yZChzcGVsbERvY3VtZW50VGFnKCksIHdv cmQpOwpAQCAtNTg0OSw3ICs1ODc0LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxlYXJuV29yZChj b25zdCBTdHJpbmcmIHdvcmQpCiAKIHZvaWQgV2ViUGFnZVByb3h5OjppZ25vcmVXb3JkKGNvbnN0 IFN0cmluZyYgd29yZCkKIHsKLSAgICBNRVNTQUdFX0NIRUNLKG1fcGVuZGluZ0xlYXJuT3JJZ25v cmVXb3JkTWVzc2FnZUNvdW50KTsKKyAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwg bV9wZW5kaW5nTGVhcm5Pcklnbm9yZVdvcmRNZXNzYWdlQ291bnQpOwogICAgIC0tbV9wZW5kaW5n TGVhcm5Pcklnbm9yZVdvcmRNZXNzYWdlQ291bnQ7CiAKICAgICBUZXh0Q2hlY2tlcjo6aWdub3Jl V29yZChzcGVsbERvY3VtZW50VGFnKCksIHdvcmQpOwpAQCAtNTk1MCw5ICs1OTc1LDkgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVFdmVudCh1aW50MzJfdCBvcGFxdWVUeXBlLCBib29s IGhhbmRsZWQpCiAgICAgICAgIExPRyhNb3VzZUhhbmRsaW5nLCAiV2ViUGFnZVByb3h5OjpkaWRS ZWNlaXZlRXZlbnQ6ICVzIChxdWV1ZSBzaXplICV6dSkiLCB3ZWJNb3VzZUV2ZW50VHlwZVN0cmlu Zyh0eXBlKSwgbV9tb3VzZUV2ZW50UXVldWUuc2l6ZSgpKTsKIAogICAgICAgICAvLyBSZXRpcmUg dGhlIGxhc3Qgc2VudCBldmVudCBub3cgdGhhdCBXZWJQcm9jZXNzIGlzIGRvbmUgaGFuZGxpbmcg aXQuCi0gICAgICAgIE1FU1NBR0VfQ0hFQ0soIW1fbW91c2VFdmVudFF1ZXVlLmlzRW1wdHkoKSk7 CisgICAgICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCAhbV9tb3VzZUV2ZW50UXVl dWUuaXNFbXB0eSgpKTsKICAgICAgICAgTmF0aXZlV2ViTW91c2VFdmVudCBldmVudCA9IG1fbW91 c2VFdmVudFF1ZXVlLnRha2VGaXJzdCgpOwotICAgICAgICBNRVNTQUdFX0NIRUNLKHR5cGUgPT0g ZXZlbnQudHlwZSgpKTsKKyAgICAgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIHR5 cGUgPT0gZXZlbnQudHlwZSgpKTsKIAogICAgICAgICBpZiAoIW1fbW91c2VFdmVudFF1ZXVlLmlz RW1wdHkoKSkgewogICAgICAgICAgICAgTE9HKE1vdXNlSGFuZGxpbmcsICIgVUlQcm9jZXNzOiBo YW5kbGluZyBhIHF1ZXVlZCBtb3VzZSBldmVudCBmcm9tIGRpZFJlY2VpdmVFdmVudCIpOwpAQCAt NTk2Nyw3ICs1OTkyLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVFdmVudCh1aW50 MzJfdCBvcGFxdWVUeXBlLCBib29sIGhhbmRsZWQpCiAgICAgfQogCiAgICAgY2FzZSBXZWJFdmVu dDo6V2hlZWw6IHsKLSAgICAgICAgTUVTU0FHRV9DSEVDSyghbV9jdXJyZW50bHlQcm9jZXNzZWRX aGVlbEV2ZW50cy5pc0VtcHR5KCkpOworICAgICAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5n ZXQoKSwgIW1fY3VycmVudGx5UHJvY2Vzc2VkV2hlZWxFdmVudHMuaXNFbXB0eSgpKTsKIAogICAg ICAgICBzdGQ6OnVuaXF1ZV9wdHI8VmVjdG9yPE5hdGl2ZVdlYldoZWVsRXZlbnQ+PiBvbGRlc3RD b2FsZXNjZWRFdmVudCA9IG1fY3VycmVudGx5UHJvY2Vzc2VkV2hlZWxFdmVudHMudGFrZUZpcnN0 KCk7CiAKQEAgLTU5ODgsMTAgKzYwMTMsMTAgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2Vp dmVFdmVudCh1aW50MzJfdCBvcGFxdWVUeXBlLCBib29sIGhhbmRsZWQpCiAgICAgY2FzZSBXZWJF dmVudDo6Q2hhcjogewogICAgICAgICBMT0coS2V5SGFuZGxpbmcsICJXZWJQYWdlUHJveHk6OmRp ZFJlY2VpdmVFdmVudDogJXMgKHF1ZXVlIGVtcHR5ICVkKSIsIHdlYktleWJvYXJkRXZlbnRUeXBl U3RyaW5nKHR5cGUpLCBtX2tleUV2ZW50UXVldWUuaXNFbXB0eSgpKTsKIAotICAgICAgICBNRVNT QUdFX0NIRUNLKCFtX2tleUV2ZW50UXVldWUuaXNFbXB0eSgpKTsKKyAgICAgICAgTUVTU0FHRV9D SEVDSyhtX3Byb2Nlc3MuZ2V0KCksICFtX2tleUV2ZW50UXVldWUuaXNFbXB0eSgpKTsKICAgICAg ICAgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCBldmVudCA9IG1fa2V5RXZlbnRRdWV1ZS50YWtlRmly c3QoKTsKIAotICAgICAgICBNRVNTQUdFX0NIRUNLKHR5cGUgPT0gZXZlbnQudHlwZSgpKTsKKyAg ICAgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIHR5cGUgPT0gZXZlbnQudHlwZSgp KTsKIAogICAgICAgICBib29sIGNhblByb2Nlc3NNb3JlS2V5RXZlbnRzID0gIW1fa2V5RXZlbnRR dWV1ZS5pc0VtcHR5KCk7CiAgICAgICAgIGlmIChjYW5Qcm9jZXNzTW9yZUtleUV2ZW50cykgewpA QCAtNjAxOCwxMCArNjA0MywxMCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZUV2ZW50 KHVpbnQzMl90IG9wYXF1ZVR5cGUsIGJvb2wgaGFuZGxlZCkKICAgICBjYXNlIFdlYkV2ZW50OjpH ZXN0dXJlU3RhcnQ6CiAgICAgY2FzZSBXZWJFdmVudDo6R2VzdHVyZUNoYW5nZToKICAgICBjYXNl IFdlYkV2ZW50OjpHZXN0dXJlRW5kOiB7Ci0gICAgICAgIE1FU1NBR0VfQ0hFQ0soIW1fZ2VzdHVy ZUV2ZW50UXVldWUuaXNFbXB0eSgpKTsKKyAgICAgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3Mu Z2V0KCksICFtX2dlc3R1cmVFdmVudFF1ZXVlLmlzRW1wdHkoKSk7CiAgICAgICAgIE5hdGl2ZVdl Ykdlc3R1cmVFdmVudCBldmVudCA9IG1fZ2VzdHVyZUV2ZW50UXVldWUudGFrZUZpcnN0KCk7CiAK LSAgICAgICAgTUVTU0FHRV9DSEVDSyh0eXBlID09IGV2ZW50LnR5cGUoKSk7CisgICAgICAgIE1F U1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCB0eXBlID09IGV2ZW50LnR5cGUoKSk7CiAKICAg ICAgICAgaWYgKCFoYW5kbGVkKQogICAgICAgICAgICAgcGFnZUNsaWVudCgpLmdlc3R1cmVFdmVu dFdhc05vdEhhbmRsZWRCeVdlYkNvcmUoZXZlbnQpOwpAQCAtNjA0MCwxMCArNjA2NSwxMCBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZUV2ZW50KHVpbnQzMl90IG9wYXF1ZVR5cGUsIGJv b2wgaGFuZGxlZCkKICAgICBjYXNlIFdlYkV2ZW50OjpUb3VjaE1vdmU6CiAgICAgY2FzZSBXZWJF dmVudDo6VG91Y2hFbmQ6CiAgICAgY2FzZSBXZWJFdmVudDo6VG91Y2hDYW5jZWw6IHsKLSAgICAg ICAgTUVTU0FHRV9DSEVDSyghbV90b3VjaEV2ZW50UXVldWUuaXNFbXB0eSgpKTsKKyAgICAgICAg TUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksICFtX3RvdWNoRXZlbnRRdWV1ZS5pc0VtcHR5 KCkpOwogICAgICAgICBRdWV1ZWRUb3VjaEV2ZW50cyBxdWV1ZWRFdmVudHMgPSBtX3RvdWNoRXZl bnRRdWV1ZS50YWtlRmlyc3QoKTsKIAotICAgICAgICBNRVNTQUdFX0NIRUNLKHR5cGUgPT0gcXVl dWVkRXZlbnRzLmZvcndhcmRlZEV2ZW50LnR5cGUoKSk7CisgICAgICAgIE1FU1NBR0VfQ0hFQ0so bV9wcm9jZXNzLmdldCgpLCB0eXBlID09IHF1ZXVlZEV2ZW50cy5mb3J3YXJkZWRFdmVudC50eXBl KCkpOwogCiAgICAgICAgIHBhZ2VDbGllbnQoKS5kb25lV2l0aFRvdWNoRXZlbnQocXVldWVkRXZl bnRzLmZvcndhcmRlZEV2ZW50LCBoYW5kbGVkKTsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCBxdWV1ZWRFdmVudHMuZGVmZXJyZWRUb3VjaEV2ZW50cy5zaXplKCk7ICsraSkgewpAQCAt NjE3MSw3ICs2MTk2LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnVuc2lnbmVkQ2FsbGJhY2sodWlu dDY0X3QgcmVzdWx0LCBDYWxsYmFja0lEIGNhbGxiYWNrSUQpCiAKIHZvaWQgV2ViUGFnZVByb3h5 OjplZGl0aW5nUmFuZ2VDYWxsYmFjayhjb25zdCBFZGl0aW5nUmFuZ2UmIHJhbmdlLCBDYWxsYmFj a0lEIGNhbGxiYWNrSUQpCiB7Ci0gICAgTUVTU0FHRV9DSEVDSyhyYW5nZS5pc1ZhbGlkKCkpOwor ICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCByYW5nZS5pc1ZhbGlkKCkpOwogCiAg ICAgYXV0byBjYWxsYmFjayA9IG1fY2FsbGJhY2tzLnRha2U8RWRpdGluZ1JhbmdlQ2FsbGJhY2s+ KGNhbGxiYWNrSUQpOwogICAgIGlmICghY2FsbGJhY2spIHsKQEAgLTYyNzIsNyArNjI5Nyw3IEBA IHZvaWQgV2ViUGFnZVByb3h5Ojpsb2dTY3JvbGxpbmdFdmVudCh1aW50MzJfdCBldmVudFR5cGUs IE1vbm90b25pY1RpbWUgdGltZXN0YW1wCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpyZWN0Rm9yQ2hh cmFjdGVyUmFuZ2VDYWxsYmFjayhjb25zdCBJbnRSZWN0JiByZWN0LCBjb25zdCBFZGl0aW5nUmFu Z2UmIGFjdHVhbFJhbmdlLCBDYWxsYmFja0lEIGNhbGxiYWNrSUQpCiB7Ci0gICAgTUVTU0FHRV9D SEVDSyhhY3R1YWxSYW5nZS5pc1ZhbGlkKCkpOworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNz LmdldCgpLCBhY3R1YWxSYW5nZS5pc1ZhbGlkKCkpOwogCiAgICAgYXV0byBjYWxsYmFjayA9IG1f Y2FsbGJhY2tzLnRha2U8UmVjdEZvckNoYXJhY3RlclJhbmdlQ2FsbGJhY2s+KGNhbGxiYWNrSUQp OwogICAgIGlmICghY2FsbGJhY2spIHsKQEAgLTYzMDUsNyArNjMzMCw3IEBAIHZvaWQgV2ViUGFn ZVByb3h5Ojpmb2N1c2VkRnJhbWVDaGFuZ2VkKHVpbnQ2NF90IGZyYW1lSUQpCiAgICAgfQogCiAg ICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwot ICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdl dCgpLCBmcmFtZSk7CiAKICAgICBtX2ZvY3VzZWRGcmFtZSA9IGZyYW1lOwogfQpAQCAtNjMxOCw3 ICs2MzQzLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmZyYW1lU2V0TGFyZ2VzdEZyYW1lQ2hhbmdl ZCh1aW50NjRfdCBmcmFtZUlEKQogICAgIH0KIAogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0g bV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsK KyAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgZnJhbWUpOwogCiAgICAgbV9mcmFt ZVNldExhcmdlc3RGcmFtZSA9IGZyYW1lOwogfQpAQCAtNjQwMyw2ICs2NDI4LDEzIEBAIHZvaWQg V2ViUGFnZVByb3h5Ojpwcm9jZXNzRGlkVGVybWluYXRlKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNv biByZWFzb24pCiAgICAgc3RvcEFsbFVSTFNjaGVtZVRhc2tzKCk7CiB9CiAKK3ZvaWQgV2ViUGFn ZVByb3h5Ojpwcm92aXNpb25hbFByb2Nlc3NEaWRUZXJtaW5hdGUoKQoreworICAgIEFTU0VSVCht X3Byb3Zpc2lvbmFsUGFnZSk7CisgICAgbV9wcm92aXNpb25hbFBhZ2UtPmNhbmNlbCgpOworICAg IG1fcHJvdmlzaW9uYWxQYWdlID0gbnVsbHB0cjsKK30KKwogc3RhdGljIGJvb2wgc2hvdWxkUmVs b2FkQWZ0ZXJQcm9jZXNzVGVybWluYXRpb24oUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uIHJlYXNv bikKIHsKICAgICBzd2l0Y2ggKHJlYXNvbikgewpAQCAtNjQ5MCw4ICs2NTIyLDYgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OnByb2Nlc3NXaWxsQmVjb21lRm9yZWdyb3VuZCgpCiB2b2lkIFdlYlBhZ2VQ cm94eTo6cmVzZXRTdGF0ZShSZXNldFN0YXRlUmVhc29uIHJlc2V0U3RhdGVSZWFzb24pCiB7CiAg ICAgbV9tYWluRnJhbWUgPSBudWxscHRyOwotICAgIG1fbWFpbkZyYW1lQ3JlYXRpb25IYW5kbGVy ID0gbnVsbHB0cjsKLSAgICBtX21haW5GcmFtZVdpbmRvd0NyZWF0aW9uSGFuZGxlciA9IG51bGxw dHI7CiAKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBtX3Njcm9sbGluZ1BlcmZvcm1hbmNlRGF0 YSA9IG51bGxwdHI7CkBAIC02NjgwLDcgKzY3MTAsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVz ZXRTdGF0ZUFmdGVyUHJvY2Vzc0V4aXRlZChQcm9jZXNzVGVybWluYXRpb25SZWFzb24gdGVybWlu YQogICAgIG1fcHJvY2Vzcy0+cHJvY2Vzc1Rlcm1pbmF0ZWQoKTsKIH0KIAotV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycyBXZWJQYWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycygpCitXZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKFdlYlBy b2Nlc3NQcm94eSYgcHJvY2VzcykKIHsKICAgICBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHBh cmFtZXRlcnM7CiAKQEAgLTY3ODIsOSArNjgxMiwxMyBAQCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKCkKICAgICBwYXJhbWV0ZXJzLmFw cGxpY2F0aW9uTWFuaWZlc3QgPSBtX2NvbmZpZ3VyYXRpb24tPmFwcGxpY2F0aW9uTWFuaWZlc3Qo KSA/IE9wdGlvbmFsPFdlYkNvcmU6OkFwcGxpY2F0aW9uTWFuaWZlc3Q+KG1fY29uZmlndXJhdGlv bi0+YXBwbGljYXRpb25NYW5pZmVzdCgpLT5hcHBsaWNhdGlvbk1hbmlmZXN0KCkpIDogV1RGOjpu dWxsb3B0OwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCisgICAgcGFyYW1l dGVycy5oYXNSZWdpc3RlcmVkU2VydmljZVdvcmtlcnMgPSBwcm9jZXNzLnByb2Nlc3NQb29sKCku bWF5SGF2ZVJlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyhtX3dlYnNpdGVEYXRhU3RvcmUpOworI2Vu ZGlmCisKICAgICBwYXJhbWV0ZXJzLm5lZWRzRm9udEF0dHJpYnV0ZXMgPSBtX25lZWRzRm9udEF0 dHJpYnV0ZXM7CiAKLSAgICBtX3Byb2Nlc3MtPmFkZFdlYlVzZXJDb250ZW50Q29udHJvbGxlclBy b3h5KG1fdXNlckNvbnRlbnRDb250cm9sbGVyLCBwYXJhbWV0ZXJzKTsKKyAgICBwcm9jZXNzLmFk ZFdlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5KG1fdXNlckNvbnRlbnRDb250cm9sbGVyLCBw YXJhbWV0ZXJzKTsKIAogICAgIHJldHVybiBwYXJhbWV0ZXJzOwogfQpAQCAtNjg1NSw3ICs2ODg5 LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmV4Y2VlZGVkRGF0YWJhc2VRdW90YSh1aW50NjRfdCBm cmFtZUlELCBjb25zdCBTdHJpbmcmIG9yaWdpbkkKICAgICBFeGNlZWRlZERhdGFiYXNlUXVvdGFS ZWNvcmRzOjpSZWNvcmQqIHJlY29yZCA9IHJlY29yZHMubmV4dCgpOwogICAgIHdoaWxlIChyZWNv cmQpIHsKICAgICAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1l KHJlY29yZC0+ZnJhbWVJRCk7Ci0gICAgICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOworICAgICAg ICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgZnJhbWUpOwogCiAgICAgICAgIGF1dG8g b3JpZ2luID0gQVBJOjpTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKFNlY3VyaXR5T3JpZ2luRGF0YTo6 ZnJvbURhdGFiYXNlSWRlbnRpZmllcihyZWNvcmQtPm9yaWdpbklkZW50aWZpZXIpLT5zZWN1cml0 eU9yaWdpbigpKTsKICAgICAgICAgbV91aUNsaWVudC0+ZXhjZWVkZWREYXRhYmFzZVF1b3RhKHRo aXMsIGZyYW1lLCBvcmlnaW4ucHRyKCksIHJlY29yZC0+ZGF0YWJhc2VOYW1lLCByZWNvcmQtPmRp c3BsYXlOYW1lLCByZWNvcmQtPmN1cnJlbnRRdW90YSwgcmVjb3JkLT5jdXJyZW50T3JpZ2luVXNh Z2UsIHJlY29yZC0+Y3VycmVudERhdGFiYXNlVXNhZ2UsIHJlY29yZC0+ZXhwZWN0ZWRVc2FnZSwg V1RGTW92ZShyZWNvcmQtPnJlcGx5KSk7CkBAIC02ODcyLDcgKzY5MDYsNyBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6cmVhY2hlZEFwcGxpY2F0aW9uQ2FjaGVPcmlnaW5RdW90YShjb25zdCBTdHJpbmcm IG9yaWdpbklkZW50aQogdm9pZCBXZWJQYWdlUHJveHk6OnJlcXVlc3RHZW9sb2NhdGlvblBlcm1p c3Npb25Gb3JGcmFtZSh1aW50NjRfdCBnZW9sb2NhdGlvbklELCB1aW50NjRfdCBmcmFtZUlELCBT dHJpbmcgb3JpZ2luSWRlbnRpZmllcikKIHsKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1f cHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7Cisg ICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKIAogICAgIC8vIEZJWE1F OiBHZW9sb2NhdGlvbiBzaG91bGQgcHJvYmFibHkgYmUgdXNpbmcgdG9TdHJpbmcoKSBhcyBpdHMg c3RyaW5nIHJlcHJlc2VudGF0aW9uIGluc3RlYWQgb2YgZGF0YWJhc2VJZGVudGlmaWVyKCkuCiAg ICAgYXV0byBvcmlnaW4gPSBBUEk6OlNlY3VyaXR5T3JpZ2luOjpjcmVhdGUoU2VjdXJpdHlPcmln aW5EYXRhOjpmcm9tRGF0YWJhc2VJZGVudGlmaWVyKG9yaWdpbklkZW50aWZpZXIpLT5zZWN1cml0 eU9yaWdpbigpKTsKQEAgLTY5MTEsNyArNjk0NSw3IEBAIFVzZXJNZWRpYVBlcm1pc3Npb25SZXF1 ZXN0TWFuYWdlclByb3h5JiBXZWJQYWdlUHJveHk6OnVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0 CiB2b2lkIFdlYlBhZ2VQcm94eTo6cmVxdWVzdFVzZXJNZWRpYVBlcm1pc3Npb25Gb3JGcmFtZSh1 aW50NjRfdCB1c2VyTWVkaWFJRCwgdWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6U2Vj dXJpdHlPcmlnaW5EYXRhJiAgdXNlck1lZGlhRG9jdW1lbnRPcmlnaW5EYXRhLCBjb25zdCBXZWJD b3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIHRvcExldmVsRG9jdW1lbnRPcmlnaW5EYXRhLCBjb25z dCBXZWJDb3JlOjpNZWRpYVN0cmVhbVJlcXVlc3QmIHJlcXVlc3QpCiB7CiAjaWYgRU5BQkxFKE1F RElBX1NUUkVBTSkKLSAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJ RCkpOworICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLmdldCgpLCBtX3Byb2Nlc3MtPndlYkZy YW1lKGZyYW1lSUQpKTsKIAogICAgIHVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlcigp LnJlcXVlc3RVc2VyTWVkaWFQZXJtaXNzaW9uRm9yRnJhbWUodXNlck1lZGlhSUQsIGZyYW1lSUQs IHVzZXJNZWRpYURvY3VtZW50T3JpZ2luRGF0YS5zZWN1cml0eU9yaWdpbigpLCB0b3BMZXZlbERv Y3VtZW50T3JpZ2luRGF0YS5zZWN1cml0eU9yaWdpbigpLCByZXF1ZXN0KTsKICNlbHNlCkBAIC02 OTI3LDcgKzY5NjEsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZW51bWVyYXRlTWVkaWFEZXZpY2Vz Rm9yRnJhbWUodWludDY0X3QgdXNlck1lZGlhSUQsIHVpbnQ2NF90CiB7CiAjaWYgRU5BQkxFKE1F RElBX1NUUkVBTSkKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJh bWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CisgICAgTUVTU0FHRV9DSEVD SyhtX3Byb2Nlc3MuZ2V0KCksIGZyYW1lKTsKIAogICAgIHVzZXJNZWRpYVBlcm1pc3Npb25SZXF1 ZXN0TWFuYWdlcigpLmVudW1lcmF0ZU1lZGlhRGV2aWNlc0ZvckZyYW1lKHVzZXJNZWRpYUlELCBm cmFtZUlELCB1c2VyTWVkaWFEb2N1bWVudE9yaWdpbkRhdGEuc2VjdXJpdHlPcmlnaW4oKSwgdG9w TGV2ZWxEb2N1bWVudE9yaWdpbkRhdGEuc2VjdXJpdHlPcmlnaW4oKSk7CiAjZWxzZQpAQCAtODE0 MywxNyArODE3NywyMiBAQCBXZWJVUkxTY2hlbWVIYW5kbGVyKiBXZWJQYWdlUHJveHk6OnVybFNj aGVtZUhhbmRsZXJGb3JTY2hlbWUoY29uc3QgU3RyaW5nJiBzY2hlbQogfQogCiB2b2lkIFdlYlBh Z2VQcm94eTo6c3RhcnRVUkxTY2hlbWVUYXNrKFVSTFNjaGVtZVRhc2tQYXJhbWV0ZXJzJiYgcGFy YW1ldGVycykKK3sKKyAgICBzdGFydFVSTFNjaGVtZVRhc2tTaGFyZWQobV9wcm9jZXNzLCBXVEZN b3ZlKHBhcmFtZXRlcnMpKTsKK30KKwordm9pZCBXZWJQYWdlUHJveHk6OnN0YXJ0VVJMU2NoZW1l VGFza1NoYXJlZChXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIFVSTFNjaGVtZVRhc2tQYXJhbWV0 ZXJzJiYgcGFyYW1ldGVycykKIHsKICAgICBhdXRvIGl0ZXJhdG9yID0gbV91cmxTY2hlbWVIYW5k bGVyc0J5SWRlbnRpZmllci5maW5kKHBhcmFtZXRlcnMuaGFuZGxlcklkZW50aWZpZXIpOwotICAg IE1FU1NBR0VfQ0hFQ0soaXRlcmF0b3IgIT0gbV91cmxTY2hlbWVIYW5kbGVyc0J5SWRlbnRpZmll ci5lbmQoKSk7CisgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGl0ZXJhdG9yICE9 IG1fdXJsU2NoZW1lSGFuZGxlcnNCeUlkZW50aWZpZXIuZW5kKCkpOwogCi0gICAgaXRlcmF0b3It PnZhbHVlLT5zdGFydFRhc2soKnRoaXMsIHBhcmFtZXRlcnMudGFza0lkZW50aWZpZXIsIFdURk1v dmUocGFyYW1ldGVycy5yZXF1ZXN0KSwgbnVsbHB0cik7CisgICAgaXRlcmF0b3ItPnZhbHVlLT5z dGFydFRhc2soKnRoaXMsIHByb2Nlc3MsIHBhcmFtZXRlcnMudGFza0lkZW50aWZpZXIsIFdURk1v dmUocGFyYW1ldGVycy5yZXF1ZXN0KSwgbnVsbHB0cik7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5 OjpzdG9wVVJMU2NoZW1lVGFzayh1aW50NjRfdCBoYW5kbGVySWRlbnRpZmllciwgdWludDY0X3Qg dGFza0lkZW50aWZpZXIpCiB7CiAgICAgYXV0byBpdGVyYXRvciA9IG1fdXJsU2NoZW1lSGFuZGxl cnNCeUlkZW50aWZpZXIuZmluZChoYW5kbGVySWRlbnRpZmllcik7Ci0gICAgTUVTU0FHRV9DSEVD SyhpdGVyYXRvciAhPSBtX3VybFNjaGVtZUhhbmRsZXJzQnlJZGVudGlmaWVyLmVuZCgpKTsKKyAg ICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcy5nZXQoKSwgaXRlcmF0b3IgIT0gbV91cmxTY2hlbWVI YW5kbGVyc0J5SWRlbnRpZmllci5lbmQoKSk7CiAKICAgICBpdGVyYXRvci0+dmFsdWUtPnN0b3BU YXNrKCp0aGlzLCB0YXNrSWRlbnRpZmllcik7CiB9CkBAIC04MTYxLDkgKzgyMDAsOSBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6c3RvcFVSTFNjaGVtZVRhc2sodWludDY0X3QgaGFuZGxlcklkZW50aWZp ZXIsIHVpbnQ2NF90IHRhc2tJZAogdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRTeW5jaHJvbm91c1VS TFNjaGVtZVRhc2soVVJMU2NoZW1lVGFza1BhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzLCBNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpMb2FkU3luY2hyb25vdXNVUkxTY2hlbWVUYXNrOjpEZWxheWVkUmVw bHkmJiByZXBseSkKIHsKICAgICBhdXRvIGl0ZXJhdG9yID0gbV91cmxTY2hlbWVIYW5kbGVyc0J5 SWRlbnRpZmllci5maW5kKHBhcmFtZXRlcnMuaGFuZGxlcklkZW50aWZpZXIpOwotICAgIE1FU1NB R0VfQ0hFQ0soaXRlcmF0b3IgIT0gbV91cmxTY2hlbWVIYW5kbGVyc0J5SWRlbnRpZmllci5lbmQo KSk7CisgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MuZ2V0KCksIGl0ZXJhdG9yICE9IG1fdXJs U2NoZW1lSGFuZGxlcnNCeUlkZW50aWZpZXIuZW5kKCkpOwogCi0gICAgaXRlcmF0b3ItPnZhbHVl LT5zdGFydFRhc2soKnRoaXMsIHBhcmFtZXRlcnMudGFza0lkZW50aWZpZXIsIFdURk1vdmUocGFy YW1ldGVycy5yZXF1ZXN0KSwgV1RGTW92ZShyZXBseSkpOworICAgIGl0ZXJhdG9yLT52YWx1ZS0+ c3RhcnRUYXNrKCp0aGlzLCBtX3Byb2Nlc3MsIHBhcmFtZXRlcnMudGFza0lkZW50aWZpZXIsIFdU Rk1vdmUocGFyYW1ldGVycy5yZXF1ZXN0KSwgV1RGTW92ZShyZXBseSkpOwogfQogCiAjaWYgRU5B QkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKQEAgLTg1MDIsMTIgKzg1NDEsMTIgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OnVwZGF0ZUN1cnJlbnRNb2RpZmllclN0YXRlKCkKICNlbmRpZgogfQog Ci1ib29sIFdlYlBhZ2VQcm94eTo6Y2hlY2tVUkxSZWNlaXZlZEZyb21DdXJyZW50T3JQcmV2aW91 c1dlYlByb2Nlc3MoY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpCitib29sIFdlYlBhZ2VQcm94eTo6 Y2hlY2tVUkxSZWNlaXZlZEZyb21DdXJyZW50T3JQcmV2aW91c1dlYlByb2Nlc3MoV2ViUHJvY2Vz c1Byb3h5JiBwcm9jZXNzLCBjb25zdCBTdHJpbmcmIHVybFN0cmluZykKIHsKLSAgICByZXR1cm4g Y2hlY2tVUkxSZWNlaXZlZEZyb21DdXJyZW50T3JQcmV2aW91c1dlYlByb2Nlc3MoVVJMKFVSTCgp LCB1cmxTdHJpbmcpKTsKKyAgICByZXR1cm4gY2hlY2tVUkxSZWNlaXZlZEZyb21DdXJyZW50T3JQ cmV2aW91c1dlYlByb2Nlc3MocHJvY2VzcywgVVJMKFVSTCgpLCB1cmxTdHJpbmcpKTsKIH0KIAot Ym9vbCBXZWJQYWdlUHJveHk6OmNoZWNrVVJMUmVjZWl2ZWRGcm9tQ3VycmVudE9yUHJldmlvdXNX ZWJQcm9jZXNzKGNvbnN0IFVSTCYgdXJsKQorYm9vbCBXZWJQYWdlUHJveHk6OmNoZWNrVVJMUmVj ZWl2ZWRGcm9tQ3VycmVudE9yUHJldmlvdXNXZWJQcm9jZXNzKFdlYlByb2Nlc3NQcm94eSYgcHJv Y2VzcywgY29uc3QgVVJMJiB1cmwpCiB7CiAgICAgaWYgKCF1cmwuaXNMb2NhbEZpbGUoKSkKICAg ICAgICAgcmV0dXJuIHRydWU7CkBAIC04NTI0LDcgKzg1NjMsNyBAQCBib29sIFdlYlBhZ2VQcm94 eTo6Y2hlY2tVUkxSZWNlaXZlZEZyb21DdXJyZW50T3JQcmV2aW91c1dlYlByb2Nlc3MoY29uc3Qg VVJMJiB1cgogICAgIGlmIChzdGQ6OmZpbmRfaWYobV9wcmV2aW91c2x5VmlzaXRlZFBhdGhzLmJl Z2luKCksIGxvY2FsUGF0aHNFbmQsIHN0YXJ0c1dpdGhVUkxQYXRoKSAhPSBsb2NhbFBhdGhzRW5k KQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIHJldHVybiBtX3Byb2Nlc3MtPmNoZWNrVVJM UmVjZWl2ZWRGcm9tV2ViUHJvY2Vzcyh1cmwpOworICAgIHJldHVybiBwcm9jZXNzLmNoZWNrVVJM UmVjZWl2ZWRGcm9tV2ViUHJvY2Vzcyh1cmwpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6YWRk UHJldmlvdXNseVZpc2l0ZWRQYXRoKGNvbnN0IFN0cmluZyYgcGF0aCkKQEAgLTg1MzIsMTAgKzg1 NzEsMTAgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmFkZFByZXZpb3VzbHlWaXNpdGVkUGF0aChjb25z dCBTdHJpbmcmIHBhdGgpCiAgICAgbV9wcmV2aW91c2x5VmlzaXRlZFBhdGhzLmFkZChwYXRoKTsK IH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OndpbGxBY3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRTYW5k Ym94RXh0ZW5zaW9uKCkKK3ZvaWQgV2ViUGFnZVByb3h5Ojp3aWxsQWNxdWlyZVVuaXZlcnNhbEZp bGVSZWFkU2FuZGJveEV4dGVuc2lvbihXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MpCiB7CiAgICAg bV9tYXlIYXZlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5zaW9uID0gdHJ1ZTsKLSAgICBw cm9jZXNzKCkud2lsbEFjcXVpcmVVbml2ZXJzYWxGaWxlUmVhZFNhbmRib3hFeHRlbnNpb24oKTsK KyAgICBwcm9jZXNzLndpbGxBY3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5zaW9u KCk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpzaW11bGF0ZURldmljZU9yaWVudGF0aW9uQ2hh bmdlKGRvdWJsZSBhbHBoYSwgZG91YmxlIGJldGEsIGRvdWJsZSBnYW1tYSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggZGU5ODY5NGFhMzdkYjNjN2YyY2UyN2NjODI5 YTkyMDAyMTFkZTEwZC4uZDFkODkwNDBkNDZhZmRkYmI0YzYxZTBmYzdkYWRkMjMyZDYyODY5MSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTIyNSw2ICsyMjUsNyBA QCBjbGFzcyBOYXRpdmVXZWJLZXlib2FyZEV2ZW50OwogY2xhc3MgTmF0aXZlV2ViTW91c2VFdmVu dDsKIGNsYXNzIE5hdGl2ZVdlYldoZWVsRXZlbnQ7CiBjbGFzcyBQYWdlQ2xpZW50OworY2xhc3Mg UHJvdmlzaW9uYWxQYWdlUHJveHk7CiBjbGFzcyBSZW1vdGVMYXllclRyZWVIb3N0OwogY2xhc3Mg UmVtb3RlTGF5ZXJUcmVlU2Nyb2xsaW5nUGVyZm9ybWFuY2VEYXRhOwogY2xhc3MgUmVtb3RlTGF5 ZXJUcmVlVHJhbnNhY3Rpb247CkBAIC0zNTcsNiArMzU4LDcgQEAgcHVibGljOgogICAgIFdlYkZy YW1lUHJveHkqIGZyYW1lU2V0TGFyZ2VzdEZyYW1lKCkgY29uc3QgeyByZXR1cm4gbV9mcmFtZVNl dExhcmdlc3RGcmFtZS5nZXQoKTsgfQogCiAgICAgRHJhd2luZ0FyZWFQcm94eSogZHJhd2luZ0Fy ZWEoKSBjb25zdCB7IHJldHVybiBtX2RyYXdpbmdBcmVhLmdldCgpOyB9CisgICAgRHJhd2luZ0Fy ZWFQcm94eSogcHJvdmlzaW9uYWxEcmF3aW5nQXJlYSgpIGNvbnN0OwogCiAgICAgV2ViTmF2aWdh dGlvblN0YXRlJiBuYXZpZ2F0aW9uU3RhdGUoKSB7IHJldHVybiAqbV9uYXZpZ2F0aW9uU3RhdGUu Z2V0KCk7IH0KIApAQCAtMzc5LDYgKzM4MSw3IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgYWRkc1Zp c2l0ZWRMaW5rcygpIGNvbnN0IHsgcmV0dXJuIG1fYWRkc1Zpc2l0ZWRMaW5rczsgfQogICAgIHZv aWQgc2V0QWRkc1Zpc2l0ZWRMaW5rcyhib29sIGFkZHNWaXNpdGVkTGlua3MpIHsgbV9hZGRzVmlz aXRlZExpbmtzID0gYWRkc1Zpc2l0ZWRMaW5rczsgfQorICAgIFZpc2l0ZWRMaW5rU3RvcmUmIHZp c2l0ZWRMaW5rU3RvcmUoKSB7IHJldHVybiBtX3Zpc2l0ZWRMaW5rU3RvcmU7IH0KIAogICAgIHZv aWQgZXhpdEZ1bGxzY3JlZW5JbW1lZGlhdGVseSgpOwogICAgIHZvaWQgZnVsbHNjcmVlbk1heVJl dHVyblRvSW5saW5lKCk7CkBAIC00NTgsOCArNDYxLDggQEAgcHVibGljOgogICAgIEFQSTo6SWNv bkxvYWRpbmdDbGllbnQmIGljb25Mb2FkaW5nQ2xpZW50KCkgeyByZXR1cm4gKm1faWNvbkxvYWRp bmdDbGllbnQ7IH0KICAgICB2b2lkIHNldEljb25Mb2FkaW5nQ2xpZW50KHN0ZDo6dW5pcXVlX3B0 cjxBUEk6Okljb25Mb2FkaW5nQ2xpZW50PiYmKTsKIAotICAgIGVudW0gY2xhc3MgSXNTd2FwRnJv bVN1c3BlbmRlZCB7IE5vLCBZZXMgfTsKLSAgICB2b2lkIGluaXRpYWxpemVXZWJQYWdlKElzU3dh cEZyb21TdXNwZW5kZWQgPSBJc1N3YXBGcm9tU3VzcGVuZGVkOjpObyk7CisgICAgdm9pZCBpbml0 aWFsaXplV2ViUGFnZSgpOworICAgIHZvaWQgc2V0RHJhd2luZ0FyZWEoc3RkOjp1bmlxdWVfcHRy PERyYXdpbmdBcmVhUHJveHk+JiYpOwogCiAgICAgV2Vha1B0cjxTZWNLZXlQcm94eVN0b3JlPiBz ZWNLZXlQcm94eVN0b3JlKGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJik7 CiAgICAgICAgIApAQCAtOTk3LDYgKzEwMDAsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBwcm9jZXNz RGlkQmVjb21lVW5yZXNwb25zaXZlKCk7CiAgICAgdm9pZCBwcm9jZXNzRGlkQmVjb21lUmVzcG9u c2l2ZSgpOwogICAgIHZvaWQgcHJvY2Vzc0RpZFRlcm1pbmF0ZShQcm9jZXNzVGVybWluYXRpb25S ZWFzb24pOworICAgIHZvaWQgcHJvdmlzaW9uYWxQcm9jZXNzRGlkVGVybWluYXRlKCk7CiAgICAg dm9pZCBkaXNwYXRjaFByb2Nlc3NEaWRUZXJtaW5hdGUoUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29u KTsKICAgICB2b2lkIHdpbGxDaGFuZ2VQcm9jZXNzSXNSZXNwb25zaXZlKCk7CiAgICAgdm9pZCBk aWRDaGFuZ2VQcm9jZXNzSXNSZXNwb25zaXZlKCk7CkBAIC0xMDU4LDcgKzEwNjIsNyBAQCBwdWJs aWM6CiAgICAgdm9pZCBkaWRDaG9vc2VGaWxlc0Zvck9wZW5QYW5lbChjb25zdCBWZWN0b3I8U3Ry aW5nPiYpOwogICAgIHZvaWQgZGlkQ2FuY2VsRm9yT3BlblBhbmVsKCk7CiAKLSAgICBXZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzIGNyZWF0aW9uUGFyYW1ldGVycygpOworICAgIFdlYlBhZ2VDcmVh dGlvblBhcmFtZXRlcnMgY3JlYXRpb25QYXJhbWV0ZXJzKFdlYlByb2Nlc3NQcm94eSYpOwogCiAg ICAgdm9pZCBoYW5kbGVEb3dubG9hZFJlcXVlc3QoRG93bmxvYWRQcm94eSopOwogCkBAIC0xNDE1 LDYgKzE0MTksMjggQEAgcHVibGljOgogICAgIEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyJiBlZGl0 YWJsZUltYWdlQ29udHJvbGxlcigpIHsgcmV0dXJuICptX2VkaXRhYmxlSW1hZ2VDb250cm9sbGVy OyB9CiAjZW5kaWYKIAorICAgIFByb3Zpc2lvbmFsUGFnZVByb3h5KiBwcm92aXNpb25hbFBhZ2VQ cm94eSgpIGNvbnN0IHsgcmV0dXJuIG1fcHJvdmlzaW9uYWxQYWdlLmdldCgpOyB9CisgICAgdm9p ZCBjb21taXRQcm92aXNpb25hbFBhZ2UodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdh dGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVu dFByb3ZpZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZp Y2F0ZUluZm8mLCBib29sIGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQsIE9wdGlvbmFsPFdlYkNvcmU6 Okhhc0luc2VjdXJlQ29udGVudD4gZm9yY2VkSGFzSW5zZWN1cmVDb250ZW50LCBjb25zdCBVc2Vy RGF0YSYpOworCisgICAgLy8gTG9naWMgc2hhcmVkIGJldHdlZW4gdGhlIFdlYlBhZ2VQcm94eSBh bmQgdGhlIFByb3Zpc2lvbmFsUGFnZVByb3h5LgorICAgIHZvaWQgZGlkU3RhcnRQcm92aXNpb25h bExvYWRGb3JGcmFtZVNoYXJlZChXZWJQcm9jZXNzUHJveHkmLCB1aW50NjRfdCBmcmFtZUlELCB1 aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFVSTCYmLCBVUkwmJiB1bnJlYWNoYWJsZVVSTCwgY29uc3Qg VXNlckRhdGEmKTsKKyAgICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZVNoYXJl ZChXZWJQcm9jZXNzUHJveHkmLCB1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3JlOjpTZWN1 cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25J RCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VF cnJvciYsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBkaWRSZWNlaXZlU2VydmVyUmVkaXJl Y3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZVNoYXJlZChXZWJQcm9jZXNzUHJveHkmLCB1aW50 NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdCYmLCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkUGVyZm9ybUNsaWVudFJlZGly ZWN0U2hhcmVkKFdlYlByb2Nlc3NQcm94eSYsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMU3RyaW5n LCBjb25zdCBTdHJpbmcmIGRlc3RpbmF0aW9uVVJMU3RyaW5nLCB1aW50NjRfdCBmcmFtZUlEKTsK KyAgICB2b2lkIGRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhU2hhcmVkKFdlYlByb2Nlc3NQ cm94eSYsIGNvbnN0IFdlYk5hdmlnYXRpb25EYXRhU3RvcmUmLCB1aW50NjRfdCBmcmFtZUlEKTsK KyAgICB2b2lkIGRpZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWVTaGFyZWQoV2ViUHJvY2Vz c1Byb3h5JiwgdWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBVUkwmJik7 CisgICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQXN5bmNTaGFyZWQoV2Vi UHJvY2Vzc1Byb3h5JiwgdWludDY0X3QgZnJhbWVJRCwgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5E YXRhJiYgZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBOYXZpZ2F0 aW9uQWN0aW9uRGF0YSYmLCBGcmFtZUluZm9EYXRhJiYsIHVpbnQ2NF90IG9yaWdpbmF0aW5nUGFn ZUlELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVxdWVzdCwgV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIElQQzo6Rm9ybURhdGFSZWZlcmVuY2UmJiByZXF1ZXN0 Qm9keSwgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYmIHJlZGlyZWN0UmVzcG9uc2UsIGNvbnN0 IFVzZXJEYXRhJiwgdWludDY0X3QgbGlzdGVuZXJJRCk7CisgICAgdm9pZCBkZWNpZGVQb2xpY3lG b3JSZXNwb25zZVNoYXJlZChXZWJQcm9jZXNzUHJveHkmLCB1aW50NjRfdCBmcmFtZUlELCBjb25z dCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2 NF90IG5hdmlnYXRpb25JRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYsIGNvbnN0 IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGJvb2wgY2FuU2hvd01JTUVUeXBlLCB1aW50NjRf dCBsaXN0ZW5lcklELCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgc3RhcnRVUkxTY2hlbWVU YXNrU2hhcmVkKFdlYlByb2Nlc3NQcm94eSYsIFVSTFNjaGVtZVRhc2tQYXJhbWV0ZXJzJiYpOwor ICAgIHZvaWQgbG9hZERhdGFXaXRoTmF2aWdhdGlvblNoYXJlZChXZWJQcm9jZXNzUHJveHkmLCBB UEk6Ok5hdmlnYXRpb24mLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBjb25zdCBTdHJpbmcm IE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkws IEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29yZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdM b2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmID0gV1RGOjpudWxsb3B0KTsKKyAg ICB2b2lkIGxvYWRSZXF1ZXN0V2l0aE5hdmlnYXRpb25TaGFyZWQoV2ViUHJvY2Vzc1Byb3h5Jiwg QVBJOjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlNo b3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViQ29y ZTo6U2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNE YXRhPiYmID0gV1RGOjpudWxsb3B0KTsKKyAgICB2b2lkIGJhY2tGb3J3YXJkR29Ub0l0ZW1TaGFy ZWQoV2ViUHJvY2Vzc1Byb3h5JiwgY29uc3QgV2ViQ29yZTo6QmFja0ZvcndhcmRJdGVtSWRlbnRp ZmllciYsIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYpOworCisgICAgLy8gSVBDOjpNZXNzYWdl UmVjZWl2ZXIKKyAgICAvLyBJbXBsZW1lbnRlZCBpbiBnZW5lcmF0ZWQgV2ViUGFnZVByb3h5TWVz c2FnZVJlY2VpdmVyLmNwcAorICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0 aW9uJiwgSVBDOjpEZWNvZGVyJikgb3ZlcnJpZGU7CisgICAgdm9pZCBkaWRSZWNlaXZlU3luY01l c3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJiwgc3RkOjp1bmlxdWVfcHRyPElQ Qzo6RW5jb2Rlcj4mKSBvdmVycmlkZTsKKwogcHJpdmF0ZToKICAgICBXZWJQYWdlUHJveHkoUGFn ZUNsaWVudCYsIFdlYlByb2Nlc3NQcm94eSYsIHVpbnQ2NF90IHBhZ2VJRCwgUmVmPEFQSTo6UGFn ZUNvbmZpZ3VyYXRpb24+JiYpOwogICAgIHZvaWQgcGxhdGZvcm1Jbml0aWFsaXplKCk7CkBAIC0x NDM5LDEyICsxNDY1LDYgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgc2V0VXNlckFnZW50KFN0cmlu ZyYmKTsKIAotICAgIC8vIElQQzo6TWVzc2FnZVJlY2VpdmVyCi0gICAgLy8gSW1wbGVtZW50ZWQg aW4gZ2VuZXJhdGVkIFdlYlBhZ2VQcm94eU1lc3NhZ2VSZWNlaXZlci5jcHAKLSAgICB2b2lkIGRp ZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIG92ZXJyaWRl OwotICAgIHZvaWQgZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6 RGVjb2RlciYsIHN0ZDo6dW5pcXVlX3B0cjxJUEM6OkVuY29kZXI+Jikgb3ZlcnJpZGU7Ci0KLQog ICAgIC8vIElQQzo6TWVzc2FnZVNlbmRlcgogICAgIGJvb2wgc2VuZE1lc3NhZ2Uoc3RkOjp1bmlx dWVfcHRyPElQQzo6RW5jb2Rlcj4sIE9wdGlvblNldDxJUEM6OlNlbmRPcHRpb24+KSBvdmVycmlk ZTsKICAgICBJUEM6OkNvbm5lY3Rpb24qIG1lc3NhZ2VTZW5kZXJDb25uZWN0aW9uKCkgb3ZlcnJp ZGU7CkBAIC0xNDk2LDcgKzE1MTYsNyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBkaWREZXN0cm95 TmF2aWdhdGlvbih1aW50NjRfdCBuYXZpZ2F0aW9uSUQpOwogCi0gICAgdm9pZCBkZWNpZGVQb2xp Y3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdlYkZyYW1lUHJveHkmLCBXZWJDb3JlOjpTZWN1cml0eU9y aWdpbkRhdGEmJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIE5h dmlnYXRpb25BY3Rpb25EYXRhJiYsIEZyYW1lSW5mb0RhdGEmJiwgdWludDY0X3Qgb3JpZ2luYXRp bmdQYWdlSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0 LCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgSVBDOjpGb3JtRGF0YVJlZmVyZW5jZSYmIHJl cXVlc3RCb2R5LCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYgcmVkaXJlY3RSZXNwb25zZSwg Y29uc3QgVXNlckRhdGEmLCBSZWY8UG9saWN5RGVjaXNpb25TZW5kZXI+JiYpOworICAgIHZvaWQg ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXZWJQcm9jZXNzUHJveHkmLCBXZWJGcmFt ZVByb3h5JiwgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiYgZnJhbWVTZWN1cml0eU9yaWdp biwgdWludDY0X3QgbmF2aWdhdGlvbklELCBOYXZpZ2F0aW9uQWN0aW9uRGF0YSYmLCBGcmFtZUlu Zm9EYXRhJiYsIHVpbnQ2NF90IG9yaWdpbmF0aW5nUGFnZUlELCBjb25zdCBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVxdWVzdCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYs IElQQzo6Rm9ybURhdGFSZWZlcmVuY2UmJiByZXF1ZXN0Qm9keSwgV2ViQ29yZTo6UmVzb3VyY2VS ZXNwb25zZSYmIHJlZGlyZWN0UmVzcG9uc2UsIGNvbnN0IFVzZXJEYXRhJiwgUmVmPFBvbGljeURl Y2lzaW9uU2VuZGVyPiYmKTsKICAgICB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rp b25Bc3luYyh1aW50NjRfdCBmcmFtZUlELCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmJiBm cmFtZVNlY3VyaXR5T3JpZ2luLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIE5hdmlnYXRpb25BY3Rp b25EYXRhJiYsIEZyYW1lSW5mb0RhdGEmJiwgdWludDY0X3Qgb3JpZ2luYXRpbmdQYWdlSUQsIGNv bnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0LCBXZWJDb3JlOjpS ZXNvdXJjZVJlcXVlc3QmJiwgSVBDOjpGb3JtRGF0YVJlZmVyZW5jZSYmIHJlcXVlc3RCb2R5LCBX ZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYgcmVkaXJlY3RSZXNwb25zZSwgY29uc3QgVXNlckRh dGEmLCB1aW50NjRfdCBsaXN0ZW5lcklEKTsKICAgICB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmln YXRpb25BY3Rpb25TeW5jKHVpbnQ2NF90IGZyYW1lSUQsIGJvb2wgaXNNYWluRnJhbWUsIFdlYkNv cmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5h dmlnYXRpb25JRCwgTmF2aWdhdGlvbkFjdGlvbkRhdGEmJiwgRnJhbWVJbmZvRGF0YSYmLCB1aW50 NjRfdCBvcmlnaW5hdGluZ1BhZ2VJRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBv cmlnaW5hbFJlcXVlc3QsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBJUEM6OkZvcm1EYXRh UmVmZXJlbmNlJiYgcmVxdWVzdEJvZHksIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmJiByZWRp cmVjdFJlc3BvbnNlLCBjb25zdCBVc2VyRGF0YSYsIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25TeW5jOjpEZWxheWVkUmVwbHkmJik7CiAgICAg dm9pZCBkZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24odWludDY0X3QgZnJhbWVJRCwgY29u c3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiBmcmFtZVNlY3VyaXR5T3JpZ2luLCBOYXZp Z2F0aW9uQWN0aW9uRGF0YSYmLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgY29uc3QgU3Ry aW5nJiBmcmFtZU5hbWUsIHVpbnQ2NF90IGxpc3RlbmVySUQsIGNvbnN0IFVzZXJEYXRhJik7CkBA IC0xNTc1LDE4ICsxNTk1LDE2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRDYW5TaG9ydENpcmN1 aXRIb3Jpem9udGFsV2hlZWxFdmVudHMoYm9vbCBjYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hl ZWxFdmVudHMpIHsgbV9jYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMgPSBjYW5T aG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHM7IH0KIAogICAgIHZvaWQgcmVhdHRhY2hU b1dlYlByb2Nlc3MoKTsKLSAgICB2b2lkIHN3YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQ cm94eT4mJiwgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiwgSXNTd2FwRnJv bVN1c3BlbmRlZCk7CisgICAgdm9pZCBzd2FwVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJv eHk+JiYsIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiYmLCBSZWZQdHI8V2ViRnJh bWVQcm94eT4mJiBtYWluRnJhbWUpOwogICAgIHZvaWQgZGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJv Y2Vzc1N3YXAoKTsKICAgICB2b2lkIGRpZFN1c3BlbmRBZnRlclByb2Nlc3NTd2FwKCk7CiAKLSAg ICB2b2lkIGZpbmlzaEF0dGFjaGluZ1RvV2ViUHJvY2VzcyhJc1N3YXBGcm9tU3VzcGVuZGVkID0g SXNTd2FwRnJvbVN1c3BlbmRlZDo6Tm8pOworICAgIGVudW0gY2xhc3MgU2hvdWxkSW5pdGlhbGl6 ZVdlYlBhZ2UgeyBObywgWWVzIH07CisgICAgdm9pZCBmaW5pc2hBdHRhY2hpbmdUb1dlYlByb2Nl c3MoU2hvdWxkSW5pdGlhbGl6ZVdlYlBhZ2UgPSBTaG91bGRJbml0aWFsaXplV2ViUGFnZTo6WWVz KTsKIAogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IHJlYXR0YWNoVG9XZWJQcm9jZXNzRm9y UmVsb2FkKCk7CiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVhdHRhY2hUb1dlYlByb2Nl c3NXaXRoSXRlbShXZWJCYWNrRm9yd2FyZExpc3RJdGVtJik7CiAKLSAgICB2b2lkIGxvYWREYXRh V2l0aE5hdmlnYXRpb24oQVBJOjpOYXZpZ2F0aW9uJiwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNl JiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZywgY29uc3Qg U3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFdlYkNvcmU6OlNob3VsZFRy ZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9IFdU Rjo6bnVsbG9wdCk7Ci0gICAgdm9pZCBsb2FkUmVxdWVzdFdpdGhOYXZpZ2F0aW9uKEFQSTo6TmF2 aWdhdGlvbiYsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBXZWJDb3JlOjpTaG91bGRPcGVu RXh0ZXJuYWxVUkxzUG9saWN5LCBBUEk6Ok9iamVjdCogdXNlckRhdGEsIFdlYkNvcmU6OlNob3Vs ZFRyZWF0QXNDb250aW51aW5nTG9hZCwgT3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiA9 IFdURjo6bnVsbG9wdCk7Ci0KICAgICB2b2lkIHJlcXVlc3ROb3RpZmljYXRpb25QZXJtaXNzaW9u KHVpbnQ2NF90IG5vdGlmaWNhdGlvbklELCBjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZyk7CiAg ICAgdm9pZCBzaG93Tm90aWZpY2F0aW9uKGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmlu ZyYgYm9keSwgY29uc3QgU3RyaW5nJiBpY29uVVJMLCBjb25zdCBTdHJpbmcmIHRhZywgY29uc3Qg U3RyaW5nJiBsYW5nLCBXZWJDb3JlOjpOb3RpZmljYXRpb25EaXJlY3Rpb24sIGNvbnN0IFN0cmlu ZyYgb3JpZ2luU3RyaW5nLCB1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CiAgICAgdm9pZCBjYW5j ZWxOb3RpZmljYXRpb24odWludDY0X3Qgbm90aWZpY2F0aW9uSUQpOwpAQCAtMTc0NSw3ICsxNzYz LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldFBsdWdpbkNvbXBsZXhUZXh0SW5wdXRTdGF0ZSh1 aW50NjRfdCBwbHVnaW5Db21wbGV4VGV4dElucHV0SWRlbnRpZmllciwgdWludDY0X3QgY29tcGxl eFRleHRJbnB1dFN0YXRlKTsKICNlbmRpZgogCi0gICAgYm9vbCBtYXliZUluaXRpYWxpemVTYW5k Ym94RXh0ZW5zaW9uSGFuZGxlKGNvbnN0IFVSTCYsIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYp OworICAgIGJvb2wgbWF5YmVJbml0aWFsaXplU2FuZGJveEV4dGVuc2lvbkhhbmRsZShXZWJQcm9j ZXNzUHJveHkmLCBjb25zdCBVUkwmLCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUmKTsKIAogI2lm IFVTRShBVVRPTUFUSUNfVEVYVF9SRVBMQUNFTUVOVCkKICAgICB2b2lkIHRvZ2dsZVNtYXJ0SW5z ZXJ0RGVsZXRlKCk7CkBAIC0xODY0LDkgKzE4ODIsOSBAQCBwcml2YXRlOgogICAgIHZvaWQgc3Rv cFVSTFNjaGVtZVRhc2sodWludDY0X3QgaGFuZGxlcklkZW50aWZpZXIsIHVpbnQ2NF90IHRhc2tJ ZGVudGlmaWVyKTsKICAgICB2b2lkIGxvYWRTeW5jaHJvbm91c1VSTFNjaGVtZVRhc2soVVJMU2No ZW1lVGFza1BhcmFtZXRlcnMmJiwgTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6TG9hZFN5bmNocm9u b3VzVVJMU2NoZW1lVGFzazo6RGVsYXllZFJlcGx5JiYpOwogCi0gICAgYm9vbCBjaGVja1VSTFJl Y2VpdmVkRnJvbUN1cnJlbnRPclByZXZpb3VzV2ViUHJvY2Vzcyhjb25zdCBTdHJpbmcmKTsKLSAg ICBib29sIGNoZWNrVVJMUmVjZWl2ZWRGcm9tQ3VycmVudE9yUHJldmlvdXNXZWJQcm9jZXNzKGNv bnN0IFVSTCYpOwotICAgIHZvaWQgd2lsbEFjcXVpcmVVbml2ZXJzYWxGaWxlUmVhZFNhbmRib3hF eHRlbnNpb24oKTsKKyAgICBib29sIGNoZWNrVVJMUmVjZWl2ZWRGcm9tQ3VycmVudE9yUHJldmlv dXNXZWJQcm9jZXNzKFdlYlByb2Nlc3NQcm94eSYsIGNvbnN0IFN0cmluZyYpOworICAgIGJvb2wg Y2hlY2tVUkxSZWNlaXZlZEZyb21DdXJyZW50T3JQcmV2aW91c1dlYlByb2Nlc3MoV2ViUHJvY2Vz c1Byb3h5JiwgY29uc3QgVVJMJik7CisgICAgdm9pZCB3aWxsQWNxdWlyZVVuaXZlcnNhbEZpbGVS ZWFkU2FuZGJveEV4dGVuc2lvbihXZWJQcm9jZXNzUHJveHkmKTsKIAogICAgIHZvaWQgaGFuZGxl QXV0b0ZpbGxCdXR0b25DbGljayhjb25zdCBVc2VyRGF0YSYpOwogCkBAIC0xOTUyLDggKzE5NzAs NiBAQCBwcml2YXRlOgogICAgIFJlZjxXZWJzaXRlRGF0YVN0b3JlPiBtX3dlYnNpdGVEYXRhU3Rv cmU7CiAKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9tYWluRnJhbWU7Ci0gICAgRnVuY3Rp b248dm9pZCgpPiBtX21haW5GcmFtZUNyZWF0aW9uSGFuZGxlcjsKLSAgICBGdW5jdGlvbjx2b2lk KGNvbnN0IFdlYkNvcmU6Okdsb2JhbFdpbmRvd0lkZW50aWZpZXImKT4gbV9tYWluRnJhbWVXaW5k b3dDcmVhdGlvbkhhbmRsZXI7CiAKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9mb2N1c2Vk RnJhbWU7CiAgICAgUmVmUHRyPFdlYkZyYW1lUHJveHk+IG1fZnJhbWVTZXRMYXJnZXN0RnJhbWU7 CkBAIC0yMzI0LDYgKzIzNDAsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9uZWVkc0ZvbnRBdHRy aWJ1dGVzIHsgZmFsc2UgfTsKICAgICBib29sIG1fbWF5SGF2ZVVuaXZlcnNhbEZpbGVSZWFkU2Fu ZGJveEV4dGVuc2lvbiB7IGZhbHNlIH07CiAKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJvdmlzaW9u YWxQYWdlUHJveHk+IG1fcHJvdmlzaW9uYWxQYWdlOworCiAjaWYgSEFWRShQRU5DSUxLSVQpCiAg ICAgc3RkOjp1bmlxdWVfcHRyPEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyPiBtX2VkaXRhYmxlSW1h Z2VDb250cm9sbGVyOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQcm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Byb3h5LmNwcAppbmRleCBkYjFmZDU4YjkzZGZmNTg2NWQxM2ZjNTQxYjZlNWQ4NzQ2ZWI4ZTBh Li42YmU5ZGMzOTllMDE0ODhkYTY3OGZiNDU2OGVmMzZiMjFmM2M0ODc2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKQEAgLTM0LDYgKzM0LDcgQEAKICNp bmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiUGx1Z2luSW5mb1N0b3JlLmgiCiAjaW5jbHVk ZSAiUGx1Z2luUHJvY2Vzc01hbmFnZXIuaCIKKyNpbmNsdWRlICJQcm92aXNpb25hbFBhZ2VQcm94 eS5oIgogI2luY2x1ZGUgIlRleHRDaGVja2VyLmgiCiAjaW5jbHVkZSAiVGV4dENoZWNrZXJTdGF0 ZS5oIgogI2luY2x1ZGUgIlVJTWVzc2FnZVBvcnRDaGFubmVsUHJvdmlkZXIuaCIKQEAgLTU4NCw2 ICs1ODUsMTUgQEAgYm9vbCBXZWJQcm9jZXNzUHJveHk6OmZ1bGxLZXlib2FyZEFjY2Vzc0VuYWJs ZWQoKQogfQogI2VuZGlmCiAKK2Jvb2wgV2ViUHJvY2Vzc1Byb3h5OjpoYXNQcm92aXNpb25hbFBh Z2VXaXRoSUQodWludDY0X3QgcGFnZUlEKSBjb25zdAoreworICAgIGZvciAoYXV0byogcHJvdmlz aW9uYWxQYWdlIDogbV9wcm92aXNpb25hbFBhZ2VzKSB7CisgICAgICAgIGlmIChwcm92aXNpb25h bFBhZ2UtPnBhZ2UoKS5wYWdlSUQoKSA9PSBwYWdlSUQpCisgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorCiB2b2lkIFdlYlByb2Nlc3NQcm94eTo6 dXBkYXRlQmFja0ZvcndhcmRJdGVtKGNvbnN0IEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSYgaXRl bVN0YXRlKQogewogICAgIGlmIChhdXRvKiBpdGVtID0gV2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6 aXRlbUZvcklEKGl0ZW1TdGF0ZS5pZGVudGlmaWVyKSkgewpAQCAtNTkxLDcgKzYwMSw3IEBAIHZv aWQgV2ViUHJvY2Vzc1Byb3h5Ojp1cGRhdGVCYWNrRm9yd2FyZEl0ZW0oY29uc3QgQmFja0Zvcndh cmRMaXN0SXRlbVN0YXRlJiBpdGVtCiAgICAgICAgIC8vIHRoZSBiYWNrL2ZvcndhcmQgaXRlbXMg cGFnZS4KICAgICAgICAgLy8gZS5nLiBUaGUgb2xkIHdlYiBwcm9jZXNzIGlzIG5hdmlnYXRpbmcg dG8gYWJvdXQ6YmxhbmsgZm9yIHN1c3BlbnNpb24uCiAgICAgICAgIC8vIFdlIGlnbm9yZSB0aGVz ZSB1cGRhdGVzLgotICAgICAgICBpZiAobV9wYWdlTWFwLmNvbnRhaW5zKGl0ZW0tPnBhZ2VJRCgp KSkKKyAgICAgICAgaWYgKG1fcGFnZU1hcC5jb250YWlucyhpdGVtLT5wYWdlSUQoKSkgfHwgaGFz UHJvdmlzaW9uYWxQYWdlV2l0aElEKGl0ZW0tPnBhZ2VJRCgpKSkKICAgICAgICAgICAgIGl0ZW0t PnNldFBhZ2VTdGF0ZShpdGVtU3RhdGUucGFnZVN0YXRlKTsKICAgICB9CiB9CkBAIC02OTQsNiAr NzA0LDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OnByb2Nlc3NEaWRUZXJtaW5hdGVPckZhaWxl ZFRvTGF1bmNoKCkKICAgICAgICAgd2ViQ29ubmVjdGlvbi0+ZGlkQ2xvc2UoKTsKIAogICAgIGF1 dG8gcGFnZXMgPSBjb3B5VG9WZWN0b3JPZjxSZWZQdHI8V2ViUGFnZVByb3h5Pj4obV9wYWdlTWFw LnZhbHVlcygpKTsKKyAgICBhdXRvIHByb3Zpc2lvbmFsUGFnZXMgPSBXVEY6Om1hcChtX3Byb3Zp c2lvbmFsUGFnZXMsIFtdKGF1dG8qIHByb3Zpc2lvbmFsUGFnZSkgeyByZXR1cm4gbWFrZVdlYWtQ dHIocHJvdmlzaW9uYWxQYWdlKTsgfSk7CiAKICAgICBzaHV0RG93bigpOwogCkBAIC03MDgsNiAr NzE5LDExIEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojpwcm9jZXNzRGlkVGVybWluYXRlT3JGYWls ZWRUb0xhdW5jaCgpCiAKICAgICBmb3IgKGF1dG8mIHBhZ2UgOiBwYWdlcykKICAgICAgICAgcGFn ZS0+cHJvY2Vzc0RpZFRlcm1pbmF0ZShQcm9jZXNzVGVybWluYXRpb25SZWFzb246OkNyYXNoKTsK KworICAgIGZvciAoYXV0byYgcHJvdmlzaW9uYWxQYWdlIDogcHJvdmlzaW9uYWxQYWdlcykgewor ICAgICAgICBpZiAocHJvdmlzaW9uYWxQYWdlKQorICAgICAgICAgICAgcHJvdmlzaW9uYWxQYWdl LT5wcm9jZXNzRGlkVGVybWluYXRlKCk7CisgICAgfQogfQogCiB2b2lkIFdlYlByb2Nlc3NQcm94 eTo6ZGlkUmVjZWl2ZUludmFsaWRNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwg SVBDOjpTdHJpbmdSZWZlcmVuY2UgbWVzc2FnZVJlY2VpdmVyTmFtZSwgSVBDOjpTdHJpbmdSZWZl cmVuY2UgbWVzc2FnZU5hbWUpCkBAIC03ODAsNiArNzk2LDEyIEBAIHZvaWQgV2ViUHJvY2Vzc1By b3h5OjpkaWRGaW5pc2hMYXVuY2hpbmcoUHJvY2Vzc0xhdW5jaGVyKiBsYXVuY2hlciwgSVBDOjpD b25uZWN0CiAgICAgICAgIHBhZ2UtPnByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmcoKTsKICAgICB9 CiAKKyAgICBmb3IgKGF1dG8qIHByb3Zpc2lvbmFsUGFnZSA6IG1fcHJvdmlzaW9uYWxQYWdlcykg eworICAgICAgICBBU1NFUlQodGhpcyA9PSAmcHJvdmlzaW9uYWxQYWdlLT5wcm9jZXNzKCkpOwor ICAgICAgICBwcm92aXNpb25hbFBhZ2UtPnByb2Nlc3NEaWRGaW5pc2hMYXVuY2hpbmcoKTsKKyAg ICB9CisKKwogICAgIFJFTEVBU0VfQVNTRVJUKCFtX3dlYkNvbm5lY3Rpb24pOwogICAgIG1fd2Vi Q29ubmVjdGlvbiA9IFdlYkNvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmNyZWF0ZSh0aGlzKTsKIApA QCAtODczLDcgKzg5NSw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjptYXliZVNodXREb3duKCkK IAogYm9vbCBXZWJQcm9jZXNzUHJveHk6OmNhblRlcm1pbmF0ZUNoaWxkUHJvY2VzcygpCiB7Ci0g ICAgaWYgKCFtX3BhZ2VNYXAuaXNFbXB0eSgpIHx8IG1fcHJvY2Vzc1Bvb2wtPmhhc1N1c3BlbmRl ZFBhZ2VGb3IoKnRoaXMpKQorICAgIGlmICghbV9wYWdlTWFwLmlzRW1wdHkoKSB8fCBtX3Byb2Nl c3NQb29sLT5oYXNTdXNwZW5kZWRQYWdlRm9yKCp0aGlzKSB8fCAhbV9wcm92aXNpb25hbFBhZ2Vz LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKCFtX3Byb2Nlc3NQ b29sLT5zaG91bGRUZXJtaW5hdGUodGhpcykpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBy b2Nlc3NQcm94eS5oCmluZGV4IDc1ZjY1YTdmN2ViMWFjYzgxOTk5MWNlNGY5ZjY5ODZjOTViNjFm ZjMuLjUwNDI2MzBkZTM3MWQ4NWE4MjgzNzQzNDhhYTk2OTE3MzljOWNkNzAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCkBAIC03MCw2ICs3MCw3IEBAIG5hbWVz cGFjZSBXZWJLaXQgewogY2xhc3MgTmV0d29ya1Byb2Nlc3NQcm94eTsKIGNsYXNzIE9iakNPYmpl Y3RHcmFwaDsKIGNsYXNzIFBhZ2VDbGllbnQ7CitjbGFzcyBQcm92aXNpb25hbFBhZ2VQcm94eTsK IGNsYXNzIFVzZXJNZWRpYUNhcHR1cmVNYW5hZ2VyUHJveHk7CiBjbGFzcyBWaXNpdGVkTGlua1N0 b3JlOwogY2xhc3MgV2ViQmFja0ZvcndhcmRMaXN0SXRlbTsKQEAgLTEyNCw2ICsxMjUsOSBAQCBw dWJsaWM6CiAgICAgZW51bSBjbGFzcyBFbmRzVXNpbmdEYXRhU3RvcmUgOiBib29sIHsgTm8sIFll cyB9OwogICAgIHZvaWQgcmVtb3ZlV2ViUGFnZShXZWJQYWdlUHJveHkmLCB1aW50NjRfdCBwYWdl SUQsIEVuZHNVc2luZ0RhdGFTdG9yZSk7CiAKKyAgICB2b2lkIGFkZFByb3Zpc2lvbmFsUGFnZVBy b3h5KFByb3Zpc2lvbmFsUGFnZVByb3h5JiBwcm92aXNpb25hbFBhZ2UpIHsgQVNTRVJUKCFtX3By b3Zpc2lvbmFsUGFnZXMuY29udGFpbnMoJnByb3Zpc2lvbmFsUGFnZSkpOyBtX3Byb3Zpc2lvbmFs UGFnZXMuYWRkKCZwcm92aXNpb25hbFBhZ2UpOyB9CisgICAgdm9pZCByZW1vdmVQcm92aXNpb25h bFBhZ2VQcm94eShQcm92aXNpb25hbFBhZ2VQcm94eSYgcHJvdmlzaW9uYWxQYWdlKSB7IEFTU0VS VChtX3Byb3Zpc2lvbmFsUGFnZXMuY29udGFpbnMoJnByb3Zpc2lvbmFsUGFnZSkpOyBtX3Byb3Zp c2lvbmFsUGFnZXMucmVtb3ZlKCZwcm92aXNpb25hbFBhZ2UpOyB9CisKICAgICB0eXBlbmFtZSBX ZWJQYWdlUHJveHlNYXA6OlZhbHVlc0NvbnN0SXRlcmF0b3JSYW5nZSBwYWdlcygpIGNvbnN0IHsg cmV0dXJuIG1fcGFnZU1hcC52YWx1ZXMoKTsgfQogICAgIHVuc2lnbmVkIHBhZ2VDb3VudCgpIGNv bnN0IHsgcmV0dXJuIG1fcGFnZU1hcC5zaXplKCk7IH0KICAgICB1bnNpZ25lZCB2aXNpYmxlUGFn ZUNvdW50KCkgY29uc3QgeyByZXR1cm4gbV92aXNpYmxlUGFnZUNvdW50ZXIudmFsdWUoKTsgfQpA QCAtMzMwLDYgKzMzNCw4IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGxvZ0RpYWdub3N0aWNNZXNz YWdlRm9yUmVzb3VyY2VMaW1pdFRlcm1pbmF0aW9uKGNvbnN0IFN0cmluZyYgbGltaXRLZXkpOwog CisgICAgYm9vbCBoYXNQcm92aXNpb25hbFBhZ2VXaXRoSUQodWludDY0X3QgcGFnZUlEKSBjb25z dDsKKwogICAgIGVudW0gY2xhc3MgSXNXZWFrIHsgTm8sIFllcyB9OwogICAgIHRlbXBsYXRlPHR5 cGVuYW1lIFQ+IGNsYXNzIFdlYWtPclN0cm9uZ1B0ciB7CiAgICAgcHVibGljOgpAQCAtMzczLDYg KzM3OSw3IEBAIHByaXZhdGU6CiAKICAgICBXZWJQYWdlUHJveHlNYXAgbV9wYWdlTWFwOwogICAg IFdlYkZyYW1lUHJveHlNYXAgbV9mcmFtZU1hcDsKKyAgICBIYXNoU2V0PFByb3Zpc2lvbmFsUGFn ZVByb3h5Kj4gbV9wcm92aXNpb25hbFBhZ2VzOwogICAgIFVzZXJJbml0aWF0ZWRBY3Rpb25NYXAg bV91c2VySW5pdGlhdGVkQWN0aW9uTWFwOwogCiAgICAgSGFzaFNldDxWaXNpdGVkTGlua1N0b3Jl Kj4gbV92aXNpdGVkTGlua1N0b3JlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlVSTFNjaGVtZUhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi VVJMU2NoZW1lSGFuZGxlci5jcHAKaW5kZXggYTA5ZWRkOTFhZGI1ZGJmYWIxNDA1Mjc4YmIxMmZk Mjk3YzFhMTNjOS4uNWJhN2ZjZWY4ZTQzOGJkMmQ3N2JmMmVlNzU5N2ZjMWI5YTE4NzUxYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViVVJMU2NoZW1lSGFuZGxlci5jcHAK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViVVJMU2NoZW1lSGFuZGxlci5jcHAKQEAg LTQ4LDkgKzQ4LDkgQEAgV2ViVVJMU2NoZW1lSGFuZGxlcjo6fldlYlVSTFNjaGVtZUhhbmRsZXIo KQogICAgIEFTU0VSVChtX3Rhc2tzLmlzRW1wdHkoKSk7CiB9CiAKLXZvaWQgV2ViVVJMU2NoZW1l SGFuZGxlcjo6c3RhcnRUYXNrKFdlYlBhZ2VQcm94eSYgcGFnZSwgdWludDY0X3QgdGFza0lkZW50 aWZpZXIsIFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFN5bmNMb2FkQ29tcGxldGlvbkhhbmRs ZXImJiBjb21wbGV0aW9uSGFuZGxlcikKK3ZvaWQgV2ViVVJMU2NoZW1lSGFuZGxlcjo6c3RhcnRU YXNrKFdlYlBhZ2VQcm94eSYgcGFnZSwgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzLCB1aW50NjRf dCB0YXNrSWRlbnRpZmllciwgUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgU3luY0xvYWRDb21w bGV0aW9uSGFuZGxlciYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGF1dG8gcmVzdWx0ID0g bV90YXNrcy5hZGQodGFza0lkZW50aWZpZXIsIFdlYlVSTFNjaGVtZVRhc2s6OmNyZWF0ZSgqdGhp cywgcGFnZSwgdGFza0lkZW50aWZpZXIsIFdURk1vdmUocmVxdWVzdCksIFdURk1vdmUoY29tcGxl dGlvbkhhbmRsZXIpKSk7CisgICAgYXV0byByZXN1bHQgPSBtX3Rhc2tzLmFkZCh0YXNrSWRlbnRp ZmllciwgV2ViVVJMU2NoZW1lVGFzazo6Y3JlYXRlKCp0aGlzLCBwYWdlLCBwcm9jZXNzLCB0YXNr SWRlbnRpZmllciwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikp KTsKICAgICBBU1NFUlQocmVzdWx0LmlzTmV3RW50cnkpOwogCiAgICAgYXV0byBwYWdlRW50cnkg PSBtX3Rhc2tzQnlQYWdlSWRlbnRpZmllci5hZGQocGFnZS5wYWdlSUQoKSwgSGFzaFNldDx1aW50 NjRfdD4oKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJVUkxTY2hl bWVIYW5kbGVyLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJVUkxTY2hlbWVIYW5kbGVy LmgKaW5kZXggYjc4NGE1M2E0YjE3ZTMwNmRmM2ZhOWE3ZmEyOTEwYTAwMDAzMTZmOS4uYWM4MTJm MjVjMTZlMTk5N2M5ZTM0MmQ4OGI1ZjI2YjhiOWE1ZmQ1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViVVJMU2NoZW1lSGFuZGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlVSTFNjaGVtZUhhbmRsZXIuaApAQCAtNDIsNiArNDIsNyBAQCBjbGFzcyBS ZXNvdXJjZVJlcXVlc3Q7CiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgV2ViUGFnZVByb3h5 OworY2xhc3MgV2ViUHJvY2Vzc1Byb3h5OwogCiB1c2luZyBTeW5jTG9hZENvbXBsZXRpb25IYW5k bGVyID0gQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlJiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIGNvbnN0IElQQzo6RGF0YVJlZmVy ZW5jZSYpPjsKIApAQCAtNTIsNyArNTMsNyBAQCBwdWJsaWM6CiAKICAgICB1aW50NjRfdCBpZGVu dGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9pZGVudGlmaWVyOyB9CiAKLSAgICB2b2lkIHN0YXJ0 VGFzayhXZWJQYWdlUHJveHkmLCB1aW50NjRfdCB0YXNrSWRlbnRpZmllciwgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiYsIFN5bmNMb2FkQ29tcGxldGlvbkhhbmRsZXImJik7CisgICAgdm9pZCBz dGFydFRhc2soV2ViUGFnZVByb3h5JiwgV2ViUHJvY2Vzc1Byb3h5JiwgdWludDY0X3QgdGFza0lk ZW50aWZpZXIsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBTeW5jTG9hZENvbXBsZXRpb25I YW5kbGVyJiYpOwogICAgIHZvaWQgc3RvcFRhc2soV2ViUGFnZVByb3h5JiwgdWludDY0X3QgdGFz a0lkZW50aWZpZXIpOwogICAgIHZvaWQgc3RvcEFsbFRhc2tzRm9yUGFnZShXZWJQYWdlUHJveHkm KTsKICAgICB2b2lkIHRhc2tDb21wbGV0ZWQoV2ViVVJMU2NoZW1lVGFzayYpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViVVJMU2NoZW1lVGFzay5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJVUkxTY2hlbWVUYXNrLmNwcAppbmRleCBlMWNkZThkY2I2YTRi ZjVjNTRiZmVkOTJhZGMxMGM2MDZjMzQ1OTJiLi4xOWE2YmI4NGMzYzE1ODA0ODI5ODdkODMxYmFm MzE0ZjY4Nzc1MWYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJVUkxT Y2hlbWVUYXNrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJVUkxTY2hlbWVU YXNrLmNwcApAQCAtMzYsMTQgKzM2LDE1IEBACiBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5h bWVzcGFjZSBXZWJDb3JlOwogCi1SZWY8V2ViVVJMU2NoZW1lVGFzaz4gV2ViVVJMU2NoZW1lVGFz azo6Y3JlYXRlKFdlYlVSTFNjaGVtZUhhbmRsZXImIGhhbmRsZXIsIFdlYlBhZ2VQcm94eSYgcGFn ZSwgdWludDY0X3QgcmVzb3VyY2VJZGVudGlmaWVyLCBSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0 LCBTeW5jTG9hZENvbXBsZXRpb25IYW5kbGVyJiYgc3luY0NvbXBsZXRpb25IYW5kbGVyKQorUmVm PFdlYlVSTFNjaGVtZVRhc2s+IFdlYlVSTFNjaGVtZVRhc2s6OmNyZWF0ZShXZWJVUkxTY2hlbWVI YW5kbGVyJiBoYW5kbGVyLCBXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYlByb2Nlc3NQcm94eSYgcHJv Y2VzcywgdWludDY0X3QgcmVzb3VyY2VJZGVudGlmaWVyLCBSZXNvdXJjZVJlcXVlc3QmJiByZXF1 ZXN0LCBTeW5jTG9hZENvbXBsZXRpb25IYW5kbGVyJiYgc3luY0NvbXBsZXRpb25IYW5kbGVyKQog ewotICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFdlYlVSTFNjaGVtZVRhc2soaGFuZGxlciwgcGFn ZSwgcmVzb3VyY2VJZGVudGlmaWVyLCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKHN5bmNDb21w bGV0aW9uSGFuZGxlcikpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJVUkxTY2hlbWVU YXNrKGhhbmRsZXIsIHBhZ2UsIHByb2Nlc3MsIHJlc291cmNlSWRlbnRpZmllciwgV1RGTW92ZShy ZXF1ZXN0KSwgV1RGTW92ZShzeW5jQ29tcGxldGlvbkhhbmRsZXIpKSk7CiB9CiAKLVdlYlVSTFNj aGVtZVRhc2s6OldlYlVSTFNjaGVtZVRhc2soV2ViVVJMU2NoZW1lSGFuZGxlciYgaGFuZGxlciwg V2ViUGFnZVByb3h5JiBwYWdlLCB1aW50NjRfdCByZXNvdXJjZUlkZW50aWZpZXIsIFJlc291cmNl UmVxdWVzdCYmIHJlcXVlc3QsIFN5bmNMb2FkQ29tcGxldGlvbkhhbmRsZXImJiBzeW5jQ29tcGxl dGlvbkhhbmRsZXIpCitXZWJVUkxTY2hlbWVUYXNrOjpXZWJVUkxTY2hlbWVUYXNrKFdlYlVSTFNj aGVtZUhhbmRsZXImIGhhbmRsZXIsIFdlYlBhZ2VQcm94eSYgcGFnZSwgV2ViUHJvY2Vzc1Byb3h5 JiBwcm9jZXNzLCB1aW50NjRfdCByZXNvdXJjZUlkZW50aWZpZXIsIFJlc291cmNlUmVxdWVzdCYm IHJlcXVlc3QsIFN5bmNMb2FkQ29tcGxldGlvbkhhbmRsZXImJiBzeW5jQ29tcGxldGlvbkhhbmRs ZXIpCiAgICAgOiBtX3VybFNjaGVtZUhhbmRsZXIoaGFuZGxlcikKICAgICAsIG1fcGFnZSgmcGFn ZSkKKyAgICAsIG1fcHJvY2VzcyhtYWtlUmVmKHByb2Nlc3MpKQogICAgICwgbV9pZGVudGlmaWVy KHJlc291cmNlSWRlbnRpZmllcikKICAgICAsIG1fcGFnZUlkZW50aWZpZXIocGFnZS5wYWdlSUQo KSkKICAgICAsIG1fcmVxdWVzdChXVEZNb3ZlKHJlcXVlc3QpKQpAQCAtNjksNyArNzAsNyBAQCBh dXRvIFdlYlVSTFNjaGVtZVRhc2s6OmRpZFBlcmZvcm1SZWRpcmVjdGlvbihXZWJDb3JlOjpSZXNv dXJjZVJlc3BvbnNlJiYgcmVzcG9ucwogICAgICAgICBtX3N5bmNSZXNwb25zZSA9IHJlc3BvbnNl OwogCiAgICAgbV9yZXF1ZXN0ID0gcmVxdWVzdDsKLSAgICBtX3BhZ2UtPnNlbmQoTWVzc2FnZXM6 OldlYlBhZ2U6OlVSTFNjaGVtZVRhc2tEaWRQZXJmb3JtUmVkaXJlY3Rpb24obV91cmxTY2hlbWVI YW5kbGVyLT5pZGVudGlmaWVyKCksIG1faWRlbnRpZmllciwgcmVzcG9uc2UsIHJlcXVlc3QpKTsK KyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlVSTFNjaGVtZVRhc2tEaWRQ ZXJmb3JtUmVkaXJlY3Rpb24obV91cmxTY2hlbWVIYW5kbGVyLT5pZGVudGlmaWVyKCksIG1faWRl bnRpZmllciwgcmVzcG9uc2UsIHJlcXVlc3QpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKIAogICAgIHJl dHVybiBFeGNlcHRpb25UeXBlOjpOb25lOwogfQpAQCAtOTIsNyArOTMsNyBAQCBhdXRvIFdlYlVS TFNjaGVtZVRhc2s6OmRpZFJlY2VpdmVSZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiBy ZXNwb25zZSkgLT4gRQogICAgIGlmIChpc1N5bmMoKSkKICAgICAgICAgbV9zeW5jUmVzcG9uc2Ug PSByZXNwb25zZTsKIAotICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6VVJMU2No ZW1lVGFza0RpZFJlY2VpdmVSZXNwb25zZShtX3VybFNjaGVtZUhhbmRsZXItPmlkZW50aWZpZXIo KSwgbV9pZGVudGlmaWVyLCByZXNwb25zZSkpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdl czo6V2ViUGFnZTo6VVJMU2NoZW1lVGFza0RpZFJlY2VpdmVSZXNwb25zZShtX3VybFNjaGVtZUhh bmRsZXItPmlkZW50aWZpZXIoKSwgbV9pZGVudGlmaWVyLCByZXNwb25zZSksIG1fcGFnZS0+cGFn ZUlEKCkpOwogICAgIHJldHVybiBFeGNlcHRpb25UeXBlOjpOb25lOwogfQogCkBAIC0xMTcsNyAr MTE4LDcgQEAgYXV0byBXZWJVUkxTY2hlbWVUYXNrOjpkaWRSZWNlaXZlRGF0YShSZWY8U2hhcmVk QnVmZmVyPiYmIGJ1ZmZlcikgLT4gRXhjZXB0aW9uVHkKICAgICAgICAgcmV0dXJuIEV4Y2VwdGlv blR5cGU6Ok5vbmU7CiAgICAgfQogCi0gICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdl OjpVUkxTY2hlbWVUYXNrRGlkUmVjZWl2ZURhdGEobV91cmxTY2hlbWVIYW5kbGVyLT5pZGVudGlm aWVyKCksIG1faWRlbnRpZmllciwgeyBidWZmZXIgfSkpOworICAgIG1fcHJvY2Vzcy0+c2VuZChN ZXNzYWdlczo6V2ViUGFnZTo6VVJMU2NoZW1lVGFza0RpZFJlY2VpdmVEYXRhKG1fdXJsU2NoZW1l SGFuZGxlci0+aWRlbnRpZmllcigpLCBtX2lkZW50aWZpZXIsIHsgYnVmZmVyIH0pLCBtX3BhZ2Ut PnBhZ2VJRCgpKTsKICAgICByZXR1cm4gRXhjZXB0aW9uVHlwZTo6Tm9uZTsKIH0KIApAQCAtMTQy LDcgKzE0Myw3IEBAIGF1dG8gV2ViVVJMU2NoZW1lVGFzazo6ZGlkQ29tcGxldGUoY29uc3QgUmVz b3VyY2VFcnJvciYgZXJyb3IpIC0+IEV4Y2VwdGlvblR5cGUKICAgICAgICAgbV9zeW5jRGF0YSA9 IG51bGxwdHI7CiAgICAgfQogCi0gICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpV UkxTY2hlbWVUYXNrRGlkQ29tcGxldGUobV91cmxTY2hlbWVIYW5kbGVyLT5pZGVudGlmaWVyKCks IG1faWRlbnRpZmllciwgZXJyb3IpKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6Oldl YlBhZ2U6OlVSTFNjaGVtZVRhc2tEaWRDb21wbGV0ZShtX3VybFNjaGVtZUhhbmRsZXItPmlkZW50 aWZpZXIoKSwgbV9pZGVudGlmaWVyLCBlcnJvciksIG1fcGFnZS0+cGFnZUlEKCkpOwogICAgIG1f dXJsU2NoZW1lSGFuZGxlci0+dGFza0NvbXBsZXRlZCgqdGhpcyk7CiAKICAgICByZXR1cm4gRXhj ZXB0aW9uVHlwZTo6Tm9uZTsKQEAgLTE1Miw2ICsxNTMsNyBAQCB2b2lkIFdlYlVSTFNjaGVtZVRh c2s6OnBhZ2VEZXN0cm95ZWQoKQogewogICAgIEFTU0VSVChtX3BhZ2UpOwogICAgIG1fcGFnZSA9 IG51bGxwdHI7CisgICAgbV9wcm9jZXNzID0gbnVsbHB0cjsKICAgICBtX3N0b3BwZWQgPSB0cnVl OwogICAgIAogICAgIGlmIChpc1N5bmMoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlVSTFNjaGVtZVRhc2suaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlVS TFNjaGVtZVRhc2suaAppbmRleCA0MTVmN2YzNzA3ODI4MGEyYjBlNTM4YTU0MzFjNTEwNDVhM2U5 YTg0Li5kNDhhNDA4ZTQ5MDI0MjY4NTBiMTU2ODhkMzY2MmI3MmM4Njc5ZGFkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJVUkxTY2hlbWVUYXNrLmgKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViVVJMU2NoZW1lVGFzay5oCkBAIC0yNSw2ICsyNSw3IEBACiAK ICNwcmFnbWEgb25jZQogCisjaW5jbHVkZSAiV2ViUHJvY2Vzc1Byb3h5LmgiCiAjaW5jbHVkZSA8 V2ViQ29yZS9SZXNvdXJjZVJlcXVlc3QuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlUmVz cG9uc2UuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1NoYXJlZEJ1ZmZlci5oPgpAQCAtNTMsNyArNTQs NyBAQCB1c2luZyBTeW5jTG9hZENvbXBsZXRpb25IYW5kbGVyID0gQ29tcGxldGlvbkhhbmRsZXI8 dm9pZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZQogY2xhc3MgV2ViVVJMU2NoZW1lVGFzayA6IHB1 YmxpYyBSZWZDb3VudGVkPFdlYlVSTFNjaGVtZVRhc2s+LCBwdWJsaWMgSW5zdGFuY2VDb3VudGVk PFdlYlVSTFNjaGVtZVRhc2s+IHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShXZWJVUkxTY2hl bWVUYXNrKTsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUmVmPFdlYlVSTFNjaGVtZVRhc2s+IGNyZWF0 ZShXZWJVUkxTY2hlbWVIYW5kbGVyJiwgV2ViUGFnZVByb3h5JiwgdWludDY0X3QgaWRlbnRpZmll ciwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFN5bmNMb2FkQ29tcGxldGlvbkhhbmRsZXIm Jik7CisgICAgc3RhdGljIFJlZjxXZWJVUkxTY2hlbWVUYXNrPiBjcmVhdGUoV2ViVVJMU2NoZW1l SGFuZGxlciYsIFdlYlBhZ2VQcm94eSYsIFdlYlByb2Nlc3NQcm94eSYsIHVpbnQ2NF90IGlkZW50 aWZpZXIsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBTeW5jTG9hZENvbXBsZXRpb25IYW5k bGVyJiYpOwogCiAgICAgdWludDY0X3QgaWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1faWRl bnRpZmllcjsgfQogICAgIHVpbnQ2NF90IHBhZ2VJRCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZUlk ZW50aWZpZXI7IH0KQEAgLTc3LDEyICs3OCwxMyBAQCBwdWJsaWM6CiAgICAgdm9pZCBwYWdlRGVz dHJveWVkKCk7CiAKIHByaXZhdGU6Ci0gICAgV2ViVVJMU2NoZW1lVGFzayhXZWJVUkxTY2hlbWVI YW5kbGVyJiwgV2ViUGFnZVByb3h5JiwgdWludDY0X3QgaWRlbnRpZmllciwgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiYsIFN5bmNMb2FkQ29tcGxldGlvbkhhbmRsZXImJik7CisgICAgV2ViVVJM U2NoZW1lVGFzayhXZWJVUkxTY2hlbWVIYW5kbGVyJiwgV2ViUGFnZVByb3h5JiwgV2ViUHJvY2Vz c1Byb3h5JiwgdWludDY0X3QgaWRlbnRpZmllciwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYs IFN5bmNMb2FkQ29tcGxldGlvbkhhbmRsZXImJik7CiAKICAgICBib29sIGlzU3luYygpIGNvbnN0 IHsgcmV0dXJuICEhbV9zeW5jQ29tcGxldGlvbkhhbmRsZXI7IH0KIAogICAgIFJlZjxXZWJVUkxT Y2hlbWVIYW5kbGVyPiBtX3VybFNjaGVtZUhhbmRsZXI7CiAgICAgV2ViUGFnZVByb3h5KiBtX3Bh Z2U7CisgICAgUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4gbV9wcm9jZXNzOwogICAgIHVpbnQ2NF90 IG1faWRlbnRpZmllcjsKICAgICB1aW50NjRfdCBtX3BhZ2VJZGVudGlmaWVyOwogICAgIFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCBtX3JlcXVlc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5oCmluZGV4IDVkYTZmOTliZjUyNDAyMzMwM2Q4NzFk YTA3YmY3MmUxNmFmY2I1MjYuLjkxODNmOGMyZWRjOGIxYTUyMjQwMDQxZmI3ODMwNzBiYWRhZDMw Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1w bElPUy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElP Uy5oCkBAIC01Myw3ICs1Myw3IEBAIHB1YmxpYzoKICAgICAKIHByaXZhdGU6CiAgICAgLy8gUGFn ZUNsaWVudAotICAgIHN0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBjcmVhdGVEcmF3 aW5nQXJlYVByb3h5KCkgb3ZlcnJpZGU7CisgICAgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVh UHJveHk+IGNyZWF0ZURyYXdpbmdBcmVhUHJveHkoV2ViUHJvY2Vzc1Byb3h5Jikgb3ZlcnJpZGU7 CiAgICAgdm9pZCBzZXRWaWV3TmVlZHNEaXNwbGF5KGNvbnN0IFdlYkNvcmU6OlJlZ2lvbiYpIG92 ZXJyaWRlOwogICAgIHZvaWQgcmVxdWVzdFNjcm9sbChjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50 JiBzY3JvbGxQb3NpdGlvbiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHNjcm9sbE9yaWdpbiwg Ym9vbCBpc1Byb2dyYW1tYXRpY1Njcm9sbCkgb3ZlcnJpZGU7CiAgICAgV2ViQ29yZTo6RmxvYXRQ b2ludCB2aWV3U2Nyb2xsUG9zaXRpb24oKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5tbSBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5tbQppbmRleCBiMjM3ZWY1MDUyYWYzNzVj MWVjNTY0N2I3YmRiMjgxZTA3ZmE0OGJjLi5iNjEwNzI0ZjdkZjhlZjBjMzIxYTBjNjQyNDk1YmFj MDZmYTZlMzQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUGFnZUNs aWVudEltcGxJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1BhZ2VDbGll bnRJbXBsSU9TLm1tCkBAIC04MSw5ICs4MSw5IEBAIFBhZ2VDbGllbnRJbXBsOjp+UGFnZUNsaWVu dEltcGwoKQogewogfQogCi1zdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gUGFnZUNs aWVudEltcGw6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKQorc3RkOjp1bmlxdWVfcHRyPERyYXdp bmdBcmVhUHJveHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KFdlYlBy b2Nlc3NQcm94eSYgcHJvY2VzcykKIHsKLSAgICByZXR1cm4gW21fY29udGVudFZpZXcgX2NyZWF0 ZURyYXdpbmdBcmVhUHJveHldOworICAgIHJldHVybiBbbV9jb250ZW50VmlldyBfY3JlYXRlRHJh d2luZ0FyZWFQcm94eTpwcm9jZXNzXTsKIH0KIAogdm9pZCBQYWdlQ2xpZW50SW1wbDo6c2V0Vmll d05lZWRzRGlzcGxheShjb25zdCBSZWdpb24mKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1ZpZXdHZXN0dXJlQ29udHJvbGxlcklPUy5tbSBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXJJT1MubW0KaW5kZXggOTMzMTlkMmFk NzEyOWU1NDJiOWZkYmYxNTk5NGJjNDg4ZjE4ZTQxNC4uNDgzYTQ3NmZhOWJjZDQzYjMwZmU0ZmRi MTBmNWEwOTI3OWJjNDc1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1ZpZXdHZXN0dXJlQ29udHJvbGxlcklPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvVmlld0dlc3R1cmVDb250cm9sbGVySU9TLm1tCkBAIC0zMjQsNyArMzI0LDcgQEAgdm9p ZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmVuZFN3aXBlR2VzdHVyZShXZWJCYWNrRm9yd2FyZExp c3RJdGVtKiB0YXJnZXRJdGVtLAogICAgIHVpbnQ2NF90IHBhZ2VJRCA9IG1fd2ViUGFnZVByb3h5 LnBhZ2VJRCgpOwogICAgIEdlc3R1cmVJRCBnZXN0dXJlSUQgPSBtX2N1cnJlbnRHZXN0dXJlSUQ7 CiAgICAgbV9wcm92aXNpb25hbExvYWRDYWxsYmFjayA9IFt0aGlzLCBwYWdlSUQsIGdlc3R1cmVJ RF0gewotICAgICAgICBhdXRvIGRyYXdpbmdBcmVhID0gbV93ZWJQYWdlUHJveHkuZHJhd2luZ0Fy ZWEoKTsKKyAgICAgICAgYXV0byBkcmF3aW5nQXJlYSA9IG1fd2ViUGFnZVByb3h5LnByb3Zpc2lv bmFsRHJhd2luZ0FyZWEoKTsKICAgICAgICAgaWYgKCFkcmF3aW5nQXJlYSkgewogICAgICAgICAg ICAgcmVtb3ZlU3dpcGVTbmFwc2hvdCgpOwogICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcuaCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3LmgKaW5kZXggMTFmZDhhMDQwZmY5OGZi MzBkMjM4ODk0NGE0NDI2MWJkZGE2YTM1NS4uYTA2MDdlM2QxYWJjNzUyODk4MTc5OTFhNGIyZTYx ZWY4MjkyYzE2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll dy5oCkBAIC00Niw2ICs0Niw3IEBAIGNsYXNzIERyYXdpbmdBcmVhUHJveHk7CiBjbGFzcyBSZW1v dGVMYXllclRyZWVUcmFuc2FjdGlvbjsKIGNsYXNzIFdlYkZyYW1lUHJveHk7CiBjbGFzcyBXZWJQ YWdlUHJveHk7CitjbGFzcyBXZWJQcm9jZXNzUHJveHk7CiBjbGFzcyBXZWJQcm9jZXNzUG9vbDsK IH0KIApAQCAtODYsNyArODcsNyBAQCBjbGFzcyBXZWJQcm9jZXNzUG9vbDsKIAogLSAodm9pZClf d2ViVmlld0Rlc3Ryb3llZDsKIAotLSAoc3RkOjp1bmlxdWVfcHRyPFdlYktpdDo6RHJhd2luZ0Fy ZWFQcm94eT4pX2NyZWF0ZURyYXdpbmdBcmVhUHJveHk7CistIChzdGQ6OnVuaXF1ZV9wdHI8V2Vi S2l0OjpEcmF3aW5nQXJlYVByb3h5PilfY3JlYXRlRHJhd2luZ0FyZWFQcm94eTooV2ViS2l0OjpX ZWJQcm9jZXNzUHJveHkmKXByb2Nlc3M7CiAtICh2b2lkKV9wcm9jZXNzRGlkRXhpdDsKIC0gKHZv aWQpX3Byb2Nlc3NXaWxsU3dhcDsKIC0gKHZvaWQpX2RpZFJlbGF1bmNoUHJvY2VzczsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0KaW5kZXggYzI3ZWJjYWUz YjA2MzY5NTc3Mjc5NzhhZWU2MWMxM2I3ZWRhYTFiOC4uY2VkODVlOGM5OTE4YTdiNTY3MTY3ZDk3 YWU4OGRiNjBmYWZhZjNhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXcubW0KQEAgLTUyMCw5ICs1MjAsOSBAQCAtICh2b2lkKV93ZWJWaWV3RGVzdHJveWVk CiAKICNwcmFnbWEgbWFyayBQYWdlQ2xpZW50SW1wbCBtZXRob2RzCiAKLS0gKHN0ZDo6dW5pcXVl X3B0cjxXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHk+KV9jcmVhdGVEcmF3aW5nQXJlYVByb3h5Cist IChzdGQ6OnVuaXF1ZV9wdHI8V2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5PilfY3JlYXRlRHJhd2lu Z0FyZWFQcm94eTooV2ViS2l0OjpXZWJQcm9jZXNzUHJveHkmKXByb2Nlc3MKIHsKLSAgICByZXR1 cm4gc3RkOjptYWtlX3VuaXF1ZTxXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJv eHk+KCpfcGFnZSk7CisgICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8V2ViS2l0OjpSZW1vdGVM YXllclRyZWVEcmF3aW5nQXJlYVByb3h5PigqX3BhZ2UsIHByb2Nlc3MpOwogfQogCiAtICh2b2lk KV9wcm9jZXNzRGlkRXhpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFj L1BhZ2VDbGllbnRJbXBsTWFjLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvUGFnZUNs aWVudEltcGxNYWMuaAppbmRleCAxMmRjMjVhYmNjMzNmNGRlNWU2YzYzNjBlYmQ4YzMyZDA1YTRh ZTc1Li4wOGZmZWE0ZThhY2M3YjcyZTI2ZDZlMzU3NjIzMDE2MTA3MjVlN2VlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGxNYWMuaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGxNYWMuaApAQCAtNjEsNyAr NjEsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgLy8gUGFnZUNsaWVudAotICAgIHN0ZDo6 dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBjcmVhdGVEcmF3aW5nQXJlYVByb3h5KCkgb3Zl cnJpZGU7CisgICAgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURyYXdp bmdBcmVhUHJveHkoV2ViUHJvY2Vzc1Byb3h5Jikgb3ZlcnJpZGU7CiAgICAgdm9pZCBzZXRWaWV3 TmVlZHNEaXNwbGF5KGNvbnN0IFdlYkNvcmU6OlJlZ2lvbiYpIG92ZXJyaWRlOwogICAgIHZvaWQg cmVxdWVzdFNjcm9sbChjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbiwg Y29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHNjcm9sbE9yaWdpbiwgYm9vbCBpc1Byb2dyYW1tYXRp Y1Njcm9sbCkgb3ZlcnJpZGU7CiAgICAgV2ViQ29yZTo6RmxvYXRQb2ludCB2aWV3U2Nyb2xsUG9z aXRpb24oKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21h Yy9QYWdlQ2xpZW50SW1wbE1hYy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9QYWdl Q2xpZW50SW1wbE1hYy5tbQppbmRleCA1ZDdjMjM4ZWZkNjlmNjE1YWJmNWE3ZDU1NWQ0OGQyM2M0 NzZlZTU4Li5iNDhhYzNmYTJiZjQzNTczYTI1ODIyNDQ2YmU3ZjhjYmM2ZTc5MjYyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGxNYWMubW0KKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsTWFjLm1tCkBAIC0x MjMsOSArMTIzLDkgQEAgdm9pZCBQYWdlQ2xpZW50SW1wbDo6c2V0SW1wbChXZWJWaWV3SW1wbCYg aW1wbCkKICAgICBtX2ltcGwgPSBtYWtlV2Vha1B0cihpbXBsKTsKIH0KIAotc3RkOjp1bmlxdWVf cHRyPERyYXdpbmdBcmVhUHJveHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVEcmF3aW5nQXJlYVBy b3h5KCkKK3N0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBQYWdlQ2xpZW50SW1wbDo6 Y3JlYXRlRHJhd2luZ0FyZWFQcm94eShXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MpCiB7Ci0gICAg cmV0dXJuIG1faW1wbC0+Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpOworICAgIHJldHVybiBtX2lt cGwtPmNyZWF0ZURyYXdpbmdBcmVhUHJveHkocHJvY2Vzcyk7CiB9CiAKIHZvaWQgUGFnZUNsaWVu dEltcGw6OnNldFZpZXdOZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29yZTo6UmVnaW9uJikKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvVGlsZWRDb3JlQW5p bWF0aW9uRHJhd2luZ0FyZWFQcm94eS5oCmluZGV4IDE3OWJkMjhjZmUzMjYxN2JiMWFlMGRlN2Zl ZTAyYTAwODc1NGUwNGQuLmYyZjI3MDJhMDE1ZTI1YTNkYTFhYjE3ZTY1MzljNzc4Mjk4MDRlN2Ig MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9UaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1Rp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkuaApAQCAtMzMsNyArMzMsNyBAQCBuYW1l c3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94 eSA6IHB1YmxpYyBEcmF3aW5nQXJlYVByb3h5IHsKIHB1YmxpYzoKLSAgICBleHBsaWNpdCBUaWxl ZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5KFdlYlBhZ2VQcm94eSYpOworICAgIFRpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkoV2ViUGFnZVByb3h5JiwgV2ViUHJvY2Vzc1By b3h5Jik7CiAgICAgdmlydHVhbCB+VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eSgp OwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1Rp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5tbQppbmRleCBiYzhi YzQxNmJiMzVlNTAzYzYwNDVkODc3Nzk1ZjVjNmJjZmMwZmQ5Li43N2M4MzgwOTE0YmNiMTNmNjVh N2M5MDRhOWMwMDZiYWZkMTFhYWY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5t bQpAQCAtNDIsOCArNDIsOCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBJ UEM7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAotVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2lu Z0FyZWFQcm94eTo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eShXZWJQYWdlUHJv eHkmIHdlYlBhZ2VQcm94eSkKLSAgICA6IERyYXdpbmdBcmVhUHJveHkoRHJhd2luZ0FyZWFUeXBl VGlsZWRDb3JlQW5pbWF0aW9uLCB3ZWJQYWdlUHJveHkpCitUaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYVByb3h5OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5KFdlYlBhZ2VQ cm94eSYgd2ViUGFnZVByb3h5LCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MpCisgICAgOiBEcmF3 aW5nQXJlYVByb3h5KERyYXdpbmdBcmVhVHlwZVRpbGVkQ29yZUFuaW1hdGlvbiwgd2ViUGFnZVBy b3h5LCBwcm9jZXNzKQogICAgICwgbV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVHZW9tZXRyeShmYWxz ZSkKIHsKIH0KQEAgLTU1LDcgKzU1LDcgQEAgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQ cm94eTo6flRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkoKQogCiB2b2lkIFRpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6OmRldmljZVNjYWxlRmFjdG9yRGlkQ2hhbmdl KCkKIHsKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2lu Z0FyZWE6OlNldERldmljZVNjYWxlRmFjdG9yKG1fd2ViUGFnZVByb3h5LmRldmljZVNjYWxlRmFj dG9yKCkpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CisgICAgcHJvY2VzcygpLnNlbmQoTWVz c2FnZXM6OkRyYXdpbmdBcmVhOjpTZXREZXZpY2VTY2FsZUZhY3RvcihtX3dlYlBhZ2VQcm94eS5k ZXZpY2VTY2FsZUZhY3RvcigpKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOwogfQogCiB2b2lk IFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6OnNpemVEaWRDaGFuZ2UoKQpAQCAt NzMsNyArNzMsNyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6OnNp emVEaWRDaGFuZ2UoKQogCiB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6 OmNvbG9yU3BhY2VEaWRDaGFuZ2UoKQogewotICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5z ZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6U2V0Q29sb3JTcGFjZShtX3dlYlBhZ2VQcm94eS5j b2xvclNwYWNlKCkpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CisgICAgcHJvY2VzcygpLnNl bmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpTZXRDb2xvclNwYWNlKG1fd2ViUGFnZVByb3h5LmNv bG9yU3BhY2UoKSksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKIH0KIAogdm9pZCBUaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5Ojp2aWV3TGF5b3V0U2l6ZURpZENoYW5nZSgpCkBA IC0xMjIsNyArMTIyLDcgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5 OjpkaWRVcGRhdGVHZW9tZXRyeSgpCiB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh UHJveHk6OndhaXRGb3JEaWRVcGRhdGVBY3Rpdml0eVN0YXRlKEFjdGl2aXR5U3RhdGVDaGFuZ2VJ RCkKIHsKICAgICBTZWNvbmRzIGFjdGl2aXR5U3RhdGVVcGRhdGVUaW1lb3V0ID0gU2Vjb25kczo6 ZnJvbU1pbGxpc2Vjb25kcygyNTApOwotICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5jb25u ZWN0aW9uKCktPndhaXRGb3JBbmREaXNwYXRjaEltbWVkaWF0ZWx5PE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OkRpZFVwZGF0ZUFjdGl2aXR5U3RhdGU+KG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpLCBh Y3Rpdml0eVN0YXRlVXBkYXRlVGltZW91dCwgSVBDOjpXYWl0Rm9yT3B0aW9uOjpJbnRlcnJ1cHRX YWl0aW5nSWZTeW5jTWVzc2FnZUFycml2ZXMpOworICAgIHByb2Nlc3MoKS5jb25uZWN0aW9uKCkt PndhaXRGb3JBbmREaXNwYXRjaEltbWVkaWF0ZWx5PE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRp ZFVwZGF0ZUFjdGl2aXR5U3RhdGU+KG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpLCBhY3Rpdml0eVN0 YXRlVXBkYXRlVGltZW91dCwgSVBDOjpXYWl0Rm9yT3B0aW9uOjpJbnRlcnJ1cHRXYWl0aW5nSWZT eW5jTWVzc2FnZUFycml2ZXMpOwogfQogCiB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdB cmVhUHJveHk6OmludHJpbnNpY0NvbnRlbnRTaXplRGlkQ2hhbmdlKGNvbnN0IEludFNpemUmIG5l d0ludHJpbnNpY0NvbnRlbnRTaXplKQpAQCAtMTUxLDE5ICsxNTEsMTkgQEAgTWFjaFNlbmRSaWdo dCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5OjpjcmVhdGVGZW5jZSgpCiAgICAg Ly8gd2lsbCBsaWtlbHkgZ2V0IGRyb3BwZWQgb24gdGhlIGZsb29yIChpZiB0aGUgV2ViIHByb2Nl c3MgaXMgdGVybWluYXRlZCkKICAgICAvLyBvciBxdWV1ZWQgdXAgdW50aWwgcHJvY2VzcyBsYXVu Y2ggY29tcGxldGVzLCBhbmQgdGhlcmUncyBub3RoaW5nIHVzZWZ1bAogICAgIC8vIHRvIHN5bmNo cm9uaXplIGluIHRoZXNlIGNhc2VzLgotICAgIGlmICghbV93ZWJQYWdlUHJveHkucHJvY2Vzcygp LmNvbm5lY3Rpb24oKSkKKyAgICBpZiAoIXByb2Nlc3MoKS5jb25uZWN0aW9uKCkpCiAgICAgICAg IHJldHVybiBNYWNoU2VuZFJpZ2h0KCk7CiAKICAgICAvLyBEb24ndCBmZW5jZSBpZiB3ZSBoYXZl IGluY29taW5nIHN5bmNocm9ub3VzIG1lc3NhZ2VzLCBiZWNhdXNlIHdlIG1heSBub3QKICAgICAv LyBiZSBhYmxlIHRvIHJlcGx5IHRvIHRoZSBtZXNzYWdlIHVudGlsIHRoZSBmZW5jZSB0aW1lcyBv dXQuCi0gICAgaWYgKG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5jb25uZWN0aW9uKCktPmhhc0lu Y29taW5nU3luY01lc3NhZ2UoKSkKKyAgICBpZiAocHJvY2VzcygpLmNvbm5lY3Rpb24oKS0+aGFz SW5jb21pbmdTeW5jTWVzc2FnZSgpKQogICAgICAgICByZXR1cm4gTWFjaFNlbmRSaWdodCgpOwog CiAgICAgTWFjaFNlbmRSaWdodCBmZW5jZVBvcnQgPSBNYWNoU2VuZFJpZ2h0OjphZG9wdChbcm9v dExheWVyQ29udGV4dCBjcmVhdGVGZW5jZVBvcnRdKTsKIAogICAgIC8vIEludmFsaWRhdGUgdGhl IGZlbmNlIGlmIGEgc3luY2hyb25vdXMgbWVzc2FnZSBhcnJpdmVzIHdoaWxlIGl0J3MgaW5zdGFs bGVkLAogICAgIC8vIGJlY2F1c2Ugd2Ugd29uJ3QgYmUgYWJsZSB0byByZXBseSBkdXJpbmcgdGhl IGZlbmNlLXdhaXQuCi0gICAgdWludDY0X3QgY2FsbGJhY2tJRCA9IG1fd2ViUGFnZVByb3h5LnBy b2Nlc3MoKS5jb25uZWN0aW9uKCktPmluc3RhbGxJbmNvbWluZ1N5bmNNZXNzYWdlQ2FsbGJhY2so W3Jvb3RMYXllckNvbnRleHRdIHsKKyAgICB1aW50NjRfdCBjYWxsYmFja0lEID0gcHJvY2Vzcygp LmNvbm5lY3Rpb24oKS0+aW5zdGFsbEluY29taW5nU3luY01lc3NhZ2VDYWxsYmFjayhbcm9vdExh eWVyQ29udGV4dF0gewogICAgICAgICBbcm9vdExheWVyQ29udGV4dCBpbnZhbGlkYXRlRmVuY2Vz XTsKICAgICB9KTsKICAgICBSZWZQdHI8V2ViUGFnZVByb3h5PiByZXRhaW5lZFBhZ2UgPSAmbV93 ZWJQYWdlUHJveHk7CkBAIC0xODIsMTcgKzE4MiwxNyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhUHJveHk6OnNlbmRVcGRhdGVHZW9tZXRyeSgpCiAgICAgQVNTRVJUKCFtX2lz V2FpdGluZ0ZvckRpZFVwZGF0ZUdlb21ldHJ5KTsKIAogICAgIHdpbGxTZW5kVXBkYXRlR2VvbWV0 cnkoKTsKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2lu Z0FyZWE6OlVwZGF0ZUdlb21ldHJ5KG1fc2l6ZSwgdHJ1ZSAvKiBmbHVzaFN5bmNocm9ub3VzbHkg Ki8sIGNyZWF0ZUZlbmNlKCkpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CisgICAgcHJvY2Vz cygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpVcGRhdGVHZW9tZXRyeShtX3NpemUsIHRy dWUgLyogZmx1c2hTeW5jaHJvbm91c2x5ICovLCBjcmVhdGVGZW5jZSgpKSwgbV93ZWJQYWdlUHJv eHkucGFnZUlEKCkpOwogfQogCiB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJv eHk6OmFkanVzdFRyYW5zaWVudFpvb20oZG91YmxlIHNjYWxlLCBGbG9hdFBvaW50IG9yaWdpbikK IHsKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2luZ0Fy ZWE6OkFkanVzdFRyYW5zaWVudFpvb20oc2NhbGUsIG9yaWdpbiksIG1fd2ViUGFnZVByb3h5LnBh Z2VJRCgpKTsKKyAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6OkFkanVz dFRyYW5zaWVudFpvb20oc2NhbGUsIG9yaWdpbiksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsK IH0KIAogdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5Ojpjb21taXRUcmFu c2llbnRab29tKGRvdWJsZSBzY2FsZSwgRmxvYXRQb2ludCBvcmlnaW4pCiB7Ci0gICAgbV93ZWJQ YWdlUHJveHkucHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpDb21taXRUcmFu c2llbnRab29tKHNjYWxlLCBvcmlnaW4pLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CisgICAg cHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpDb21taXRUcmFuc2llbnRab29t KHNjYWxlLCBvcmlnaW4pLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CiB9CiAKIHZvaWQgVGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eTo6ZGlzcGF0Y2hBZnRlckVuc3VyaW5nRHJh d2luZyhXVEY6OkZ1bmN0aW9uPHZvaWQgKENhbGxiYWNrQmFzZTo6RXJyb3IpPiYmIGNhbGxiYWNr KQpAQCAtMjAyLDcgKzIwMiw3IEBAIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQ cm94eTo6ZGlzcGF0Y2hBZnRlckVuc3VyaW5nRHJhd2luZyhXVEY6OkZ1bmN0CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKLSAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc2VuZChNZXNzYWdl czo6RHJhd2luZ0FyZWE6OkFkZFRyYW5zYWN0aW9uQ2FsbGJhY2tJRChtX2NhbGxiYWNrcy5wdXQo V1RGTW92ZShjYWxsYmFjayksIG51bGxwdHIpKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOwor ICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6QWRkVHJhbnNhY3Rpb25D YWxsYmFja0lEKG1fY2FsbGJhY2tzLnB1dChXVEZNb3ZlKGNhbGxiYWNrKSwgbnVsbHB0cikpLCBt X3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CiB9CiAKIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJh d2luZ0FyZWFQcm94eTo6ZGlzcGF0Y2hQcmVzZW50YXRpb25DYWxsYmFja3NBZnRlckZsdXNoaW5n TGF5ZXJzKGNvbnN0IFZlY3RvcjxDYWxsYmFja0lEPiYgY2FsbGJhY2tJRHMpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQppbmRleCAwODRhZjg3MDc5 NDYzZmY5Y2ZkODkxNzZiMDFiNjQzYzZjNTc3NGUwLi42MmJlNDEwZjIzYjBlMmMzMzAzMGJiMDlj MWU2MmYxYzhiMjBlMWMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMv V2ViUGFnZVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJQ YWdlUHJveHlNYWMubW0KQEAgLTY1LDcgKzY1LDcgQEAKICNpbXBvcnQgPHd0Zi90ZXh0L1N0cmlu Z0NvbmNhdGVuYXRlLmg+CiAKICNkZWZpbmUgTUVTU0FHRV9DSEVDSyhhc3NlcnRpb24pIE1FU1NB R0VfQ0hFQ0tfQkFTRShhc3NlcnRpb24sIHByb2Nlc3MoKS5jb25uZWN0aW9uKCkpCi0jZGVmaW5l IE1FU1NBR0VfQ0hFQ0tfVVJMKHVybCkgTUVTU0FHRV9DSEVDS19CQVNFKGNoZWNrVVJMUmVjZWl2 ZWRGcm9tQ3VycmVudE9yUHJldmlvdXNXZWJQcm9jZXNzKHVybCksIG1fcHJvY2Vzcy0+Y29ubmVj dGlvbigpKQorI2RlZmluZSBNRVNTQUdFX0NIRUNLX1VSTCh1cmwpIE1FU1NBR0VfQ0hFQ0tfQkFT RShjaGVja1VSTFJlY2VpdmVkRnJvbUN1cnJlbnRPclByZXZpb3VzV2ViUHJvY2VzcyhtX3Byb2Nl c3MsIHVybCksIG1fcHJvY2Vzcy0+Y29ubmVjdGlvbigpKQogCiBAaW50ZXJmYWNlIE5TQXBwbGlj YXRpb24gKCkKIC0gKEJPT0wpaXNTcGVha2luZzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL3dpbi9QYWdlQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy93aW4vUGFnZUNsaWVudEltcGwuY3BwCmluZGV4IDgwZTJjMmQyN2Q3ZDIzNmE0MmQwYTUwOWQy NGMxYjVhNzllZWM0Y2IuLjE3MGMyZDc3NjM5NjJhZjAyZjMyYjRmOGI1ZWQwMjliNjc5ZjZmZjEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dpbi9QYWdlQ2xpZW50SW1wbC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mvd2luL1BhZ2VDbGllbnRJbXBsLmNwcApA QCAtNDMsOSArNDMsOSBAQCBQYWdlQ2xpZW50SW1wbDo6UGFnZUNsaWVudEltcGwoV2ViVmlldyYg dmlldykKIH0KIAogLy8gUGFnZUNsaWVudCdzIHB1cmUgdmlydHVhbCBmdW5jdGlvbnMKLXN0ZDo6 dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlRHJhd2lu Z0FyZWFQcm94eSgpCitzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gUGFnZUNsaWVu dEltcGw6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKQog ewotICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPERyYXdpbmdBcmVhUHJveHlJbXBsPigqbV92 aWV3LnBhZ2UoKSk7CisgICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8RHJhd2luZ0FyZWFQcm94 eUltcGw+KCptX3ZpZXcucGFnZSgpLCBwcm9jZXNzKTsKIH0KIAogdm9pZCBQYWdlQ2xpZW50SW1w bDo6c2V0Vmlld05lZWRzRGlzcGxheShjb25zdCBXZWJDb3JlOjpSZWdpb24mIHJlZ2lvbikKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dpbi9QYWdlQ2xpZW50SW1wbC5oIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3Mvd2luL1BhZ2VDbGllbnRJbXBsLmgKaW5kZXggYTAxYjY4 ZjQzZjNiN2E5Y2E5NTVmNGU2MTVkZmUxMmY3ZGJkMjdhMS4uNjY1NzJiYjE0MDU4YWFjZmY1ZmFj M2ZkZDc1MTA2YzhiMDc1ZWY1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv d2luL1BhZ2VDbGllbnRJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mvd2luL1Bh Z2VDbGllbnRJbXBsLmgKQEAgLTUzLDcgKzUzLDcgQEAgcHVibGljOgogICAgIEhXTkQgdmlld1dp ZGdldCgpOwogcHJpdmF0ZToKICAgICAvLyBQYWdlQ2xpZW50Ci0gICAgc3RkOjp1bmlxdWVfcHRy PERyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKSBvdmVycmlkZTsKKyAg ICBzdGQ6OnVuaXF1ZV9wdHI8RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJhd2luZ0FyZWFQcm94 eShXZWJQcm9jZXNzUHJveHkmKSBvdmVycmlkZTsKICAgICB2b2lkIHNldFZpZXdOZWVkc0Rpc3Bs YXkoY29uc3QgV2ViQ29yZTo6UmVnaW9uJikgb3ZlcnJpZGU7CiAgICAgdm9pZCByZXF1ZXN0U2Ny b2xsKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0aW9uLCBjb25zdCBXZWJD b3JlOjpJbnRQb2ludCYgc2Nyb2xsT3JpZ2luLCBib29sIGlzUHJvZ3JhbW1hdGljU2Nyb2xsKSBv dmVycmlkZTsKICAgICBXZWJDb3JlOjpGbG9hdFBvaW50IHZpZXdTY3JvbGxQb3NpdGlvbigpIG92 ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2oKaW5kZXggODA5NjIxZmQxMjI5YmZmZmUzOTlkYWZiNTM2ZWEyMmNlYzU0NGVmOC4uM2YwNTcx ZDU2ZGQ0MTJjMmQ1MjA2ZTMyY2Y0YmE2NDgzOTNhMjczZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViS2l0 L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0zMDcxLDYgKzMwNzEsOCBAQAog CQk0NjZCQzAzODFGQTI2NkM5MDAyRkE5QzEgLyogV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rp b24uY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV2ViU1dDb250ZXh0 TWFuYWdlckNvbm5lY3Rpb24uY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NjZC QzAzOTFGQTI2NkM5MDAyRkE5QzEgLyogV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uaCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViU1dDb250ZXh0TWFuYWdlckNvbm5l Y3Rpb24uaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDY2QkMwM0ExRkEyNjZDOTAw MkZBOUMxIC8qIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLm1lc3NhZ2VzLmluICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gdGV4dDsgcGF0aCA9IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLm1lc3NhZ2Vz LmluOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk0NjgzNTY5QTIxRTgxQ0M3MDA2RTI3 QTMgLyogUHJvdmlzaW9uYWxQYWdlUHJveHkuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gUHJvdmlzaW9uYWxQYWdlUHJveHkuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK KwkJNDY4MzU2OUIyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmNwcCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFByb3Zpc2lvbmFsUGFnZVByb3h5 LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDZBMkI2MDYxRTU2NzVBMjAwQzNE RURBIC8qIEJhY2tncm91bmRQcm9jZXNzUmVzcG9uc2l2ZW5lc3NUaW1lci5jcHAgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBCYWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVu ZXNzVGltZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NkEyQjYwNzFFNTY3 NUEyMDBDM0RFREEgLyogQmFja2dyb3VuZFByb2Nlc3NSZXNwb25zaXZlbmVzc1RpbWVyLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEJhY2tncm91bmRQcm9jZXNzUmVzcG9uc2l2 ZW5lc3NUaW1lci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NkRGMDYzOTFGMzkw NUU1MDAxOTgwQkIgLyogTmV0d29ya0NPUlNQcmVmbGlnaHRDaGVja2VyLmNwcCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IE5ldHdvcmtDT1JTUHJlZmxpZ2h0Q2hlY2tlci5j cHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC03MzE3LDYgKzczMTksOCBAQAogCQkJ CTg2RTY3QTIyMTkwRjQxMTgwMDAwNEFCNyAvKiBQcm9jZXNzVGhyb3R0bGVyLmNwcCAqLywKIAkJ CQk4NkU2N0EyMTE5MEY0MTE4MDAwMDRBQjcgLyogUHJvY2Vzc1Rocm90dGxlci5oICovLAogCQkJ CTgzMDQ4QUU1MUFDQTQ1REMwMDgyQzgzMiAvKiBQcm9jZXNzVGhyb3R0bGVyQ2xpZW50LmggKi8s CisJCQkJNDY4MzU2OUIyMUU4MUNDNzAwNkUyN0EzIC8qIFByb3Zpc2lvbmFsUGFnZVByb3h5LmNw cCAqLywKKwkJCQk0NjgzNTY5QTIxRTgxQ0M3MDA2RTI3QTMgLyogUHJvdmlzaW9uYWxQYWdlUHJv eHkuaCAqLywKIAkJCQlBNTVCQTgxQjFCQTI1QjFFMDA3Q0QzM0QgLyogUmVtb3RlV2ViSW5zcGVj dG9yUHJveHkuY3BwICovLAogCQkJCUE1NUJBODE5MUJBMjVCMUUwMDdDRDMzRCAvKiBSZW1vdGVX ZWJJbnNwZWN0b3JQcm94eS5oICovLAogCQkJCUE1NUJBODFBMUJBMjVCMUUwMDdDRDMzRCAvKiBS ZW1vdGVXZWJJbnNwZWN0b3JQcm94eS5tZXNzYWdlcy5pbiAqLywKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcCBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcAppbmRleCAwMDc0OWI0NzdhMjRjZThjY2M4 MjUwMWQ5NGUwOGI2MGVlMWE2MjYzLi5mZmVkMDBjODIwNmE5NGYwZTRmZmM3ZmYzYThhOWRmZjg2 MTNmYWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJG cmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUu Y3BwCkBAIC0yNjMsOCArMjYzLDYgQEAgc3RhdGljIFdlYkNvcmU6OlBvbGljeUFjdGlvbiB0b1Bv bGljeUFjdGlvbihXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uKQogICAgICAgICByZXR1cm4g V2ViQ29yZTo6UG9saWN5QWN0aW9uOjpJZ25vcmU7CiAgICAgY2FzZSBXZWJQb2xpY3lBY3Rpb246 OkRvd25sb2FkOgogICAgICAgICByZXR1cm4gV2ViQ29yZTo6UG9saWN5QWN0aW9uOjpEb3dubG9h ZDsKLSAgICBjYXNlIFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZDoKLSAgICAgICAgYnJlYWs7CiAg ICAgfQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIHJldHVybiBXZWJDb3JlOjpQb2xp Y3lBY3Rpb246Oklnbm9yZTsKQEAgLTI3MiwxMSArMjcwLDggQEAgc3RhdGljIFdlYkNvcmU6OlBv bGljeUFjdGlvbiB0b1BvbGljeUFjdGlvbihXZWJQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uKQog CiB2b2lkIFdlYkZyYW1lOjpkaWRSZWNlaXZlUG9saWN5RGVjaXNpb24odWludDY0X3QgbGlzdGVu ZXJJRCwgV2ViUG9saWN5QWN0aW9uIGFjdGlvbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBEb3du bG9hZElEIGRvd25sb2FkSUQsIE9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgd2Vic2l0 ZVBvbGljaWVzKQogewotICAgIGlmICghbV9jb3JlRnJhbWUgfHwgIW1fcG9saWN5TGlzdGVuZXJJ RCB8fCBsaXN0ZW5lcklEICE9IG1fcG9saWN5TGlzdGVuZXJJRCB8fCAhbV9wb2xpY3lGdW5jdGlv bikgewotICAgICAgICBpZiAoYWN0aW9uID09IFdlYlBvbGljeUFjdGlvbjo6U3VzcGVuZCkKLSAg ICAgICAgICAgIHBhZ2UoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRGYWlsVG9T dXNwZW5kQWZ0ZXJQcm9jZXNzU3dhcCgpKTsKKyAgICBpZiAoIW1fY29yZUZyYW1lIHx8ICFtX3Bv bGljeUxpc3RlbmVySUQgfHwgbGlzdGVuZXJJRCAhPSBtX3BvbGljeUxpc3RlbmVySUQgfHwgIW1f cG9saWN5RnVuY3Rpb24pCiAgICAgICAgIHJldHVybjsKLSAgICB9CiAKICAgICBGcmFtZVBvbGlj eUZ1bmN0aW9uIGZ1bmN0aW9uID0gV1RGTW92ZShtX3BvbGljeUZ1bmN0aW9uKTsKICAgICBib29s IGZvck5hdmlnYXRpb25BY3Rpb24gPSBtX3BvbGljeUZ1bmN0aW9uRm9yTmF2aWdhdGlvbkFjdGlv biA9PSBGb3JOYXZpZ2F0aW9uQWN0aW9uOjpZZXM7CkBAIC0yOTIsMTYgKzI4Nyw3IEBAIHZvaWQg V2ViRnJhbWU6OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1aW50NjRfdCBsaXN0ZW5lcklELCBX ZWJQb2xpY3lBY3Rpb24gYWN0CiAgICAgICAgICAgICBkb2N1bWVudExvYWRlci0+c2V0TmF2aWdh dGlvbklEKG5hdmlnYXRpb25JRCk7CiAgICAgfQogCi0gICAgYm9vbCBzaG91bGRTdXNwZW5kID0g ZmFsc2U7Ci0gICAgaWYgKGFjdGlvbiA9PSBXZWJQb2xpY3lBY3Rpb246OlN1c3BlbmQpIHsKLSAg ICAgICAgc2hvdWxkU3VzcGVuZCA9IHRydWU7Ci0gICAgICAgIGFjdGlvbiA9IFdlYlBvbGljeUFj dGlvbjo6SWdub3JlOwotICAgIH0KLQogICAgIGZ1bmN0aW9uKHRvUG9saWN5QWN0aW9uKGFjdGlv bikpOwotCi0gICAgaWYgKHNob3VsZFN1c3BlbmQpCi0gICAgICAgIHBhZ2UoKS0+c3VzcGVuZEZv clByb2Nlc3NTd2FwKCk7CiB9CiAKIHZvaWQgV2ViRnJhbWU6OnN0YXJ0RG93bmxvYWQoY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBTdHJpbmcmIHN1Z2dlc3Rl ZE5hbWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmlu ZGV4IDc2MjAzMTEzZDYwNTQ1NzYwOTg5ZWJlZGE2MTI3YjI1YThmNjAyZmQuLmRkOTdkNmViMDdh ZTI1MmE2ZWM3ZWMxNWZjZTc3YTM0ZjIxNTY0M2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC00MDIsNyArNDAyLDcgQEAgV2ViUGFnZTo6V2Vi UGFnZSh1aW50NjRfdCBwYWdlSUQsIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0 ZXJzKQogICAgICwgbV9vdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSB7IHBhcmFtZXRlcnMu b3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgfQogICAgICwgbV9jcHVMaW1pdChwYXJhbWV0 ZXJzLmNwdUxpbWl0KQogI2lmIFBMQVRGT1JNKE1BQykKLSAgICAsIG1fc2hvdWxkQXR0YWNoRHJh d2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uKHBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCkK KyAgICAsIG1fc2hvdWxkQXR0YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uKHBhcmFtZXRl cnMuaXNQcm9jZXNzU3dhcCkKICNlbmRpZgogewogICAgIEFTU0VSVChtX3BhZ2VJRCk7CkBAIC00 NzMsOCArNDczLDggQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIFdlYlBhZ2VD cmVhdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQogICAgIG1fZHJhd2luZ0FyZWEtPnNldFBh aW50aW5nRW5hYmxlZChmYWxzZSk7CiAgICAgbV9kcmF3aW5nQXJlYS0+c2V0U2hvdWxkU2NhbGVW aWV3VG9GaXREb2N1bWVudChwYXJhbWV0ZXJzLnNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQp OwogCi0gICAgaWYgKHBhcmFtZXRlcnMuaXNTd2FwRnJvbVN1c3BlbmRlZCkKLSAgICAgICAgZnJl ZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6U3dhcEZyb21TdXNwZW5kZWQpOwor ICAgIGlmIChwYXJhbWV0ZXJzLmlzUHJvY2Vzc1N3YXApCisgICAgICAgIGZyZWV6ZUxheWVyVHJl ZShMYXllclRyZWVGcmVlemVSZWFzb246OlByb2Nlc3NTd2FwKTsKIAogI2lmIEVOQUJMRShBU1lO Q19TQ1JPTExJTkcpCiAgICAgbV91c2VBc3luY1Njcm9sbGluZyA9IHBhcmFtZXRlcnMuc3RvcmUu Z2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5Ojp0aHJlYWRlZFNjcm9sbGluZ0Vu YWJsZWRLZXkoKSk7CkBAIC02OTgsNyArNjk4LDcgQEAgdm9pZCBXZWJQYWdlOjpyZWluaXRpYWxp emVXZWJQYWdlKFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQogICAgICAg ICBtX2RyYXdpbmdBcmVhLT51cGRhdGVQcmVmZXJlbmNlcyhwYXJhbWV0ZXJzLnN0b3JlKTsKICAg ICAgICAgbV9kcmF3aW5nQXJlYS0+c2V0UGFpbnRpbmdFbmFibGVkKHRydWUpOwogI2lmIFBMQVRG T1JNKE1BQykKLSAgICAgICAgbV9zaG91bGRBdHRhY2hEcmF3aW5nQXJlYU9uUGFnZVRyYW5zaXRp b24gPSBwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQ7CisgICAgICAgIG1fc2hvdWxkQXR0 YWNoRHJhd2luZ0FyZWFPblBhZ2VUcmFuc2l0aW9uID0gcGFyYW1ldGVycy5pc1Byb2Nlc3NTd2Fw OwogI2VuZGlmCiAgICAgICAgIHVuZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNv bjo6UGFnZVN1c3BlbmRlZCk7CiAgICAgfQpAQCAtMzA1NSwxMiArMzA1NSw2IEBAIHZvaWQgV2Vi UGFnZTo6ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90 IGxpc3RlbmVySUQsIFdlCiAgICAgV2ViRnJhbWUqIGZyYW1lID0gV2ViUHJvY2Vzczo6c2luZ2xl dG9uKCkud2ViRnJhbWUoZnJhbWVJRCk7CiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJu OwotICAgIGlmIChwb2xpY3lBY3Rpb24gPT0gV2ViUG9saWN5QWN0aW9uOjpTdXNwZW5kKSB7Ci0g ICAgICAgIEFTU0VSVChmcmFtZSA9PSBtX21haW5GcmFtZSk7Ci0gICAgICAgIHNldElzU3VzcGVu ZGVkKHRydWUpOwotCi0gICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnNlbmRQcmV3YXJt SW5mb3JtYXRpb24obWFpbldlYkZyYW1lKCktPnVybCgpKTsKLSAgICB9CiAgICAgZnJhbWUtPmRp ZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihsaXN0ZW5lcklELCBwb2xpY3lBY3Rpb24sIG5hdmlnYXRp b25JRCwgZG93bmxvYWRJRCwgV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMpKTsKIH0KIApAQCAtMzEw Miw3ICszMDk2LDcgQEAgdm9pZCBXZWJQYWdlOjpkaWRDb21wbGV0ZVBhZ2VUcmFuc2l0aW9uKCkK IAogICAgIGJvb2wgaXNJbml0aWFsRW1wdHlEb2N1bWVudCA9ICFtX21haW5GcmFtZTsKICAgICBp ZiAoIWlzSW5pdGlhbEVtcHR5RG9jdW1lbnQpCi0gICAgICAgIHVuZnJlZXplTGF5ZXJUcmVlKExh eWVyVHJlZUZyZWV6ZVJlYXNvbjo6U3dhcEZyb21TdXNwZW5kZWQpOworICAgICAgICB1bmZyZWV6 ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlByb2Nlc3NTd2FwKTsKIAogI2lmIFBM QVRGT1JNKE1BQykKICAgICBpZiAobV9zaG91bGRBdHRhY2hEcmF3aW5nQXJlYU9uUGFnZVRyYW5z aXRpb24gJiYgIWlzSW5pdGlhbEVtcHR5RG9jdW1lbnQpIHsKQEAgLTYzMTQsNiArNjMwOCwxMCBA QCB2b2lkIFdlYlBhZ2U6OnNldElzU3VzcGVuZGVkKGJvb2wgc3VzcGVuZGVkKQogICAgIGlmICht X2lzU3VzcGVuZGVkKSB7CiAgICAgICAgIC8vIFVuZnJvemVuIG9uIGRyYXdpbmcgYXJlYSByZXNl dC4KICAgICAgICAgZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6UGFnZVN1 c3BlbmRlZCk7CisKKyAgICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuc2VuZFByZXdhcm1J bmZvcm1hdGlvbihtYWluV2ViRnJhbWUoKS0+dXJsKCkpOworCisgICAgICAgIHN1c3BlbmRGb3JQ cm9jZXNzU3dhcCgpOwogICAgIH0gZWxzZQogICAgICAgICBtX3Nob3VsZFJlc2V0RHJhd2luZ0Fy ZWFBZnRlclN1c3BlbmQgPSB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5oCmluZGV4IDcxNWUxMjQ1MjBmZjA3NmI5NjBhZWQ3MGU5YjkyMDc1YTY1NTJh ZWYuLmYzYjkzNGUyN2RhOWQ1ZWE1YTFiYmY1NWYxNDlmNWE4NTEyNzM2ZTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTY5Niw3ICs2OTYsNyBAQCBw dWJsaWM6CiAgICAgICAgIFByb2Nlc3NTdXNwZW5kZWQgICAgICAgID0gMSA8PCAyLAogICAgICAg ICBQYWdlU3VzcGVuZGVkICAgICAgICAgICA9IDEgPDwgMywKICAgICAgICAgUHJpbnRpbmcgICAg ICAgICAgICAgICAgPSAxIDw8IDQsCi0gICAgICAgIFN3YXBGcm9tU3VzcGVuZGVkICAgICAgID0g MSA8PCA1LAorICAgICAgICBQcm9jZXNzU3dhcCAgICAgICAgICAgICA9IDEgPDwgNSwKICAgICB9 OwogICAgIHZvaWQgZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbik7CiAgICAg dm9pZCB1bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFzb24pOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Rp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCmluZGV4IDVlZTFmODI2MzU3OWZjZTI2YjMx MmNjZTVjMmNmYjc4YzEyYzY3OTAuLjA4M2U5NmNjODkwYmZmMDI3MDNlZjUxMDhmOWYwYjg3MjZi Yzk1ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9U aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KQEAgLTk3 LDcgKzk3LDcgQEAgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OlRpbGVkQ29yZUFuaW1h dGlvbkRyYXdpbmdBcmVhKFdlYlBhZ2UmIHdlYlBhZ2UsIGMKICAgICB1cGRhdGVMYXllckhvc3Rp bmdDb250ZXh0KCk7CiAgICAgc2V0Q29sb3JTcGFjZShwYXJhbWV0ZXJzLmNvbG9yU3BhY2UpOwog Ci0gICAgaWYgKCFwYXJhbWV0ZXJzLmlzU3dhcEZyb21TdXNwZW5kZWQpCisgICAgaWYgKCFwYXJh bWV0ZXJzLmlzUHJvY2Vzc1N3YXApCiAgICAgICAgIGF0dGFjaCgpOwogfQogCmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjQ0YjA1ZTEzMGQ2OTIw MzZjNDBhODJjY2RkOGMwYmQ3ZWY1MWJkMy4uODZmMGViMzUxNzhmMTQ3ZTQ1M2I4NmUxNzM5Nzcy MTA5OTA4ZjE4OCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTAxLTE2ICBDaHJpcyBEdW1leiAgPGNkdW1lekBh cHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihQU09OKSBWaWV3IGJlY29tZXMgYmxhbmsg YWZ0ZXIgY2xpY2sgYSBjcm9zcy1zaXRlIGRvd25sb2FkIGxpbmsKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM2MQorICAgICAgICA8cmRhcjovL3By b2JsZW0vNDcwOTk1NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkIEFQSSB0ZXN0IGNvdmVyYWdlLgorCisgICAgICAgICogVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbToKKyAgICAgICAg KC1bUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSB3ZWJWaWV3OmRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25SZXNwb25zZTpkZWNpc2lvbkhhbmRsZXI6XSk6CisKIDIwMTktMDEtMTUgIEpvbmF0aGFuIEJl ZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIHdlYmtpdHB5OiBTdXBwb3J0IGJv b2xlYW4gc2ltY3RsIGlzQXZhaWxhYmxlCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQpp bmRleCBmMzVkOGJhYTM1M2YwNzAyNGZkNDBlN2Q1Mjc0NTNhNzQyMTBjM2JhLi4xN2MzZTIyZWM3 YjNjMTRiMmVmMDdhM2NhNTQ1YWQ1NzA5MGJlMjA1IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCisrKyBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmln YXRpb24ubW0KQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE3IEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNy0yMDE5IEFw cGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQg dXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlm aWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0 aW9ucwpAQCAtNzIsNiArNzIsNyBAQCBzdGF0aWMgYm9vbCBzZXJ2ZXJSZWRpcmVjdGVkOwogc3Rh dGljIEhhc2hTZXQ8cGlkX3Q+IHNlZW5QSURzOwogc3RhdGljIGJvb2wgd2lsbFBlcmZvcm1DbGll bnRSZWRpcmVjdDsKIHN0YXRpYyBib29sIGRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdDsKK3N0YXRp YyBib29sIHNob3VsZENvbnZlcnRUb0Rvd25sb2FkOwogc3RhdGljIFJldGFpblB0cjxOU1VSTD4g Y2xpZW50UmVkaXJlY3RTb3VyY2VVUkw7CiBzdGF0aWMgUmV0YWluUHRyPE5TVVJMPiBjbGllbnRS ZWRpcmVjdERlc3RpbmF0aW9uVVJMOwogCkBAIC0xMjgsNiArMTI5LDExIEBAIC0gKHZvaWQpd2Vi VmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9u OihXS05hdmlnYXRpCiAgICAgZGlkUmVwb25kVG9Qb2xpY3lEZWNpc2lvbkNhbGwgPSB0cnVlOwog fQogCistICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9y TmF2aWdhdGlvblJlc3BvbnNlOihXS05hdmlnYXRpb25SZXNwb25zZSAqKW5hdmlnYXRpb25SZXNw b25zZSBkZWNpc2lvbkhhbmRsZXI6KHZvaWQgKF4pKFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5 KSlkZWNpc2lvbkhhbmRsZXIKK3sKKyAgICBkZWNpc2lvbkhhbmRsZXIoc2hvdWxkQ29udmVydFRv RG93bmxvYWQgPyBfV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3lCZWNvbWVEb3dubG9hZCA6IFdL TmF2aWdhdGlvblJlc3BvbnNlUG9saWN5QWxsb3cpOworfQorCiAtICh2b2lkKXdlYlZpZXc6KFdL V2ViVmlldyAqKXdlYlZpZXcgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxO YXZpZ2F0aW9uOihXS05hdmlnYXRpb24gKiluYXZpZ2F0aW9uCiB7CiAgICAgc2VlblBJRHMuYWRk KFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0pOwpAQCAtMTQ2Nyw2ICsxNDczLDEwOSBA QCBURVNUKFByb2Nlc3NTd2FwLCBTZXJ2ZXJSZWRpcmVjdDIpCiAgICAgRVhQRUNUX1dLX1NUUkVR KEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4xLmh0bWwiLCBbW3dlYlZpZXcgVVJMXSBhYnNv bHV0ZVN0cmluZ10pOwogfQogCitzdGF0aWMgY29uc3QgY2hhciogbGlua1RvV2ViS2l0Qnl0ZXMg PSBSIlBTT05SRVNPVVJDRSgKKzxib2R5PgorICA8YSBpZD0idGVzdExpbmsiIGhyZWY9InBzb246 Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiPkxpbms8L2E+Cis8L2JvZHk+CispUFNPTlJFU09V UkNFIjsKKworVEVTVChQcm9jZXNzU3dhcCwgUG9saWN5Q2FuY2VsQWZ0ZXJTZXJ2ZXJSZWRpcmVj dCkKK3sKKyAgICBhdXRvIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tfV0tQ cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBwcm9jZXNzUG9vbENv bmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uID0gWUVTOworICAgIGF1 dG8gcHJvY2Vzc1Bvb2wgPSBhZG9wdE5TKFtbV0tQcm9jZXNzUG9vbCBhbGxvY10gX2luaXRXaXRo Q29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKworICAgIGF1 dG8gd2ViVmlld0NvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlv biBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRQcm9jZXNzUG9v bDpwcm9jZXNzUG9vbC5nZXQoKV07CisgICAgYXV0byBoYW5kbGVyID0gYWRvcHROUyhbW1BTT05T Y2hlbWUgYWxsb2NdIGluaXRdKTsKKyAgICBbaGFuZGxlciBhZGRNYXBwaW5nRnJvbVVSTFN0cmlu ZzpAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiIHRvRGF0YTpsaW5rVG9XZWJLaXRC eXRlc107CisgICAgW2hhbmRsZXIgYWRkUmVkaXJlY3RGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3 dy53ZWJraXQub3JnL21haW4uaHRtbCIgdG9VUkxTdHJpbmc6QCJwc29uOi8vd3d3LmFwcGxlLmNv bS9pZ25vcmUuaHRtbCJdOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVI YW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAicHNvbiJdOworCisgICAgYXV0byB3 ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VS ZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0aW9uLmdl dCgpXSk7CisgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBhZG9wdE5TKFtbUFNPTk5hdmln YXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25E ZWxlZ2F0ZTpuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCldOworCisgICAgbmF2aWdhdGlvbkRlbGVn YXRlLT5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uID0gXihXS05hdmlnYXRpb25BY3Rp b24gKmFjdGlvbiwgdm9pZCAoXmRlY2lzaW9uSGFuZGxlcikoV0tOYXZpZ2F0aW9uQWN0aW9uUG9s aWN5KSkgeworICAgICAgICBpZiAoW2FjdGlvbi5yZXF1ZXN0LlVSTC5hYnNvbHV0ZVN0cmluZyBo YXNTdWZmaXg6QCJpZ25vcmUuaHRtbCJdKSB7CisgICAgICAgICAgICBkZWNpc2lvbkhhbmRsZXIo V0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5Q2FuY2VsKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgfQorICAgICAgICBkZWNpc2lvbkhhbmRsZXIoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5 QWxsb3cpOworICAgIH07CisKKyAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1 ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAicHNvbjovL3d3dy5nb29n bGUuY29tL21haW4uaHRtbCJdXTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsK KworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNl OworICAgIGF1dG8gcGlkQWZ0ZXJGaXJzdExvYWQgPSBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50 aWZpZXJdOworCisgICAgRVhQRUNUX0VRKDEsIG51bWJlck9mRGVjaWRlUG9saWN5Q2FsbHMpOwor CisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAidGVzdExpbmsuY2xpY2soKSIgY29t cGxldGlvbkhhbmRsZXI6bmlsXTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmFp bGVkKTsKKyAgICBmYWlsZWQgPSBmYWxzZTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBFWFBF Q1RfRVEoMywgbnVtYmVyT2ZEZWNpZGVQb2xpY3lDYWxscyk7CisKKyAgICAvLyBXZSBzaG91bGQg c3RpbGwgYmUgb24gZ29vZ2xlLmNvbS4KKyAgICBFWFBFQ1RfRVEocGlkQWZ0ZXJGaXJzdExvYWQs IFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0pOworICAgIEVYUEVDVF9XS19TVFJFUShA InBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiLCBbW3dlYlZpZXcgVVJMXSBhYnNvbHV0 ZVN0cmluZ10pOworCisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAidGVzdExpbmsu aW5uZXJUZXh0IiBjb21wbGV0aW9uSGFuZGxlcjogWyZdIChpZCBpbm5lclRleHQsIE5TRXJyb3Ig KmVycm9yKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAIkxpbmsiLCBpbm5lclRleHQpOwor ICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpy dW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKK30KKworVEVTVChQcm9jZXNzU3dhcCwgQ3Jv c3NTaXRlRG93bmxvYWQpCit7CisgICAgYXV0byBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gPSBh ZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAg cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbiA9 IFlFUzsKKyAgICBhdXRvIHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxs b2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgp XSk7CisKKyAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmll d0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24g c2V0UHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0KCldOworICAgIGF1dG8gaGFuZGxlciA9IGFk b3B0TlMoW1tQU09OU2NoZW1lIGFsbG9jXSBpbml0XSk7CisgICAgW2hhbmRsZXIgYWRkTWFwcGlu Z0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3Lmdvb2dsZS5jb20vbWFpbi5odG1sIiB0b0RhdGE6 bGlua1RvV2ViS2l0Qnl0ZXNdOworICAgIFtoYW5kbGVyIGFkZE1hcHBpbmdGcm9tVVJMU3RyaW5n OkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCIgdG9EYXRhOiJIZWxsbyJdOworICAg IFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkg Zm9yVVJMU2NoZW1lOkAicHNvbiJdOworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dL V2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBj b25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgYXV0byBuYXZp Z2F0aW9uRGVsZWdhdGUgPSBhZG9wdE5TKFtbUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10g aW5pdF0pOworICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpuYXZpZ2F0aW9uRGVs ZWdhdGUuZ2V0KCldOworCisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVz dCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246Ly93d3cuZ29vZ2xl LmNvbS9tYWluLmh0bWwiXV07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisK KyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsK KyAgICBhdXRvIHBpZEFmdGVyRmlyc3RMb2FkID0gW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlm aWVyXTsKKworICAgIHNob3VsZENvbnZlcnRUb0Rvd25sb2FkID0gdHJ1ZTsKKyAgICBbd2ViVmll dyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJ0ZXN0TGluay5jbGljaygpIiBjb21wbGV0aW9uSGFuZGxl cjpuaWxdOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZmYWlsZWQpOworICAgIGZh aWxlZCA9IGZhbHNlOworICAgIHNob3VsZENvbnZlcnRUb0Rvd25sb2FkID0gZmFsc2U7CisKKyAg ICAvLyBXZSBzaG91bGQgc3RpbGwgYmUgb24gZ29vZ2xlLmNvbS4KKyAgICBFWFBFQ1RfRVEocGlk QWZ0ZXJGaXJzdExvYWQsIFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0pOworICAgIEVY UEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuZ29vZ2xlLmNvbS9tYWluLmh0bWwiLCBbW3dlYlZp ZXcgVVJMXSBhYnNvbHV0ZVN0cmluZ10pOworCisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2Ny aXB0OkAidGVzdExpbmsuaW5uZXJUZXh0IiBjb21wbGV0aW9uSGFuZGxlcjogWyZdIChpZCBpbm5l clRleHQsIE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAIkxpbmsi LCBpbm5lclRleHQpOworICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBUZXN0V2Vi S2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKK30KKwogZW51bSBj bGFzcyBTaG91bGRFbmFibGVQU09OIHsgTm8sIFllcyB9Owogc3RhdGljIHZvaWQgcnVuQ2xpZW50 U2lkZVJlZGlyZWN0VGVzdChTaG91bGRFbmFibGVQU09OIHNob3VsZEVuYWJsZVBTT04pCiB7CkBA IC0yMjMyLDEyICsyMzQxLDI3IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIFBhZ2VTaG93SGlkZSkKIAog ICAgIEVYUEVDVF9FUSg3dSwgW3JlY2VpdmVkTWVzc2FnZXMgY291bnRdKTsKICAgICBFWFBFQ1Rf V0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gcGFnZXNob3cgTk9U IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMF0pOwotICAgIEVYUEVDVF9XS19T VFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0 ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJw c29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBwYWdlc2hvdyBOT1QgcGVyc2lzdGVkIiwg cmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsyXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjov L3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRN ZXNzYWdlcy5nZXQoKVszXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJr aXQub3JnL21haW4uaHRtbCAtIHBhZ2VzaG93IHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMu Z2V0KClbNF0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9t YWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVd KTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwg LSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAgICBp ZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMV0gaGFzUHJlZml4OkAicHNvbjovL3d3dy53ZWJr aXQub3JnL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93 d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQiLCByZWNlaXZlZE1l c3NhZ2VzLmdldCgpWzFdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5h cHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgTk9UIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVz c2FnZXMuZ2V0KClbMl0pOworICAgIH0gZWxzZSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShA InBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHBhZ2VzaG93IE5PVCBwZXJzaXN0ZWQi LCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAi cHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJl Y2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOworICAgIH0KKyAgICBpZiAoW3JlY2VpdmVkTWVzc2Fn ZXMuZ2V0KClbM10gaGFzUHJlZml4OkAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIl0p IHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5o dG1sIC0gcGFnZWhpZGUgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSk7Cisg ICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwg LSBwYWdlc2hvdyBwZXJzaXN0ZWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzRdKTsKKyAgICB9 IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcv bWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsz XSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4u aHRtbCAtIHBhZ2VoaWRlIHBlcnNpc3RlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNF0pOwor ICAgIH0KKyAgICBpZiAoW3JlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNV0gaGFzUHJlZml4OkAicHNv bjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJF UShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQi LCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAi cHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lzdGVkIiwgcmVj ZWl2ZWRNZXNzYWdlcy5nZXQoKVs2XSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgRVhQRUNUX1dL X1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gcGFnZXNob3cgcGVyc2lz dGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs1XSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJF UShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBwYWdlaGlkZSBwZXJzaXN0ZWQi LCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzZdKTsKKyAgICB9CiB9CiAKIC8vIERpc2FibGluZyB0 aGUgcGFnZSBjYWNoZSBleHBsaWNpdGx5IGlzIChmb3Igc29tZSByZWFzb24pIG5vdCBhdmFpbGFi bGUgb24gaU9TLgpAQCAtMjMwNywxMiArMjQzMSwyNyBAQCBURVNUKFByb2Nlc3NTd2FwLCBMb2Fk VW5sb2FkKQogCiAgICAgRVhQRUNUX0VRKDd1LCBbcmVjZWl2ZWRNZXNzYWdlcyBjb3VudF0pOwog ICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwgLSBs b2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVswXSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAi cHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHVubG9hZCIsIHJlY2VpdmVkTWVzc2Fn ZXMuZ2V0KClbMV0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29t L21haW4uaHRtbCAtIGxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsKLSAgICBFWFBF Q1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSB1bmxvYWQiLCBy ZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8v d3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gbG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClb NF0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0 bWwgLSB1bmxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdKTsKLSAgICBFWFBFQ1RfV0tf U1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBsb2FkIiwgcmVjZWl2ZWRN ZXNzYWdlcy5nZXQoKVs2XSk7CisgICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdIGhh c1ByZWZpeDpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiXSkgeworICAgICAgICBF WFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIC0gdW5sb2Fk IiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVsxXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShA InBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIGxvYWQiLCByZWNlaXZlZE1lc3NhZ2Vz LmdldCgpWzJdKTsKKyAgICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29u Oi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwgLSBsb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQo KVsxXSk7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9t YWluLmh0bWwgLSB1bmxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzJdKTsKKyAgICB9Cisg ICAgaWYgKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzNdIGhhc1ByZWZpeDpAInBzb246Ly93d3cu YXBwbGUuY29tL21haW4uaHRtbCJdKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246 Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHVubG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0 KClbM10pOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcv bWFpbi5odG1sIC0gbG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbNF0pOworICAgIH0gZWxz ZSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWlu Lmh0bWwgLSBsb2FkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVszXSk7CisgICAgICAgIEVYUEVD VF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIHVubG9hZCIsIHJl Y2VpdmVkTWVzc2FnZXMuZ2V0KClbNF0pOworICAgIH0KKyAgICBpZiAoW3JlY2VpdmVkTWVzc2Fn ZXMuZ2V0KClbNV0gaGFzUHJlZml4OkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJd KSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWlu Lmh0bWwgLSB1bmxvYWQiLCByZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzVdKTsKKyAgICAgICAgRVhQ RUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5odG1sIC0gbG9hZCIsIHJl Y2VpdmVkTWVzc2FnZXMuZ2V0KClbNl0pOworICAgIH0gZWxzZSB7CisgICAgICAgIEVYUEVDVF9X S19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbCAtIGxvYWQiLCByZWNlaXZl ZE1lc3NhZ2VzLmdldCgpWzVdKTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3 dy53ZWJraXQub3JnL21haW4uaHRtbCAtIHVubG9hZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClb Nl0pOworICAgIH0KIH0KIAogVEVTVChQcm9jZXNzU3dhcCwgV2ViSW5zcGVjdG9yKQpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IGZiNTRlMDZlZjY3MjJiMGMwNjNlMGJlZjNiYmVjYTA5OTEyNGUwNWEuLjY1MGY3NzNlOWNlNDE1 YjQwOWEwYzk4NDNkMDAxYThhYTk2NDcxYTAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxOS0w MS0xNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFJlZ3Jlc3Np b24oUFNPTikgVmlldyBiZWNvbWVzIGJsYW5rIGFmdGVyIGNsaWNrIGEgY3Jvc3Mtc2l0ZSBkb3du bG9hZCBsaW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTMzNjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3MDk5NTczPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNraXAgdGVzdCB0ZXN0aW5nIHRo ZSBjcm9zcy1wcm9jZXNzIERPTVdpbmRvdyBBUEkgYXMgSSBicm9rZSBpdCB3aXRoIHRoaXMgcGF0 Y2guCisgICAgICAgIFRoZSBmZWF0dXJlIGlzIGZhciBmcm9tIHJlYWR5IGFuZCBvZmYgYnkgZGVm YXVsdCBhbnl3YXkuIEkgd2lsbCBhZGQgc3VwcG9ydCBiYWNrCisgICAgICAgIGluIGEgZm9sbG93 LXVwLgorCisgICAgICAgICogcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTkt MDEtMTUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmll d2VkLCByb2xsaW5nIG91dCByMjM5OTkzLCByMjM5OTk1LCByMjM5OTk3LCBhbmQKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggOGU5NTllZGFmZmQ4OTI3ZWY5 YzJhYWMzMTZlOWUzMTAwY2QxNDBjYi4uOWQ5MGJlOGI0OGU1N2M5NjBiY2RhNjg2Y2UyNDQwZDcx MzhiYjBmNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3Rh dGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAg LTczMyw4ICs3MzMsOCBAQCBodHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0YXRpc3RpY3MvcmVtb3Zl LWJsb2NraW5nLWluLXJlZGlyZWN0Lmh0bWwgWyBTa2lwIF0KIGh0dHAvdGVzdHMvcmVzb3VyY2VM b2FkU3RhdGlzdGljcy9ub24tcHJldmFsZW50LXJlc291cmNlcy1jYW4tYWNjZXNzLWNvb2tpZXMt aW4tYS10aGlyZC1wYXJ0eS1jb250ZXh0Lmh0bWwgWyBTa2lwIF0KIGh0dHAvdGVzdHMvcmVzb3Vy Y2VMb2FkU3RhdGlzdGljcy9jYXAtY2FjaGUtbWF4LWFnZS1mb3ItcHJldmFsZW50LXJlc291cmNl Lmh0bWwgWyBTa2lwIF0KIAotIyBQcm9jZXNzIHN3YXBwaW5nIGlzIG9ubHkgaW1wbGVtZW50ZWQg b24gV2ViS2l0Mi4KLWh0dHAvdGVzdHMvbmF2aWdhdGlvbi9wcm9jZXNzLXN3YXAtd2luZG93LW9w ZW4uaHRtbCBbIFBhc3MgXQorIyBUaGlzIGZlYXR1cmUgaXMgY3VycmVudGx5IGRpc2FibGVkIGJ5 IGRlZmF1bHQgYW5kIHVuZmluaXNoZWQgPHJkYXI6Ly9wcm9ibGVtLzM4OTI1MDc3Pi4KK2h0dHAv dGVzdHMvbmF2aWdhdGlvbi9wcm9jZXNzLXN3YXAtd2luZG93LW9wZW4uaHRtbCBbIFNraXAgXQog CiAjIENyb3NzLU9yaWdpbi1SZXNvdXJjZS1Qb2xpY3kgcmVzcG9uc2UgaGVhZGVyIGlzIG9ubHkg aW1wbGVtZW50ZWQgaW4gV2ViS2l0Mi4KIGh0dHAvd3B0L2Nyb3NzLW9yaWdpbi1yZXNvdXJjZS1w b2xpY3kvIFsgUGFzcyBdCg==