84543 2012-04-22 05:35:18 -0700 unicode-bidi:plaintext treats embedded element with unicode-bidi:plaintext or isolate incorrectly 2022-09-11 03:51:44 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified NEW InRadar P2 Normal --- 50910 1 aharon igor.oliveira ahmad.saleem792 bfulgham commit-queue eric esprehn+autocc glenn igor.oliveira kondapallykalyan leviw mitz mmaxfield playmobil rniwa simon.fraser webkit-bug-importer xji oldest_to_newest 607337 0 aharon 2012-04-22 05:35:18 -0700 The current definition of unicode-bidi:plaintext in CSS Writing Modes Level 3 states: This value behaves as ‘isolate’ except that for the purposes of the Unicode bidirectional algorithm, the base directionality of each bidi paragraph immediately contained by the element is determined not by the element's computed ‘direction’ as usual, but by following the heuristic in rules P2 and P3 of the Unicode bidirectional algorithm. An element immediately contains a bidi paragraph if the element itself, but none of its descendants, both contains the entire bidi paragraph and is either a block container or a bidi-isolating inline. Thus, if you have inline element A around inline element B, where A has unicode-bidi:plaintext and B has unicode-bidi:isolate, then: 1. The paragraphs in B must get their base direction from B's direction property as usual, not from their content as would be the case if B has unicode-bidi:plaintext - even though B is inside A and A does have unicode-bidi:plaintext. The "immediately contained" definition was recently added to clarify this very point. 2. B's content must not affect the direction of the paragraph in A inside which B occurs (because, according to the spec, "for the purpose of bidi resolution in its containing bidi paragraph (if any), [an element with unicode-bidi:isolate] is treated as if it were an Object Replacement Character (U+FFFC)"). The same is true if B also had unicode-bidi:plaintext (because unicode-bidi:plaintext "behaves as ‘isolate’"). Unfortunately, neither 1 nor 2 holds in WebKit. The first two attachments show this when A is a block element. (I used a <div> with unicode-bidi:-webkit-isolate style, but it could have been done with a <pre> out of the box.) The next two attachment show that things are even worse when A is an inline element: the content after B completely disappears. Very strange and worrisome. 607338 1 138266 aharon 2012-04-22 05:41:12 -0700 Created attachment 138266 Test case 1: block plaintext around inline isolate. 607339 2 138267 aharon 2012-04-22 05:42:00 -0700 Created attachment 138267 Test case 2: block plaintext around inline plaintext. 607340 3 138268 aharon 2012-04-22 05:43:25 -0700 Created attachment 138268 Test case 3: inline plaintext around inline isolate. 607341 4 138269 aharon 2012-04-22 05:44:15 -0700 Created attachment 138269 Test case 4: inline plaintext around inline plaintext. 607361 5 leviw 2012-04-22 10:36:54 -0700 I hope to take a look at this next week. 935381 6 aharon 2013-10-02 03:25:23 -0700 FYI, this has been fixed in Blink. See https://code.google.com/p/chromium/issues/detail?id=276642, but watch out for https://code.google.com/p/chromium/issues/detail?id=299879 and https://code.google.com/p/chromium/issues/detail?id=301500. 1050516 7 242055 igor.oliveira 2014-11-21 11:33:13 -0800 Created attachment 242055 Patch V1 1050519 8 igor.oliveira 2014-11-21 11:37:05 -0800 The patch is fixing just the test cases 1 and 2. The test cases 3 and 4 are a different bug. 1050528 9 242060 igor.oliveira 2014-11-21 11:52:34 -0800 Created attachment 242060 Patch 1050555 10 242067 igor.oliveira 2014-11-21 13:32:34 -0800 Created attachment 242067 Patch 1051518 11 242067 mmaxfield 2014-12-01 11:56:48 -0800 Comment on attachment 242067 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=242067&action=review > Source/WebCore/rendering/RenderBlockLineLayout.cpp:58 > + if (isIsolated(current->style().unicodeBidi()) Maybe we want to stay inside root here? > Source/WebCore/rendering/RenderBlockLineLayout.cpp:62 > + else I'm not sure this would ever occur. If I'm reading RenderBlockLineLayout correctly, every time we call this function, the root element's unicodeBidi() is Plaintext. > Source/WebCore/rendering/RenderBlockLineLayout.cpp:78 > + next = downcast<RenderElement>(*current).firstChild(); How do you know that this is a RenderElement? > Source/WebCore/rendering/RenderBlockLineLayout.cpp:81 > + while (current && current != root) { Don't we have a better way of iterating through elements in order? Some sort of iterator class? > Source/WebCore/rendering/RenderBlockLineLayout.cpp:101 > + InlineIterator iter(rootElement, firstRenderObjectForDirectionalityDetermination(rootElement, iterator.renderer()), iterator.offset()); Is this really right? You are specifying the RenderObject input to InlineIterator, but keeping the original offset. What if the first RenderObject is shorter than the original iterator's offset? > Source/WebCore/rendering/RenderBlockLineLayout.cpp:104 > + observer.setStatus(BidiStatus(rootElement->style().direction(), isOverride(rootElement->style().unicodeBidi()))); Using the root element here seems fishy to me. What if something between iter.renderer() and root has its direction specified? 1052548 12 242067 mmaxfield 2014-12-04 13:22:00 -0800 Comment on attachment 242067 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=242067&action=review >> Source/WebCore/rendering/RenderBlockLineLayout.cpp:81 >> + while (current && current != root) { > > Don't we have a better way of iterating through elements in order? Some sort of iterator class? RenderIterator 1173183 13 242067 bfulgham 2016-03-10 11:27:03 -0800 Comment on attachment 242067 Patch This patch can't be applied to current WebKit sources. Could you please address Myles' review comments, using RenderIterator, and upload a new patch? 1875141 14 ahmad.saleem792 2022-06-09 17:37:41 -0700 I am able to reproduce this partially in Safari 15.5 on macOS 12.4. Test Case 1 -> Reproducible: Safari 15.5 - Does not match both boxes Chrome Canary 104 - Matches both boxes Firefox Nightly 103 - Matches both boxes Test Case 1 -> Reproducible: Safari 15.5 - Does not match both boxes Chrome Canary 104 - Matches both boxes Firefox Nightly 103 - Matches both boxes Test Case 3 -> Matching Chrome but different from Firefox: Safari 15.5 - Matches both boxes (Although in two lines) Chrome Canary 104 - Matches both boxes (same as Safari) Firefox Nightly 103 - Matches both boxes (In single line) Test Case 4 -> Matching Chrome but different from Firefox: Safari 15.5 - Matches both boxes (Although in two lines) Chrome Canary 104 - Matches both boxes (same as Safari) Firefox Nightly 103 - Matches both boxes (In single line) If I am testing it incorrectly, please retest accordingly. Thanks! 1875149 15 mmaxfield 2022-06-09 18:22:47 -0700 Thanks for retrying the reproduction cases!!! :D 1889717 16 webkit-bug-importer 2022-08-08 11:19:25 -0700 <rdar://problem/98330916> 1897685 17 ahmad.saleem792 2022-09-11 03:51:44 -0700 (In reply to Ahmad Saleem from comment #14) > I am able to reproduce this partially in Safari 15.5 on macOS 12.4. > > Test Case 1 -> Reproducible: > > Safari 15.5 - Does not match both boxes > Chrome Canary 104 - Matches both boxes > Firefox Nightly 103 - Matches both boxes > > Test Case 1 -> Reproducible: > > Safari 15.5 - Does not match both boxes > Chrome Canary 104 - Matches both boxes > Firefox Nightly 103 - Matches both boxes > > Test Case 3 -> Matching Chrome but different from Firefox: > > Safari 15.5 - Matches both boxes (Although in two lines) > Chrome Canary 104 - Matches both boxes (same as Safari) > Firefox Nightly 103 - Matches both boxes (In single line) > > Test Case 4 -> Matching Chrome but different from Firefox: > > Safari 15.5 - Matches both boxes (Although in two lines) > Chrome Canary 104 - Matches both boxes (same as Safari) > Firefox Nightly 103 - Matches both boxes (In single line) > > If I am testing it incorrectly, please retest accordingly. Thanks! Update from Safari Technology Preview 153 (not checked compared to other browsers except where we were just matching one): Test Case 1 -> No more reproducible.. :-) STP 153 - Matches both boxes Chrome Canary 104 - Matches both boxes Firefox Nightly 103 - Matches both boxes Test Case 1 -> No more reproducible.. :-) STP 153 - Matches both boxes Chrome Canary 104 - Matches both boxes Firefox Nightly 103 - Matches both boxes Test Case 3 -> Matching Chrome but different from Firefox: [No difference from last in STP 153] Safari 15.5 - Matches both boxes (Although in two lines) Chrome Canary 104 - Matches both boxes (same as Safari) Firefox Nightly 103 - Matches both boxes (In single line) Test Case 4 -> Matching Chrome but different from Firefox: [No difference from last in STP 153] Safari 15.5 - Matches both boxes (Although in two lines) Chrome Canary 104 - Matches both boxes (same as Safari) Firefox Nightly 103 - Matches both boxes (In single line) 138266 2012-04-22 05:41:12 -0700 2012-04-22 05:41:12 -0700 Test case 1: block plaintext around inline isolate. plaintext-around-isolate.html text/html 1265 aharon PCFET0NUWVBFIGh0bWw+DQo8aHRtbD4NCiAgPGhlYWQ+DQogICAgPG1ldGEgY2hhcnNldD0idXRm LTgiLz4NCiAgICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHA6Ly9kZXYudzMub3JnL2Nzc3dn L2NzczMtd3JpdGluZy1tb2Rlcy8jdW5pY29kZS1iaWRpMCIgLz4NCiAgICA8c3R5bGU+DQogICAg ICBib2R5IHsNCiAgICAgICAgZm9udC1zaXplOjJlbTsNCiAgICAgICAgdGV4dC1hbGlnbjpsZWZ0 Ow0KICAgICAgfQ0KICAgICAgLnRlc3QsIC5yZWYgew0KICAgICAgICBib3JkZXI6IG1lZGl1bSBz b2xpZCBncmF5Ow0KICAgICAgICBwYWRkaW5nOiAxMHB4Ow0KICAgICAgICB3aWR0aDogNDAwcHg7 DQogICAgICAgIG1hcmdpbjogMjBweDsNCiAgICAgIH0NCiAgICAgIC5jb21tZW50cyB7DQogICAg ICAgIGRpc3BsYXk6IG5vbmU7DQogICAgICB9DQogICAgICAucGxhaW50ZXh0IHsNCiAgICAgICAg dW5pY29kZS1iaWRpOiAtbW96LXBsYWludGV4dDsNCiAgICAgICAgdW5pY29kZS1iaWRpOiAtd2Vi a2l0LXBsYWludGV4dDsNCiAgICAgICAgdW5pY29kZS1iaWRpOiBwbGFpbnRleHQ7DQogICAgICB9 DQogICAgICAuaXNvbGF0ZSB7DQogICAgICAgIHVuaWNvZGUtYmlkaTogLW1vei1pc29sYXRlOw0K ICAgICAgICB1bmljb2RlLWJpZGk6IC13ZWJraXQtaXNvbGF0ZTsNCiAgICAgICAgdW5pY29kZS1i aWRpOiBpc29sYXRlOw0KICAgICAgfQ0KICAgIDwvc3R5bGU+DQogICAgPHRpdGxlPnVuaWNvZGUt YmlkaTpwbGFpbnRleHQgZG9lcyBub3QgYXBwbHkgdG8gZW1iZWRkZWQgdW5pY29kZS1iaWRpOmlz b2xhdGU8L3RpdGxlPg0KICA8L2hlYWQ+DQogIDxib2R5Pg0KICAgIDxkaXYgY2xhc3M9Imluc3Ry dWN0aW9ucyI+PHA+VGVzdCBwYXNzZXMgaWYgdGhlIHR3byBib3hlcyBiZWxvdyBsb29rIGV4YWN0 bHkgdGhlIHNhbWUuPC9wPjwvZGl2Pg0KICAgIDxkaXYgY2xhc3M9InRlc3QiPg0KICAgICAgPGRp diBjbGFzcz0icGxhaW50ZXh0Ij48c3BhbiBjbGFzcz0iaXNvbGF0ZSI+JiN4MDVEMDstPjwvc3Bh bj4gPT0gPT0gPT0+PC9kaXY+DQogICAgICA8ZGl2IGNsYXNzPSJwbGFpbnRleHQiPjxzcGFuPiYj eDA1RDE7LT48L3NwYW4+ID09ID09ID09PjwvZGl2Pg0KICAgIDwvZGl2Pg0KICAgIDxkaXYgY2xh c3M9InJlZiI+DQogICAgICAmI3gwNUQwOy0+ID09ID09ID09PiZscm07DQogICAgICA8ZGl2IGRp cj0icnRsIj4mI3gwNUQxOy0+ID09ID09ID09PjwvZGl2Pg0KICAgIDwvZGl2Pg0KICA8L2JvZHk+ DQo8L2h0bWw+DQo= 138267 2012-04-22 05:42:00 -0700 2012-04-22 05:42:35 -0700 Test case 2: block plaintext around inline plaintext. plaintext-around-plaintext-on-inline.html text/html 1138 aharon PCFET0NUWVBFIGh0bWw+DQo8aHRtbD4NCiAgPGhlYWQ+DQogICAgPG1ldGEgY2hhcnNldD0idXRm LTgiLz4NCiAgICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHA6Ly9kZXYudzMub3JnL2Nzc3dn L2NzczMtd3JpdGluZy1tb2Rlcy8jdW5pY29kZS1iaWRpMCIgLz4NCiAgICA8c3R5bGU+DQogICAg ICBib2R5IHsNCiAgICAgICAgZm9udC1zaXplOjJlbTsNCiAgICAgICAgdGV4dC1hbGlnbjpsZWZ0 Ow0KICAgICAgfQ0KICAgICAgLnRlc3QsIC5yZWYgew0KICAgICAgICBib3JkZXI6IG1lZGl1bSBz b2xpZCBncmF5Ow0KICAgICAgICBwYWRkaW5nOiAxMHB4Ow0KICAgICAgICB3aWR0aDogNDAwcHg7 DQogICAgICAgIG1hcmdpbjogMjBweDsNCiAgICAgIH0NCiAgICAgIC5jb21tZW50cyB7DQogICAg ICAgIGRpc3BsYXk6IG5vbmU7DQogICAgICB9DQogICAgICAucGxhaW50ZXh0IHsNCiAgICAgICAg dW5pY29kZS1iaWRpOiAtbW96LXBsYWludGV4dDsNCiAgICAgICAgdW5pY29kZS1iaWRpOiAtd2Vi a2l0LXBsYWludGV4dDsNCiAgICAgICAgdW5pY29kZS1iaWRpOiBwbGFpbnRleHQ7DQogICAgICB9 DQogICAgPC9zdHlsZT4NCiAgICA8dGl0bGU+dW5pY29kZS1iaWRpOnBsYWludGV4dCBkb2VzIG5v dCBhcHBseSB0byBlbWJlZGRlZCB1bmljb2RlLWJpZGk6cGxhaW50ZXh0PC90aXRsZT4NCiAgPC9o ZWFkPg0KICA8Ym9keT4NCiAgICA8ZGl2IGNsYXNzPSJpbnN0cnVjdGlvbnMiPjxwPlRlc3QgcGFz c2VzIGlmIHRoZSB0d28gYm94ZXMgYmVsb3cgbG9vayBleGFjdGx5IHRoZSBzYW1lLjwvcD48L2Rp dj4NCiAgICA8ZGl2IGNsYXNzPSJ0ZXN0Ij4NCiAgICAgIDxkaXYgY2xhc3M9InBsYWludGV4dCI+ PHNwYW4gY2xhc3M9InBsYWludGV4dCI+JiN4MDVEMDstPjwvc3Bhbj4gPT0gPT0gPT0+PC9kaXY+ DQogICAgICA8ZGl2IGNsYXNzPSJwbGFpbnRleHQiPjxzcGFuPiYjeDA1RDE7LT48L3NwYW4+ID09 ID09ID09PjwvZGl2Pg0KICAgIDwvZGl2Pg0KICAgIDxkaXYgY2xhc3M9InJlZiI+DQogICAgICAm I3gwNUQwOy0+JnJsbTsgPT0gPT0gPT0+JmxybTsNCiAgICAgIDxkaXYgZGlyPSJydGwiPiYjeDA1 RDE7LT4gPT0gPT0gPT0+PC9kaXY+DQogICAgPC9kaXY+DQogIDwvYm9keT4NCjwvaHRtbD4NCg== 138268 2012-04-22 05:43:25 -0700 2012-04-22 05:43:25 -0700 Test case 3: inline plaintext around inline isolate. plaintext-on-inline-around-isolate.html text/html 1271 aharon PCFET0NUWVBFIGh0bWw+DQo8aHRtbD4NCiAgPGhlYWQ+DQogICAgPG1ldGEgY2hhcnNldD0idXRm LTgiLz4NCiAgICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHA6Ly9kZXYudzMub3JnL2Nzc3dn L2NzczMtd3JpdGluZy1tb2Rlcy8jdW5pY29kZS1iaWRpMCIgLz4NCiAgICA8c3R5bGU+DQogICAg ICBib2R5IHsNCiAgICAgICAgZm9udC1zaXplOjJlbTsNCiAgICAgICAgdGV4dC1hbGlnbjpsZWZ0 Ow0KICAgICAgfQ0KICAgICAgLnRlc3QsIC5yZWYgew0KICAgICAgICBib3JkZXI6IG1lZGl1bSBz b2xpZCBncmF5Ow0KICAgICAgICBwYWRkaW5nOiAxMHB4Ow0KICAgICAgICB3aWR0aDogNDAwcHg7 DQogICAgICAgIG1hcmdpbjogMjBweDsNCiAgICAgIH0NCiAgICAgIC5jb21tZW50cyB7DQogICAg ICAgIGRpc3BsYXk6IG5vbmU7DQogICAgICB9DQogICAgICAucGxhaW50ZXh0IHsNCiAgICAgICAg dW5pY29kZS1iaWRpOiAtbW96LXBsYWludGV4dDsNCiAgICAgICAgdW5pY29kZS1iaWRpOiAtd2Vi a2l0LXBsYWludGV4dDsNCiAgICAgICAgdW5pY29kZS1iaWRpOiBwbGFpbnRleHQ7DQogICAgICB9 DQogICAgICAuaXNvbGF0ZSB7DQogICAgICAgIHVuaWNvZGUtYmlkaTogLW1vei1pc29sYXRlOw0K ICAgICAgICB1bmljb2RlLWJpZGk6IC13ZWJraXQtaXNvbGF0ZTsNCiAgICAgICAgdW5pY29kZS1i aWRpOiBpc29sYXRlOw0KICAgICAgfQ0KICAgIDwvc3R5bGU+DQogICAgPHRpdGxlPnVuaWNvZGUt YmlkaTpwbGFpbnRleHQgZG9lcyBub3QgYXBwbHkgdG8gZW1iZWRkZWQgdW5pY29kZS1iaWRpOmlz b2xhdGU8L3RpdGxlPg0KICA8L2hlYWQ+DQogIDxib2R5Pg0KICAgIDxkaXYgY2xhc3M9Imluc3Ry dWN0aW9ucyI+PHA+VGVzdCBwYXNzZXMgaWYgdGhlIHR3byBib3hlcyBiZWxvdyBsb29rIGV4YWN0 bHkgdGhlIHNhbWUuPC9wPjwvZGl2Pg0KICAgIDxkaXYgY2xhc3M9InRlc3QiPg0KICAgICAgPHNw YW4gY2xhc3M9InBsYWludGV4dCI+PHNwYW4gY2xhc3M9Imlzb2xhdGUiPiYjeDA1RDA7LT48L3Nw YW4+ID09ID09ID09Pjwvc3Bhbj4NCiAgICAgIDxzcGFuIGNsYXNzPSJwbGFpbnRleHQiPjxzcGFu PiYjeDA1RDE7LT48L3NwYW4+ID09ID09ID09Pjwvc3Bhbj4NCiAgICA8L2Rpdj4NCiAgICA8ZGl2 IGNsYXNzPSJyZWYiPg0KICAgICAgJiN4MDVEMDstPiA9PSA9PSA9PT4mbHJtOw0KICAgICAgPHNw YW4gZGlyPSJydGwiPiYjeDA1RDE7LT4gPT0gPT0gPT0+PC9zcGFuPg0KICAgIDwvZGl2Pg0KICA8 L2JvZHk+DQo8L2h0bWw+DQo= 138269 2012-04-22 05:44:15 -0700 2012-04-22 05:44:15 -0700 Test case 4: inline plaintext around inline plaintext. plaintext-on-inline-around-plaintext-on-inline.html text/html 1144 aharon PCFET0NUWVBFIGh0bWw+DQo8aHRtbD4NCiAgPGhlYWQ+DQogICAgPG1ldGEgY2hhcnNldD0idXRm LTgiLz4NCiAgICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHA6Ly9kZXYudzMub3JnL2Nzc3dn L2NzczMtd3JpdGluZy1tb2Rlcy8jdW5pY29kZS1iaWRpMCIgLz4NCiAgICA8c3R5bGU+DQogICAg ICBib2R5IHsNCiAgICAgICAgZm9udC1zaXplOjJlbTsNCiAgICAgICAgdGV4dC1hbGlnbjpsZWZ0 Ow0KICAgICAgfQ0KICAgICAgLnRlc3QsIC5yZWYgew0KICAgICAgICBib3JkZXI6IG1lZGl1bSBz b2xpZCBncmF5Ow0KICAgICAgICBwYWRkaW5nOiAxMHB4Ow0KICAgICAgICB3aWR0aDogNDAwcHg7 DQogICAgICAgIG1hcmdpbjogMjBweDsNCiAgICAgIH0NCiAgICAgIC5jb21tZW50cyB7DQogICAg ICAgIGRpc3BsYXk6IG5vbmU7DQogICAgICB9DQogICAgICAucGxhaW50ZXh0IHsNCiAgICAgICAg dW5pY29kZS1iaWRpOiAtbW96LXBsYWludGV4dDsNCiAgICAgICAgdW5pY29kZS1iaWRpOiAtd2Vi a2l0LXBsYWludGV4dDsNCiAgICAgICAgdW5pY29kZS1iaWRpOiBwbGFpbnRleHQ7DQogICAgICB9 DQogICAgPC9zdHlsZT4NCiAgICA8dGl0bGU+dW5pY29kZS1iaWRpOnBsYWludGV4dCBkb2VzIG5v dCBhcHBseSB0byBlbWJlZGRlZCB1bmljb2RlLWJpZGk6cGxhaW50ZXh0PC90aXRsZT4NCiAgPC9o ZWFkPg0KICA8Ym9keT4NCiAgICA8ZGl2IGNsYXNzPSJpbnN0cnVjdGlvbnMiPjxwPlRlc3QgcGFz c2VzIGlmIHRoZSB0d28gYm94ZXMgYmVsb3cgbG9vayBleGFjdGx5IHRoZSBzYW1lLjwvcD48L2Rp dj4NCiAgICA8ZGl2IGNsYXNzPSJ0ZXN0Ij4NCiAgICAgIDxzcGFuIGNsYXNzPSJwbGFpbnRleHQi PjxzcGFuIGNsYXNzPSJwbGFpbnRleHQiPiYjeDA1RDA7LT48L3NwYW4+ID09ID09ID09Pjwvc3Bh bj4NCiAgICAgIDxzcGFuIGNsYXNzPSJwbGFpbnRleHQiPjxzcGFuPiYjeDA1RDE7LT48L3NwYW4+ ID09ID09ID09Pjwvc3Bhbj4NCiAgICA8L2Rpdj4NCiAgICA8ZGl2IGNsYXNzPSJyZWYiPg0KICAg ICAgJiN4MDVEMDstPiZybG07ID09ID09ID09PiZscm07DQogICAgICA8c3BhbiBkaXI9InJ0bCI+ JiN4MDVEMTstPiA9PSA9PSA9PT48L3NwYW4+DQogICAgPC9kaXY+DQogIDwvYm9keT4NCjwvaHRt bD4NCg== 242055 2014-11-21 11:33:13 -0800 2014-11-21 11:52:27 -0800 Patch V1 bug-84543-20141121143438.patch text/plain 12847 igor.oliveira U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2Mzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjJiZGFlMzEzZTU0NDNk NTFlYmZkNDBmN2JlZmE2N2ZjN2MwNTQxNi4uNTMwMGEwODIyYWNlYjU1ZTM2NWZjMTZjYWM2Nzcy ZTQ0OWMzY2Q1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE0LTExLTIxICBJZ29y IE9saXZlaXJhICA8aWdvckB3b3JrLmNvPgorCisgICAgICAgIHVuaWNvZGUtYmlkaTpwbGFpbnRl eHQgdHJlYXRzIGVtYmVkZGVkIGVsZW1lbnQgd2l0aCB1bmljb2RlLWJpZGk6cGxhaW50ZXh0IG9y IGlzb2xhdGUgaW5jb3JyZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg0NTQzCisKKyAgICAgICAgSW4gdGhlIENTUyBXcml0aW5nIE1vZGVzIHNw ZWNpZmljYXRpb246CisgICAgICAgIEZvciB0aGUgcHVycG9zZSBvZiBiaWRpIHJlc29sdXRpb24g aW4gaXRzIGNvbnRhaW5pbmcgYmlkaSBwYXJhZ3JhcGgsCisgICAgICAgIHRoZSBzZXF1ZW5jZSBp cyB0cmVhdGVkIGFzIGlmIGl0IHdlcmUgYSBzaW5nbGUgT2JqZWN0IFJlcGxhY2VtZW50IENoYXJh Y3RlciAoVStGRkZDKS4KKworICAgICAgICBXZWJLaXQgZG9lcyBub3QgdHJlYXQgdGhlIGlzb2xh dGVkIHNlcXVlbmNlIGFzIGlmIGl0IHdlcmUgYSBVK1VGRkZDLgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZhc3QvdGV4dC9pbnRlcm5hdGlv bmFsL3VuaWNvZGUtYmlkaS1wbGFpbnRleHQtbmVzdGVkLWlzb2xhdGUtbmV1dHJhbC5odG1sCisg ICAgICAgICAgICAgIGZhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL3VuaWNvZGUtYmlkaS1wbGFpbnRl eHQtYXJvdW5kLWlubGluZS1wbGFpbnRleHQtZXhwZWN0ZWQuaHRtbAorCisgICAgICAgICogcmVu ZGVyaW5nL0lubGluZUl0ZXJhdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRv cjo6SW5saW5lSXRlcmF0b3IpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVM YXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Zmlyc3RSZW5kZXJPYmplY3RGb3JEaXJlY3Rp b25hbGl0eURldGVybWluYXRpb24pOiBHZXQKKyAgICAgICAgdGhlIGZpcnN0IG5lc3RlZCBiaWRp IG5vdCBpc29sYXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmRldGVybWluZVBsYWludGV4dERpcmVj dGlvbmFsaXR5KTogSXNvbGF0ZWQKKyAgICAgICAgcmVuZGVyZXJzIG5lZWQgdG8gYmUgdHJlYXRl ZCBhcyBuZXV0cmFsIGNoYXJhY3RlcnMuCisgICAgICAgIChXZWJDb3JlOjpjb25zdHJ1Y3RCaWRp UnVuc0ZvclNlZ21lbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjpsYXlv dXRSdW5zQW5kRmxvYXRzSW5SYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zs b3c6OmRldGVybWluZVN0YXJ0UG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6ZGV0ZXJtaW5l RGlyZWN0aW9uYWxpdHkpOiBEZWxldGVkLgorCiAyMDE0LTExLTE5ICBBbmRyZWFzIEtsaW5nICA8 YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgImRvY3VtZW50IGhhcyBubyA6OmJl Zm9yZSBhbmQvb3IgOjphZnRlciBydWxlcyIgb3B0aW1pemF0aW9uLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvSW5saW5lSXRlcmF0b3IuaAppbmRleCA3YTc2YWI5ODcwNWY4ZmI3ZGEyZDBhMmM5 NjI4NDQ4ZDU5YzRhNTI2Li5kMjY3YjI0YWE0NDViYzgxODU5NjFhNDZmMjg0NGNiMmU0Yjc3NjM4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lSXRlcmF0b3IuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lSXRlcmF0b3IuaApAQCAtNTQsNiAr NTQsMTUgQEAgcHVibGljOgogICAgIHsKICAgICB9CiAKKyAgICBJbmxpbmVJdGVyYXRvcihjb25z dCBJbmxpbmVJdGVyYXRvciAmaXRlcikKKyAgICAgICAgOiBtX3Jvb3QoaXRlci5yb290KCkpCisg ICAgICAgICwgbV9yZW5kZXJlcihpdGVyLnJlbmRlcmVyKCkpCisgICAgICAgICwgbV9uZXh0QnJl YWthYmxlUG9zaXRpb24oLTEpCisgICAgICAgICwgbV9wb3MoaXRlci5vZmZzZXQoKSkKKyAgICAg ICAgLCBtX3JlZmVyc1RvRW5kT2ZQcmV2aW91c05vZGUoZmFsc2UpCisgICAgeworICAgIH0KKwog ICAgIHZvaWQgY2xlYXIoKSB7IG1vdmVUbygwLCAwKTsgfQogCiAgICAgdm9pZCBtb3ZlVG9TdGFy dE9mKFJlbmRlck9iamVjdCogb2JqZWN0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAppbmRleCAwM2FmYzE1YWE1NjY2MDUzYzg5ZDk1 Y2ZlODY2ZDg2NWNhNGI4YTMyLi41YTJhYjkyMmE3YmY2NGMxODIwYWVlMjEzM2RiOTE4M2JhZGE2 OTQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5l TGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5l TGF5b3V0LmNwcApAQCAtNTEsOSArNTEsNjIgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1z dGF0aWMgdm9pZCBkZXRlcm1pbmVEaXJlY3Rpb25hbGl0eShUZXh0RGlyZWN0aW9uJiBkaXIsIElu bGluZUl0ZXJhdG9yIGl0ZXIpCitzdGF0aWMgUmVuZGVyT2JqZWN0KiBmaXJzdFJlbmRlck9iamVj dEZvckRpcmVjdGlvbmFsaXR5RGV0ZXJtaW5hdGlvbihSZW5kZXJFbGVtZW50KiByb290LCBSZW5k ZXJPYmplY3QqIGN1cnJlbnQgPSAwKQogeworICAgIFJlbmRlck9iamVjdCogbmV4dCA9IGN1cnJl bnQ7CisgICAgd2hpbGUgKGN1cnJlbnQpIHsKKyAgICAgICAgaWYgKGlzSXNvbGF0ZWQoY3VycmVu dC0+c3R5bGUoKS51bmljb2RlQmlkaSgpKQorICAgICAgICAgICAgJiYgKGN1cnJlbnQtPmlzUmVu ZGVySW5saW5lKCkgfHwgY3VycmVudC0+aXNSZW5kZXJCbG9jaygpKSkgeworICAgICAgICAgICAg aWYgKGN1cnJlbnQgIT0gcm9vdCkKKyAgICAgICAgICAgICAgICBjdXJyZW50ID0gbnVsbHB0cjsK KyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBjdXJyZW50ID0gbmV4dDsKKyAgICAg ICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAgIGN1cnJlbnQgPSBjdXJyZW50LT5wYXJl bnQoKTsKKyAgICB9CisKKyAgICBpZiAoIWN1cnJlbnQpCisgICAgICAgIGN1cnJlbnQgPSByb290 LT5maXJzdENoaWxkKCk7CisKKyAgICB3aGlsZSAoY3VycmVudCkgeworICAgICAgICBuZXh0ID0g bnVsbHB0cjsKKyAgICAgICAgaWYgKGlzSXRlcmF0b3JUYXJnZXQoY3VycmVudCkgJiYgIShpczxS ZW5kZXJUZXh0PihjdXJyZW50KSAmJiBkb3duY2FzdDxSZW5kZXJUZXh0PihjdXJyZW50KS0+aXNB bGxDb2xsYXBzaWJsZVdoaXRlc3BhY2UoKSkpCisgICAgICAgICAgICBicmVhazsKKworICAgICAg ICBpZiAoIWlzSXRlcmF0b3JUYXJnZXQoY3VycmVudCkgJiYgIWlzSXNvbGF0ZWQoY3VycmVudC0+ c3R5bGUoKS51bmljb2RlQmlkaSgpKSkKKyAgICAgICAgICAgIG5leHQgPSBkb3duY2FzdDxSZW5k ZXJFbGVtZW50PigqY3VycmVudCkuZmlyc3RDaGlsZCgpOworCisgICAgICAgIGlmICghbmV4dCkg eworICAgICAgICAgICAgd2hpbGUgKGN1cnJlbnQgJiYgY3VycmVudCAhPSByb290KSB7CisgICAg ICAgICAgICAgICAgbmV4dCA9IGN1cnJlbnQtPm5leHRTaWJsaW5nKCk7CisgICAgICAgICAgICAg ICAgaWYgKG5leHQpCisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAg IGN1cnJlbnQgPSBjdXJyZW50LT5wYXJlbnQoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQor CisgICAgICAgIGlmICghbmV4dCkKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgIGN1cnJl bnQgPSBuZXh0OworICAgIH0KKworICAgIHJldHVybiBjdXJyZW50OworfQorCitzdGF0aWMgdm9p ZCBkZXRlcm1pbmVQbGFpbnRleHREaXJlY3Rpb25hbGl0eShUZXh0RGlyZWN0aW9uJiBkaXIsIElu bGluZUl0ZXJhdG9yIGl0ZXJhdG9yKQoreworICAgIFJlbmRlckVsZW1lbnQqIHJvb3RFbGVtZW50 ID0gaXRlcmF0b3Iucm9vdCgpOworICAgIElubGluZUl0ZXJhdG9yIGl0ZXIocm9vdEVsZW1lbnQs IGZpcnN0UmVuZGVyT2JqZWN0Rm9yRGlyZWN0aW9uYWxpdHlEZXRlcm1pbmF0aW9uKHJvb3RFbGVt ZW50LCBpdGVyYXRvci5yZW5kZXJlcigpKSwgaXRlcmF0b3Iub2Zmc2V0KCkpOworICAgIElubGlu ZUJpZGlSZXNvbHZlciBvYnNlcnZlcjsKKyAgICBvYnNlcnZlci5zZXRQb3NpdGlvbklnbm9yaW5n TmVzdGVkSXNvbGF0ZXMoaXRlcik7CisgICAgb2JzZXJ2ZXIuc2V0U3RhdHVzKEJpZGlTdGF0dXMo cm9vdEVsZW1lbnQtPnN0eWxlKCkuZGlyZWN0aW9uKCksIGlzT3ZlcnJpZGUocm9vdEVsZW1lbnQt PnN0eWxlKCkudW5pY29kZUJpZGkoKSkpKTsKICAgICB3aGlsZSAoIWl0ZXIuYXRFbmQoKSkgewor ICAgICAgICBpZiAob2JzZXJ2ZXIuaW5Jc29sYXRlKCkpIHsKKyAgICAgICAgICAgIGl0ZXIuaW5j cmVtZW50KCZvYnNlcnZlcik7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQogICAg ICAgICBpZiAoaXRlci5hdFBhcmFncmFwaFNlcGFyYXRvcigpKQogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICBpZiAoVUNoYXIgY3VycmVudCA9IGl0ZXIuY3VycmVudCgpKSB7CkBAIC02Nyw3 ICsxMjAsNyBAQCBzdGF0aWMgdm9pZCBkZXRlcm1pbmVEaXJlY3Rpb25hbGl0eShUZXh0RGlyZWN0 aW9uJiBkaXIsIElubGluZUl0ZXJhdG9yIGl0ZXIpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgICAgIGl0ZXIuaW5jcmVtZW50KCk7CisgICAg ICAgIGl0ZXIuaW5jcmVtZW50KCZvYnNlcnZlcik7CiAgICAgfQogfQogCkBAIC05MzAsMTMgKzk4 MywxMCBAQCBzdGF0aWMgaW5saW5lIHZvaWQgY29uc3RydWN0QmlkaVJ1bnNGb3JTZWdtZW50KElu bGluZUJpZGlSZXNvbHZlciYgdG9wUmVzb2x2ZXIsCiAKICAgICAgICAgSW5saW5lQmlkaVJlc29s dmVyIGlzb2xhdGVkUmVzb2x2ZXI7CiAgICAgICAgIEVVbmljb2RlQmlkaSB1bmljb2RlQmlkaSA9 IGlzb2xhdGVkSW5saW5lLT5zdHlsZSgpLnVuaWNvZGVCaWRpKCk7Ci0gICAgICAgIFRleHREaXJl Y3Rpb24gZGlyZWN0aW9uOworICAgICAgICBUZXh0RGlyZWN0aW9uIGRpcmVjdGlvbiA9IGlzb2xh dGVkSW5saW5lLT5zdHlsZSgpLmRpcmVjdGlvbigpOwogICAgICAgICBpZiAodW5pY29kZUJpZGkg PT0gUGxhaW50ZXh0KQotICAgICAgICAgICAgZGV0ZXJtaW5lRGlyZWN0aW9uYWxpdHkoZGlyZWN0 aW9uLCBJbmxpbmVJdGVyYXRvcihpc29sYXRlZElubGluZSwgJmlzb2xhdGVkUnVuLT5yZW5kZXJl cigpLCAwKSk7Ci0gICAgICAgIGVsc2UgewotICAgICAgICAgICAgQVNTRVJUKHVuaWNvZGVCaWRp ID09IElzb2xhdGUgfHwgdW5pY29kZUJpZGkgPT0gSXNvbGF0ZU92ZXJyaWRlKTsKLSAgICAgICAg ICAgIGRpcmVjdGlvbiA9IGlzb2xhdGVkSW5saW5lLT5zdHlsZSgpLmRpcmVjdGlvbigpOwotICAg ICAgICB9CisgICAgICAgICAgICBkZXRlcm1pbmVQbGFpbnRleHREaXJlY3Rpb25hbGl0eShkaXJl Y3Rpb24sIElubGluZUl0ZXJhdG9yKGlzb2xhdGVkSW5saW5lLCAmaXNvbGF0ZWRSdW4tPnJlbmRl cmVyKCksIDApKTsKKwogICAgICAgICBpc29sYXRlZFJlc29sdmVyLnNldFN0YXR1cyhCaWRpU3Rh dHVzKGRpcmVjdGlvbiwgaXNPdmVycmlkZSh1bmljb2RlQmlkaSkpKTsKIAogICAgICAgICBzZXRV cFJlc29sdmVyVG9SZXN1bWVJbklzb2xhdGUoaXNvbGF0ZWRSZXNvbHZlciwgaXNvbGF0ZWRJbmxp bmUsICZzdGFydE9iamVjdCk7CkBAIC0xMTYxLDcgKzEyMTEsNyBAQCB2b2lkIFJlbmRlckJsb2Nr Rmxvdzo6bGF5b3V0UnVuc0FuZEZsb2F0c0luUmFuZ2UoTGluZUxheW91dFN0YXRlJiBsYXlvdXRT dGF0ZSwgSQogCiAgICAgICAgICAgICBpZiAoaXNOZXdVQkFQYXJhZ3JhcGggJiYgc3R5bGVUb1Vz ZS51bmljb2RlQmlkaSgpID09IFBsYWludGV4dCAmJiAhcmVzb2x2ZXIuY29udGV4dCgpLT5wYXJl bnQoKSkgewogICAgICAgICAgICAgICAgIFRleHREaXJlY3Rpb24gZGlyZWN0aW9uID0gc3R5bGVU b1VzZS5kaXJlY3Rpb24oKTsKLSAgICAgICAgICAgICAgICBkZXRlcm1pbmVEaXJlY3Rpb25hbGl0 eShkaXJlY3Rpb24sIHJlc29sdmVyLnBvc2l0aW9uKCkpOworICAgICAgICAgICAgICAgIGRldGVy bWluZVBsYWludGV4dERpcmVjdGlvbmFsaXR5KGRpcmVjdGlvbiwgcmVzb2x2ZXIucG9zaXRpb24o KSk7CiAgICAgICAgICAgICAgICAgcmVzb2x2ZXIuc2V0U3RhdHVzKEJpZGlTdGF0dXMoZGlyZWN0 aW9uLCBpc092ZXJyaWRlKHN0eWxlVG9Vc2UudW5pY29kZUJpZGkoKSkpKTsKICAgICAgICAgICAg IH0KICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIG93bmVyc2hpcCBpcyByZXZlcnNlZC4gV2Ug c2hvdWxkIG93biB0aGUgQmlkaVJ1bkxpc3QgYW5kIHBhc3MgaXQgdG8gY3JlYXRlQmlkaVJ1bnNG b3JMaW5lLgpAQCAtMTY3MSw3ICsxNzIxLDcgQEAgUm9vdElubGluZUJveCogUmVuZGVyQmxvY2tG bG93OjpkZXRlcm1pbmVTdGFydFBvc2l0aW9uKExpbmVMYXlvdXRTdGF0ZSYgbGF5b3V0U3QKICAg ICB9IGVsc2UgewogICAgICAgICBUZXh0RGlyZWN0aW9uIGRpcmVjdGlvbiA9IHN0eWxlKCkuZGly ZWN0aW9uKCk7CiAgICAgICAgIGlmIChzdHlsZSgpLnVuaWNvZGVCaWRpKCkgPT0gUGxhaW50ZXh0 KQotICAgICAgICAgICAgZGV0ZXJtaW5lRGlyZWN0aW9uYWxpdHkoZGlyZWN0aW9uLCBJbmxpbmVJ dGVyYXRvcih0aGlzLCBiaWRpRmlyc3RTa2lwcGluZ0VtcHR5SW5saW5lcygqdGhpcyksIDApKTsK KyAgICAgICAgICAgIGRldGVybWluZVBsYWludGV4dERpcmVjdGlvbmFsaXR5KGRpcmVjdGlvbiwg SW5saW5lSXRlcmF0b3IoKnRoaXMsIG51bGxwdHIsIDApKTsKICAgICAgICAgcmVzb2x2ZXIuc2V0 U3RhdHVzKEJpZGlTdGF0dXMoZGlyZWN0aW9uLCBpc092ZXJyaWRlKHN0eWxlKCkudW5pY29kZUJp ZGkoKSkpKTsKICAgICAgICAgSW5saW5lSXRlcmF0b3IgaXRlciA9IElubGluZUl0ZXJhdG9yKHRo aXMsIGJpZGlGaXJzdFNraXBwaW5nRW1wdHlJbmxpbmVzKCp0aGlzLCAmcmVzb2x2ZXIpLCAwKTsK ICAgICAgICAgcmVzb2x2ZXIuc2V0UG9zaXRpb24oaXRlciwgbnVtYmVyT2ZJc29sYXRlQW5jZXN0 b3JzKGl0ZXIpKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwppbmRleCAwMGIwYjNhMmU1ODMzZmRmMDQwMDJjYjVlNzJmYjk2YmIzOWYw OWMzLi5iZTliMGUwMGJmYTU4NDA5OTEzNWI3ZWI3M2JhNDgwZDY4YWUwOTBhIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjEgQEAKKzIwMTQtMTEtMjEgIElnb3IgT2xpdmVpcmEgIDxpZ29yQHdvcmsuY28+CisK KyAgICAgICAgdW5pY29kZS1iaWRpOnBsYWludGV4dCB0cmVhdHMgZW1iZWRkZWQgZWxlbWVudCB3 aXRoIHVuaWNvZGUtYmlkaTpwbGFpbnRleHQgb3IgaXNvbGF0ZSBpbmNvcnJlY3RseQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ1NDMKKworICAgICAg ICBXZWJLaXQgZG9lcyBub3QgdHJlYXQgdGhlIGlzb2xhdGVkIHNlcXVlbmNlIGFzIGlmIGl0IHdl cmUgYSBVK1VGRkZDKGFzIGRlc2NyaWJlZCBpbiB0aGUgc3BlY2lmaWNhdGlvbikuCisgICAgICAg IFRoaXMgcGF0Y2ggYWRkcyBhIG5ldyBtZXRob2QgY2FsbGVkIGZpcnN0UmVuZGVyT2JqZWN0Rm9y RGlyZWN0aW9uYWxpdHlEZXRlcm1pbmF0aW9uIHRoYXQgaXMgdXNlZCB0byBnZXQgdGhlCisgICAg ICAgIGZpcnN0IG5lc3RlZCBiaWRpIG5vdCBpc29sYXRlZC4KKworICAgICAgICBOZWVkIHRoZSBi dWcgVVJMIChPT1BTISkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBmYXN0L3RleHQvaW50ZXJuYXRpb25hbC91bmljb2RlLWJpZGktcGxhaW50ZXh0 LW5lc3RlZC1pc29sYXRlLW5ldXRyYWwtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICog ZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvdW5pY29kZS1iaWRpLXBsYWludGV4dC1uZXN0ZWQtaXNv bGF0ZS1uZXV0cmFsLmh0bWw6IEFkZGVkLgorICAgICAgICAqIExheW91dFRlc3RzL2Zhc3QvdGV4 dC9pbnRlcm5hdGlvbmFsL3VuaWNvZGUtYmlkaS1wbGFpbnRleHQtYXJvdW5kLWlubGluZS1wbGFp bnRleHQtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogTGF5b3V0VGVzdHMvZmFzdC90 ZXh0L2ludGVybmF0aW9uYWwvdW5pY29kZS1iaWRpLXBsYWludGV4dC1hcm91bmQtaW5saW5lLXBs YWludGV4dC5odG1sOiBBZGRlZC4KKwogMjAxNC0xMS0xOSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxt bWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtPUyBYXSBVcHJpZ2h0IHZlcnRpY2FsIHRl eHQgaXMgY29tcGxldGVseSBicm9rZW4gZm9yIG11bHRpLWNvZGUtdW5pdCBjb2RlcG9pbnRzCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC91bmljb2RlLWJp ZGktcGxhaW50ZXh0LWFyb3VuZC1pbmxpbmUtcGxhaW50ZXh0LWV4cGVjdGVkLmh0bWwgYi9MYXlv dXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC91bmljb2RlLWJpZGktcGxhaW50ZXh0LWFy b3VuZC1pbmxpbmUtcGxhaW50ZXh0LWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDJlYjZhZjky MzE2YjRiN2M0YzMzMjg1Y2ZlYmExZGM5MzBjZjVmNgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL3VuaWNvZGUtYmlkaS1wbGFpbnRleHQtYXJv dW5kLWlubGluZS1wbGFpbnRleHQtZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDI3IEBACis8IURP Q1RZUEUgaHRtbD4KKzxodG1sPgorICA8aGVhZD4KKyAgICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCIv PgorICAgIDxzdHlsZT4KKyAgICAgIGJvZHkgeworICAgICAgICBmb250LXNpemU6MmVtOworICAg ICAgICB0ZXh0LWFsaWduOmxlZnQ7CisgICAgICB9CisgICAgICAucmVmIHsKKyAgICAgICAgYm9y ZGVyOiBtZWRpdW0gc29saWQgZ3JheTsKKyAgICAgICAgcGFkZGluZzogMTBweDsKKyAgICAgICAg d2lkdGg6IDQwMHB4OworICAgICAgICBtYXJnaW46IDIwcHg7CisgICAgICB9CisgICAgICAucGxh aW50ZXh0IHsKKyAgICAgICAgdW5pY29kZS1iaWRpOiAtd2Via2l0LXBsYWludGV4dDsKKyAgICAg IH0KKyAgICA8L3N0eWxlPgorICA8L2hlYWQ+CisgIDxib2R5PgorICAgIDxkaXYgY2xhc3M9InJl ZiI+CisgICAgICAmI3gwNUQwOy0+JnJsbTsgPT0gPT0gPT0+JmxybTsKKyAgICAgIDxkaXYgZGly PSJydGwiPiYjeDA1RDE7LT4gPT0gPT0gPT0+PC9kaXY+CisgICAgPC9kaXY+CisgIDwvYm9keT4K KzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9pbnRlcm5hdGlvbmFs L3VuaWNvZGUtYmlkaS1wbGFpbnRleHQtYXJvdW5kLWlubGluZS1wbGFpbnRleHQuaHRtbCBiL0xh eW91dFRlc3RzL2Zhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL3VuaWNvZGUtYmlkaS1wbGFpbnRleHQt YXJvdW5kLWlubGluZS1wbGFpbnRleHQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zNjg1NTBmNDcyNWI1Zjc5 YzI1MmFlM2FlOWNjZmQ2YjIyZTY2MGI1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvdW5pY29kZS1iaWRpLXBsYWludGV4dC1hcm91bmQtaW5s aW5lLXBsYWludGV4dC5odG1sCkBAIC0wLDAgKzEsMjcgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0 bWw+CisgIDxoZWFkPgorICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ii8+CisgICAgPHN0eWxlPgor ICAgICAgYm9keSB7CisgICAgICAgIGZvbnQtc2l6ZToyZW07CisgICAgICAgIHRleHQtYWxpZ246 bGVmdDsKKyAgICAgIH0KKyAgICAgIC50ZXN0IHsKKyAgICAgICAgYm9yZGVyOiBtZWRpdW0gc29s aWQgZ3JheTsKKyAgICAgICAgcGFkZGluZzogMTBweDsKKyAgICAgICAgd2lkdGg6IDQwMHB4Owor ICAgICAgICBtYXJnaW46IDIwcHg7CisgICAgICB9CisgICAgICAucGxhaW50ZXh0IHsKKyAgICAg ICAgdW5pY29kZS1iaWRpOiAtd2Via2l0LXBsYWludGV4dDsKKyAgICAgIH0KKyAgICA8L3N0eWxl PgorICA8L2hlYWQ+CisgIDxib2R5PgorICAgIDxkaXYgY2xhc3M9InRlc3QiPgorICAgICAgPGRp diBjbGFzcz0icGxhaW50ZXh0Ij48c3BhbiBjbGFzcz0icGxhaW50ZXh0Ij4mI3gwNUQwOy0+PC9z cGFuPiA9PSA9PSA9PT48L2Rpdj4KKyAgICAgIDxkaXYgY2xhc3M9InBsYWludGV4dCI+PHNwYW4+ JiN4MDVEMTstPjwvc3Bhbj4gPT0gPT0gPT0+PC9kaXY+CisgICAgPC9kaXY+CisgIDwvYm9keT4K KzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9pbnRlcm5hdGlvbmFs L3VuaWNvZGUtYmlkaS1wbGFpbnRleHQtbmVzdGVkLWlzb2xhdGUtbmV1dHJhbC1leHBlY3RlZC5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvdW5pY29kZS1iaWRpLXBs YWludGV4dC1uZXN0ZWQtaXNvbGF0ZS1uZXV0cmFsLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u NGFhM2U1NzEzYTAwNmQzNjE1OTJhM2U5ZmUxZmQzNjEzYjg3ZjMwYwotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL3VuaWNvZGUtYmlkaS1wbGFp bnRleHQtbmVzdGVkLWlzb2xhdGUtbmV1dHJhbC1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMjYg QEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+CisgIDxoZWFkPgorICAgIDxtZXRhIGNoYXJzZXQ9 InV0Zi04Ii8+CisgICAgPHN0eWxlPgorICAgICAgYm9keSB7CisgICAgICAgIGZvbnQtc2l6ZToy ZW07CisgICAgICAgIHRleHQtYWxpZ246bGVmdDsKKyAgICAgIH0KKyAgICAgIC5yZWYgeworICAg ICAgICBib3JkZXI6IG1lZGl1bSBzb2xpZCBncmF5OworICAgICAgICBwYWRkaW5nOiAxMHB4Owor ICAgICAgICBtYXJnaW46IDIwcHg7CisgICAgICB9CisgICAgPC9zdHlsZT4KKyAgPC9oZWFkPgor ICA8Ym9keT4KKyAgICA8ZGl2IGNsYXNzPSJyZWYiPgorICAgICAgPHNwYW4gZGlyPSJsdHIiPiYj eDA1RDA7LT48L3NwYW4+CisgICAgICAgPT0gPT0gPT0+CisgICAgICA8c3BhbiBkaXI9Imx0ciI+ JiN4MDVEMDsgPT0gPT09PC9zcGFuPgorICAgICAgPHNwYW4+VGV4dDwvc3Bhbj4KKyAgICAgIDxz cGFuPiYjeDA1RDA7PC9zcGFuPgorICAgIDwvZGl2PgorICA8L2JvZHk+Cis8L2h0bWw+CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC91bmljb2RlLWJpZGkt cGxhaW50ZXh0LW5lc3RlZC1pc29sYXRlLW5ldXRyYWwuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qv dGV4dC9pbnRlcm5hdGlvbmFsL3VuaWNvZGUtYmlkaS1wbGFpbnRleHQtbmVzdGVkLWlzb2xhdGUt bmV1dHJhbC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmY0Nzk2MDc3OTNmNGVkNTU3Y2VjNzgxNjVmYjQ1YTll NWM3MWQ3ODIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvaW50ZXJu YXRpb25hbC91bmljb2RlLWJpZGktcGxhaW50ZXh0LW5lc3RlZC1pc29sYXRlLW5ldXRyYWwuaHRt bApAQCAtMCwwICsxLDMzIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICA8aGVhZD4KKyAg ICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCIvPgorICAgIDxzdHlsZT4KKyAgICAgIGJvZHkgeworICAg ICAgICBmb250LXNpemU6MmVtOworICAgICAgICB0ZXh0LWFsaWduOmxlZnQ7CisgICAgICB9Cisg ICAgICAudGVzdCB7CisgICAgICAgIGJvcmRlcjogbWVkaXVtIHNvbGlkIGdyYXk7CisgICAgICAg IHBhZGRpbmc6IDEwcHg7CisgICAgICAgIG1hcmdpbjogMjBweDsKKyAgICAgIH0KKyAgICAgIC5w bGFpbnRleHQgeworICAgICAgICB1bmljb2RlLWJpZGk6IC13ZWJraXQtcGxhaW50ZXh0OworICAg ICAgfQorICAgICAgLmlzb2xhdGUgeworICAgICAgICB1bmljb2RlLWJpZGk6IC13ZWJraXQtaXNv bGF0ZTsKKyAgICAgIH0KKyAgICA8L3N0eWxlPgorICA8L2hlYWQ+CisgIDxib2R5PgorICAgIDxk aXYgY2xhc3M9InRlc3QiPgorICAgICAgPGRpdiBjbGFzcz0icGxhaW50ZXh0Ij4KKyAgICAgIDxz cGFuIGNsYXNzPSJpc29sYXRlIj4mI3gwNUQwOy0+PC9zcGFuPgorICAgICAgPT0gPT0gPT0+Cisg ICAgICA8c3BhbiBjbGFzcz0iaXNvbGF0ZSI+JiN4MDVEMDsgPT0gPT09PC9zcGFuPgorICAgICAg PHNwYW4+VGV4dDwvc3Bhbj4KKyAgICAgIDxzcGFuPiYjeDA1RDA7PC9zcGFuPgorICAgIDwvZGl2 PgorICA8L2JvZHk+Cis8L2h0bWw+Cg== 242060 2014-11-21 11:52:34 -0800 2014-11-21 13:32:15 -0800 Patch bug-84543-20141121145359.patch text/plain 12846 igor.oliveira U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2Mzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjJiZGFlMzEzZTU0NDNk NTFlYmZkNDBmN2JlZmE2N2ZjN2MwNTQxNi4uNTMwMGEwODIyYWNlYjU1ZTM2NWZjMTZjYWM2Nzcy ZTQ0OWMzY2Q1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE0LTExLTIxICBJZ29y IE9saXZlaXJhICA8aWdvckB3b3JrLmNvPgorCisgICAgICAgIHVuaWNvZGUtYmlkaTpwbGFpbnRl eHQgdHJlYXRzIGVtYmVkZGVkIGVsZW1lbnQgd2l0aCB1bmljb2RlLWJpZGk6cGxhaW50ZXh0IG9y IGlzb2xhdGUgaW5jb3JyZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg0NTQzCisKKyAgICAgICAgSW4gdGhlIENTUyBXcml0aW5nIE1vZGVzIHNw ZWNpZmljYXRpb246CisgICAgICAgIEZvciB0aGUgcHVycG9zZSBvZiBiaWRpIHJlc29sdXRpb24g aW4gaXRzIGNvbnRhaW5pbmcgYmlkaSBwYXJhZ3JhcGgsCisgICAgICAgIHRoZSBzZXF1ZW5jZSBp cyB0cmVhdGVkIGFzIGlmIGl0IHdlcmUgYSBzaW5nbGUgT2JqZWN0IFJlcGxhY2VtZW50IENoYXJh Y3RlciAoVStGRkZDKS4KKworICAgICAgICBXZWJLaXQgZG9lcyBub3QgdHJlYXQgdGhlIGlzb2xh dGVkIHNlcXVlbmNlIGFzIGlmIGl0IHdlcmUgYSBVK1VGRkZDLgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZhc3QvdGV4dC9pbnRlcm5hdGlv bmFsL3VuaWNvZGUtYmlkaS1wbGFpbnRleHQtbmVzdGVkLWlzb2xhdGUtbmV1dHJhbC5odG1sCisg ICAgICAgICAgICAgIGZhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL3VuaWNvZGUtYmlkaS1wbGFpbnRl eHQtYXJvdW5kLWlubGluZS1wbGFpbnRleHQtZXhwZWN0ZWQuaHRtbAorCisgICAgICAgICogcmVu ZGVyaW5nL0lubGluZUl0ZXJhdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRv cjo6SW5saW5lSXRlcmF0b3IpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVM YXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Zmlyc3RSZW5kZXJPYmplY3RGb3JEaXJlY3Rp b25hbGl0eURldGVybWluYXRpb24pOiBHZXQKKyAgICAgICAgdGhlIGZpcnN0IG5lc3RlZCBiaWRp IG5vdCBpc29sYXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmRldGVybWluZVBsYWludGV4dERpcmVj dGlvbmFsaXR5KTogSXNvbGF0ZWQKKyAgICAgICAgcmVuZGVyZXJzIG5lZWQgdG8gYmUgdHJlYXRl ZCBhcyBuZXV0cmFsIGNoYXJhY3RlcnMuCisgICAgICAgIChXZWJDb3JlOjpjb25zdHJ1Y3RCaWRp UnVuc0ZvclNlZ21lbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjpsYXlv dXRSdW5zQW5kRmxvYXRzSW5SYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zs b3c6OmRldGVybWluZVN0YXJ0UG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6ZGV0ZXJtaW5l RGlyZWN0aW9uYWxpdHkpOiBEZWxldGVkLgorCiAyMDE0LTExLTE5ICBBbmRyZWFzIEtsaW5nICA8 YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgImRvY3VtZW50IGhhcyBubyA6OmJl Zm9yZSBhbmQvb3IgOjphZnRlciBydWxlcyIgb3B0aW1pemF0aW9uLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvSW5saW5lSXRlcmF0b3IuaAppbmRleCA3YTc2YWI5ODcwNWY4ZmI3ZGEyZDBhMmM5 NjI4NDQ4ZDU5YzRhNTI2Li5kMjY3YjI0YWE0NDViYzgxODU5NjFhNDZmMjg0NGNiMmU0Yjc3NjM4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lSXRlcmF0b3IuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lSXRlcmF0b3IuaApAQCAtNTQsNiAr NTQsMTUgQEAgcHVibGljOgogICAgIHsKICAgICB9CiAKKyAgICBJbmxpbmVJdGVyYXRvcihjb25z dCBJbmxpbmVJdGVyYXRvciAmaXRlcikKKyAgICAgICAgOiBtX3Jvb3QoaXRlci5yb290KCkpCisg ICAgICAgICwgbV9yZW5kZXJlcihpdGVyLnJlbmRlcmVyKCkpCisgICAgICAgICwgbV9uZXh0QnJl YWthYmxlUG9zaXRpb24oLTEpCisgICAgICAgICwgbV9wb3MoaXRlci5vZmZzZXQoKSkKKyAgICAg ICAgLCBtX3JlZmVyc1RvRW5kT2ZQcmV2aW91c05vZGUoZmFsc2UpCisgICAgeworICAgIH0KKwog ICAgIHZvaWQgY2xlYXIoKSB7IG1vdmVUbygwLCAwKTsgfQogCiAgICAgdm9pZCBtb3ZlVG9TdGFy dE9mKFJlbmRlck9iamVjdCogb2JqZWN0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAppbmRleCAwM2FmYzE1YWE1NjY2MDUzYzg5ZDk1 Y2ZlODY2ZDg2NWNhNGI4YTMyLi4zMTE2Y2I2YjRhNzkyYTdmZDVkZjk2NDJmYWM2Mjk4MzllZjM0 MDc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5l TGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5l TGF5b3V0LmNwcApAQCAtNTEsOSArNTEsNjIgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1z dGF0aWMgdm9pZCBkZXRlcm1pbmVEaXJlY3Rpb25hbGl0eShUZXh0RGlyZWN0aW9uJiBkaXIsIElu bGluZUl0ZXJhdG9yIGl0ZXIpCitzdGF0aWMgUmVuZGVyT2JqZWN0KiBmaXJzdFJlbmRlck9iamVj dEZvckRpcmVjdGlvbmFsaXR5RGV0ZXJtaW5hdGlvbihSZW5kZXJFbGVtZW50KiByb290LCBSZW5k ZXJPYmplY3QqIGN1cnJlbnQgPSAwKQogeworICAgIFJlbmRlck9iamVjdCogbmV4dCA9IGN1cnJl bnQ7CisgICAgd2hpbGUgKGN1cnJlbnQpIHsKKyAgICAgICAgaWYgKGlzSXNvbGF0ZWQoY3VycmVu dC0+c3R5bGUoKS51bmljb2RlQmlkaSgpKQorICAgICAgICAgICAgJiYgKGN1cnJlbnQtPmlzUmVu ZGVySW5saW5lKCkgfHwgY3VycmVudC0+aXNSZW5kZXJCbG9jaygpKSkgeworICAgICAgICAgICAg aWYgKGN1cnJlbnQgIT0gcm9vdCkKKyAgICAgICAgICAgICAgICBjdXJyZW50ID0gbnVsbHB0cjsK KyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBjdXJyZW50ID0gbmV4dDsKKyAgICAg ICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAgIGN1cnJlbnQgPSBjdXJyZW50LT5wYXJl bnQoKTsKKyAgICB9CisKKyAgICBpZiAoIWN1cnJlbnQpCisgICAgICAgIGN1cnJlbnQgPSByb290 LT5maXJzdENoaWxkKCk7CisKKyAgICB3aGlsZSAoY3VycmVudCkgeworICAgICAgICBuZXh0ID0g bnVsbHB0cjsKKyAgICAgICAgaWYgKGlzSXRlcmF0b3JUYXJnZXQoY3VycmVudCkgJiYgIShpczxS ZW5kZXJUZXh0PihjdXJyZW50KSAmJiBkb3duY2FzdDxSZW5kZXJUZXh0PihjdXJyZW50KS0+aXNB bGxDb2xsYXBzaWJsZVdoaXRlc3BhY2UoKSkpCisgICAgICAgICAgICBicmVhazsKKworICAgICAg ICBpZiAoIWlzSXRlcmF0b3JUYXJnZXQoY3VycmVudCkgJiYgIWlzSXNvbGF0ZWQoY3VycmVudC0+ c3R5bGUoKS51bmljb2RlQmlkaSgpKSkKKyAgICAgICAgICAgIG5leHQgPSBkb3duY2FzdDxSZW5k ZXJFbGVtZW50PigqY3VycmVudCkuZmlyc3RDaGlsZCgpOworCisgICAgICAgIGlmICghbmV4dCkg eworICAgICAgICAgICAgd2hpbGUgKGN1cnJlbnQgJiYgY3VycmVudCAhPSByb290KSB7CisgICAg ICAgICAgICAgICAgbmV4dCA9IGN1cnJlbnQtPm5leHRTaWJsaW5nKCk7CisgICAgICAgICAgICAg ICAgaWYgKG5leHQpCisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAg IGN1cnJlbnQgPSBjdXJyZW50LT5wYXJlbnQoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQor CisgICAgICAgIGlmICghbmV4dCkKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgIGN1cnJl bnQgPSBuZXh0OworICAgIH0KKworICAgIHJldHVybiBjdXJyZW50OworfQorCitzdGF0aWMgdm9p ZCBkZXRlcm1pbmVQbGFpbnRleHREaXJlY3Rpb25hbGl0eShUZXh0RGlyZWN0aW9uJiBkaXIsIElu bGluZUl0ZXJhdG9yIGl0ZXJhdG9yKQoreworICAgIFJlbmRlckVsZW1lbnQqIHJvb3RFbGVtZW50 ID0gaXRlcmF0b3Iucm9vdCgpOworICAgIElubGluZUl0ZXJhdG9yIGl0ZXIocm9vdEVsZW1lbnQs IGZpcnN0UmVuZGVyT2JqZWN0Rm9yRGlyZWN0aW9uYWxpdHlEZXRlcm1pbmF0aW9uKHJvb3RFbGVt ZW50LCBpdGVyYXRvci5yZW5kZXJlcigpKSwgaXRlcmF0b3Iub2Zmc2V0KCkpOworICAgIElubGlu ZUJpZGlSZXNvbHZlciBvYnNlcnZlcjsKKyAgICBvYnNlcnZlci5zZXRQb3NpdGlvbklnbm9yaW5n TmVzdGVkSXNvbGF0ZXMoaXRlcik7CisgICAgb2JzZXJ2ZXIuc2V0U3RhdHVzKEJpZGlTdGF0dXMo cm9vdEVsZW1lbnQtPnN0eWxlKCkuZGlyZWN0aW9uKCksIGlzT3ZlcnJpZGUocm9vdEVsZW1lbnQt PnN0eWxlKCkudW5pY29kZUJpZGkoKSkpKTsKICAgICB3aGlsZSAoIWl0ZXIuYXRFbmQoKSkgewor ICAgICAgICBpZiAob2JzZXJ2ZXIuaW5Jc29sYXRlKCkpIHsKKyAgICAgICAgICAgIGl0ZXIuaW5j cmVtZW50KCZvYnNlcnZlcik7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQogICAg ICAgICBpZiAoaXRlci5hdFBhcmFncmFwaFNlcGFyYXRvcigpKQogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICBpZiAoVUNoYXIgY3VycmVudCA9IGl0ZXIuY3VycmVudCgpKSB7CkBAIC02Nyw3 ICsxMjAsNyBAQCBzdGF0aWMgdm9pZCBkZXRlcm1pbmVEaXJlY3Rpb25hbGl0eShUZXh0RGlyZWN0 aW9uJiBkaXIsIElubGluZUl0ZXJhdG9yIGl0ZXIpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgICAgIGl0ZXIuaW5jcmVtZW50KCk7CisgICAg ICAgIGl0ZXIuaW5jcmVtZW50KCZvYnNlcnZlcik7CiAgICAgfQogfQogCkBAIC05MzAsMTMgKzk4 MywxMCBAQCBzdGF0aWMgaW5saW5lIHZvaWQgY29uc3RydWN0QmlkaVJ1bnNGb3JTZWdtZW50KElu bGluZUJpZGlSZXNvbHZlciYgdG9wUmVzb2x2ZXIsCiAKICAgICAgICAgSW5saW5lQmlkaVJlc29s dmVyIGlzb2xhdGVkUmVzb2x2ZXI7CiAgICAgICAgIEVVbmljb2RlQmlkaSB1bmljb2RlQmlkaSA9 IGlzb2xhdGVkSW5saW5lLT5zdHlsZSgpLnVuaWNvZGVCaWRpKCk7Ci0gICAgICAgIFRleHREaXJl Y3Rpb24gZGlyZWN0aW9uOworICAgICAgICBUZXh0RGlyZWN0aW9uIGRpcmVjdGlvbiA9IGlzb2xh dGVkSW5saW5lLT5zdHlsZSgpLmRpcmVjdGlvbigpOwogICAgICAgICBpZiAodW5pY29kZUJpZGkg PT0gUGxhaW50ZXh0KQotICAgICAgICAgICAgZGV0ZXJtaW5lRGlyZWN0aW9uYWxpdHkoZGlyZWN0 aW9uLCBJbmxpbmVJdGVyYXRvcihpc29sYXRlZElubGluZSwgJmlzb2xhdGVkUnVuLT5yZW5kZXJl cigpLCAwKSk7Ci0gICAgICAgIGVsc2UgewotICAgICAgICAgICAgQVNTRVJUKHVuaWNvZGVCaWRp ID09IElzb2xhdGUgfHwgdW5pY29kZUJpZGkgPT0gSXNvbGF0ZU92ZXJyaWRlKTsKLSAgICAgICAg ICAgIGRpcmVjdGlvbiA9IGlzb2xhdGVkSW5saW5lLT5zdHlsZSgpLmRpcmVjdGlvbigpOwotICAg ICAgICB9CisgICAgICAgICAgICBkZXRlcm1pbmVQbGFpbnRleHREaXJlY3Rpb25hbGl0eShkaXJl Y3Rpb24sIElubGluZUl0ZXJhdG9yKGlzb2xhdGVkSW5saW5lLCAmaXNvbGF0ZWRSdW4tPnJlbmRl cmVyKCksIDApKTsKKwogICAgICAgICBpc29sYXRlZFJlc29sdmVyLnNldFN0YXR1cyhCaWRpU3Rh dHVzKGRpcmVjdGlvbiwgaXNPdmVycmlkZSh1bmljb2RlQmlkaSkpKTsKIAogICAgICAgICBzZXRV cFJlc29sdmVyVG9SZXN1bWVJbklzb2xhdGUoaXNvbGF0ZWRSZXNvbHZlciwgaXNvbGF0ZWRJbmxp bmUsICZzdGFydE9iamVjdCk7CkBAIC0xMTYxLDcgKzEyMTEsNyBAQCB2b2lkIFJlbmRlckJsb2Nr Rmxvdzo6bGF5b3V0UnVuc0FuZEZsb2F0c0luUmFuZ2UoTGluZUxheW91dFN0YXRlJiBsYXlvdXRT dGF0ZSwgSQogCiAgICAgICAgICAgICBpZiAoaXNOZXdVQkFQYXJhZ3JhcGggJiYgc3R5bGVUb1Vz ZS51bmljb2RlQmlkaSgpID09IFBsYWludGV4dCAmJiAhcmVzb2x2ZXIuY29udGV4dCgpLT5wYXJl bnQoKSkgewogICAgICAgICAgICAgICAgIFRleHREaXJlY3Rpb24gZGlyZWN0aW9uID0gc3R5bGVU b1VzZS5kaXJlY3Rpb24oKTsKLSAgICAgICAgICAgICAgICBkZXRlcm1pbmVEaXJlY3Rpb25hbGl0 eShkaXJlY3Rpb24sIHJlc29sdmVyLnBvc2l0aW9uKCkpOworICAgICAgICAgICAgICAgIGRldGVy bWluZVBsYWludGV4dERpcmVjdGlvbmFsaXR5KGRpcmVjdGlvbiwgcmVzb2x2ZXIucG9zaXRpb24o KSk7CiAgICAgICAgICAgICAgICAgcmVzb2x2ZXIuc2V0U3RhdHVzKEJpZGlTdGF0dXMoZGlyZWN0 aW9uLCBpc092ZXJyaWRlKHN0eWxlVG9Vc2UudW5pY29kZUJpZGkoKSkpKTsKICAgICAgICAgICAg IH0KICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIG93bmVyc2hpcCBpcyByZXZlcnNlZC4gV2Ug c2hvdWxkIG93biB0aGUgQmlkaVJ1bkxpc3QgYW5kIHBhc3MgaXQgdG8gY3JlYXRlQmlkaVJ1bnNG b3JMaW5lLgpAQCAtMTY3MSw3ICsxNzIxLDcgQEAgUm9vdElubGluZUJveCogUmVuZGVyQmxvY2tG bG93OjpkZXRlcm1pbmVTdGFydFBvc2l0aW9uKExpbmVMYXlvdXRTdGF0ZSYgbGF5b3V0U3QKICAg ICB9IGVsc2UgewogICAgICAgICBUZXh0RGlyZWN0aW9uIGRpcmVjdGlvbiA9IHN0eWxlKCkuZGly ZWN0aW9uKCk7CiAgICAgICAgIGlmIChzdHlsZSgpLnVuaWNvZGVCaWRpKCkgPT0gUGxhaW50ZXh0 KQotICAgICAgICAgICAgZGV0ZXJtaW5lRGlyZWN0aW9uYWxpdHkoZGlyZWN0aW9uLCBJbmxpbmVJ dGVyYXRvcih0aGlzLCBiaWRpRmlyc3RTa2lwcGluZ0VtcHR5SW5saW5lcygqdGhpcyksIDApKTsK KyAgICAgICAgICAgIGRldGVybWluZVBsYWludGV4dERpcmVjdGlvbmFsaXR5KGRpcmVjdGlvbiwg SW5saW5lSXRlcmF0b3IodGhpcywgbnVsbHB0ciwgMCkpOwogICAgICAgICByZXNvbHZlci5zZXRT dGF0dXMoQmlkaVN0YXR1cyhkaXJlY3Rpb24sIGlzT3ZlcnJpZGUoc3R5bGUoKS51bmljb2RlQmlk aSgpKSkpOwogICAgICAgICBJbmxpbmVJdGVyYXRvciBpdGVyID0gSW5saW5lSXRlcmF0b3IodGhp cywgYmlkaUZpcnN0U2tpcHBpbmdFbXB0eUlubGluZXMoKnRoaXMsICZyZXNvbHZlciksIDApOwog ICAgICAgICByZXNvbHZlci5zZXRQb3NpdGlvbihpdGVyLCBudW1iZXJPZklzb2xhdGVBbmNlc3Rv cnMoaXRlcikpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCmluZGV4IDAwYjBiM2EyZTU4MzNmZGYwNDAwMmNiNWU3MmZiOTZiYjM5ZjA5 YzMuLmJlOWIwZTAwYmZhNTg0MDk5MTM1YjdlYjczYmE0ODBkNjhhZTA5MGEgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxNC0xMS0yMSAgSWdvciBPbGl2ZWlyYSAgPGlnb3JAd29yay5jbz4KKwor ICAgICAgICB1bmljb2RlLWJpZGk6cGxhaW50ZXh0IHRyZWF0cyBlbWJlZGRlZCBlbGVtZW50IHdp dGggdW5pY29kZS1iaWRpOnBsYWludGV4dCBvciBpc29sYXRlIGluY29ycmVjdGx5CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDU0MworCisgICAgICAg IFdlYktpdCBkb2VzIG5vdCB0cmVhdCB0aGUgaXNvbGF0ZWQgc2VxdWVuY2UgYXMgaWYgaXQgd2Vy ZSBhIFUrVUZGRkMoYXMgZGVzY3JpYmVkIGluIHRoZSBzcGVjaWZpY2F0aW9uKS4KKyAgICAgICAg VGhpcyBwYXRjaCBhZGRzIGEgbmV3IG1ldGhvZCBjYWxsZWQgZmlyc3RSZW5kZXJPYmplY3RGb3JE aXJlY3Rpb25hbGl0eURldGVybWluYXRpb24gdGhhdCBpcyB1c2VkIHRvIGdldCB0aGUKKyAgICAg ICAgZmlyc3QgbmVzdGVkIGJpZGkgbm90IGlzb2xhdGVkLgorCisgICAgICAgIE5lZWQgdGhlIGJ1 ZyBVUkwgKE9PUFMhKS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIGZhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL3VuaWNvZGUtYmlkaS1wbGFpbnRleHQt bmVzdGVkLWlzb2xhdGUtbmV1dHJhbC1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBm YXN0L3RleHQvaW50ZXJuYXRpb25hbC91bmljb2RlLWJpZGktcGxhaW50ZXh0LW5lc3RlZC1pc29s YXRlLW5ldXRyYWwuaHRtbDogQWRkZWQuCisgICAgICAgICogTGF5b3V0VGVzdHMvZmFzdC90ZXh0 L2ludGVybmF0aW9uYWwvdW5pY29kZS1iaWRpLXBsYWludGV4dC1hcm91bmQtaW5saW5lLXBsYWlu dGV4dC1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBMYXlvdXRUZXN0cy9mYXN0L3Rl eHQvaW50ZXJuYXRpb25hbC91bmljb2RlLWJpZGktcGxhaW50ZXh0LWFyb3VuZC1pbmxpbmUtcGxh aW50ZXh0Lmh0bWw6IEFkZGVkLgorCiAyMDE0LTExLTE5ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1t YXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgW09TIFhdIFVwcmlnaHQgdmVydGljYWwgdGV4 dCBpcyBjb21wbGV0ZWx5IGJyb2tlbiBmb3IgbXVsdGktY29kZS11bml0IGNvZGVwb2ludHMKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL3VuaWNvZGUtYmlk aS1wbGFpbnRleHQtYXJvdW5kLWlubGluZS1wbGFpbnRleHQtZXhwZWN0ZWQuaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL3VuaWNvZGUtYmlkaS1wbGFpbnRleHQtYXJv dW5kLWlubGluZS1wbGFpbnRleHQtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40MmViNmFmOTIz MTZiNGI3YzRjMzMyODVjZmViYTFkYzkzMGNmNWY2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvdW5pY29kZS1iaWRpLXBsYWludGV4dC1hcm91 bmQtaW5saW5lLXBsYWludGV4dC1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMjcgQEAKKzwhRE9D VFlQRSBodG1sPgorPGh0bWw+CisgIDxoZWFkPgorICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ii8+ CisgICAgPHN0eWxlPgorICAgICAgYm9keSB7CisgICAgICAgIGZvbnQtc2l6ZToyZW07CisgICAg ICAgIHRleHQtYWxpZ246bGVmdDsKKyAgICAgIH0KKyAgICAgIC5yZWYgeworICAgICAgICBib3Jk ZXI6IG1lZGl1bSBzb2xpZCBncmF5OworICAgICAgICBwYWRkaW5nOiAxMHB4OworICAgICAgICB3 aWR0aDogNDAwcHg7CisgICAgICAgIG1hcmdpbjogMjBweDsKKyAgICAgIH0KKyAgICAgIC5wbGFp bnRleHQgeworICAgICAgICB1bmljb2RlLWJpZGk6IC13ZWJraXQtcGxhaW50ZXh0OworICAgICAg fQorICAgIDwvc3R5bGU+CisgIDwvaGVhZD4KKyAgPGJvZHk+CisgICAgPGRpdiBjbGFzcz0icmVm Ij4KKyAgICAgICYjeDA1RDA7LT4mcmxtOyA9PSA9PSA9PT4mbHJtOworICAgICAgPGRpdiBkaXI9 InJ0bCI+JiN4MDVEMTstPiA9PSA9PSA9PT48L2Rpdj4KKyAgICA8L2Rpdj4KKyAgPC9ib2R5Pgor PC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwv dW5pY29kZS1iaWRpLXBsYWludGV4dC1hcm91bmQtaW5saW5lLXBsYWludGV4dC5odG1sIGIvTGF5 b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvdW5pY29kZS1iaWRpLXBsYWludGV4dC1h cm91bmQtaW5saW5lLXBsYWludGV4dC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjM2ODU1MGY0NzI1YjVmNzlj MjUyYWUzYWU5Y2NmZDZiMjJlNjYwYjUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L3RleHQvaW50ZXJuYXRpb25hbC91bmljb2RlLWJpZGktcGxhaW50ZXh0LWFyb3VuZC1pbmxp bmUtcGxhaW50ZXh0Lmh0bWwKQEAgLTAsMCArMSwyNyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRt bD4KKyAgPGhlYWQ+CisgICAgPG1ldGEgY2hhcnNldD0idXRmLTgiLz4KKyAgICA8c3R5bGU+Cisg ICAgICBib2R5IHsKKyAgICAgICAgZm9udC1zaXplOjJlbTsKKyAgICAgICAgdGV4dC1hbGlnbjps ZWZ0OworICAgICAgfQorICAgICAgLnRlc3QgeworICAgICAgICBib3JkZXI6IG1lZGl1bSBzb2xp ZCBncmF5OworICAgICAgICBwYWRkaW5nOiAxMHB4OworICAgICAgICB3aWR0aDogNDAwcHg7Cisg ICAgICAgIG1hcmdpbjogMjBweDsKKyAgICAgIH0KKyAgICAgIC5wbGFpbnRleHQgeworICAgICAg ICB1bmljb2RlLWJpZGk6IC13ZWJraXQtcGxhaW50ZXh0OworICAgICAgfQorICAgIDwvc3R5bGU+ CisgIDwvaGVhZD4KKyAgPGJvZHk+CisgICAgPGRpdiBjbGFzcz0idGVzdCI+CisgICAgICA8ZGl2 IGNsYXNzPSJwbGFpbnRleHQiPjxzcGFuIGNsYXNzPSJwbGFpbnRleHQiPiYjeDA1RDA7LT48L3Nw YW4+ID09ID09ID09PjwvZGl2PgorICAgICAgPGRpdiBjbGFzcz0icGxhaW50ZXh0Ij48c3Bhbj4m I3gwNUQxOy0+PC9zcGFuPiA9PSA9PSA9PT48L2Rpdj4KKyAgICA8L2Rpdj4KKyAgPC9ib2R5Pgor PC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwv dW5pY29kZS1iaWRpLXBsYWludGV4dC1uZXN0ZWQtaXNvbGF0ZS1uZXV0cmFsLWV4cGVjdGVkLmh0 bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC91bmljb2RlLWJpZGktcGxh aW50ZXh0LW5lc3RlZC1pc29sYXRlLW5ldXRyYWwtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40 YWEzZTU3MTNhMDA2ZDM2MTU5MmEzZTlmZTFmZDM2MTNiODdmMzBjCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvdW5pY29kZS1iaWRpLXBsYWlu dGV4dC1uZXN0ZWQtaXNvbGF0ZS1uZXV0cmFsLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwyNiBA QAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgPGhlYWQ+CisgICAgPG1ldGEgY2hhcnNldD0i dXRmLTgiLz4KKyAgICA8c3R5bGU+CisgICAgICBib2R5IHsKKyAgICAgICAgZm9udC1zaXplOjJl bTsKKyAgICAgICAgdGV4dC1hbGlnbjpsZWZ0OworICAgICAgfQorICAgICAgLnJlZiB7CisgICAg ICAgIGJvcmRlcjogbWVkaXVtIHNvbGlkIGdyYXk7CisgICAgICAgIHBhZGRpbmc6IDEwcHg7Cisg ICAgICAgIG1hcmdpbjogMjBweDsKKyAgICAgIH0KKyAgICA8L3N0eWxlPgorICA8L2hlYWQ+Cisg IDxib2R5PgorICAgIDxkaXYgY2xhc3M9InJlZiI+CisgICAgICA8c3BhbiBkaXI9Imx0ciI+JiN4 MDVEMDstPjwvc3Bhbj4KKyAgICAgICA9PSA9PSA9PT4KKyAgICAgIDxzcGFuIGRpcj0ibHRyIj4m I3gwNUQwOyA9PSA9PT08L3NwYW4+CisgICAgICA8c3Bhbj5UZXh0PC9zcGFuPgorICAgICAgPHNw YW4+JiN4MDVEMDs8L3NwYW4+CisgICAgPC9kaXY+CisgIDwvYm9keT4KKzwvaHRtbD4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL3VuaWNvZGUtYmlkaS1w bGFpbnRleHQtbmVzdGVkLWlzb2xhdGUtbmV1dHJhbC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90 ZXh0L2ludGVybmF0aW9uYWwvdW5pY29kZS1iaWRpLXBsYWludGV4dC1uZXN0ZWQtaXNvbGF0ZS1u ZXV0cmFsLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjQ3OTYwNzc5M2Y0ZWQ1NTdjZWM3ODE2NWZiNDVhOWU1 YzcxZDc4MgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9pbnRlcm5h dGlvbmFsL3VuaWNvZGUtYmlkaS1wbGFpbnRleHQtbmVzdGVkLWlzb2xhdGUtbmV1dHJhbC5odG1s CkBAIC0wLDAgKzEsMzMgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+CisgIDxoZWFkPgorICAg IDxtZXRhIGNoYXJzZXQ9InV0Zi04Ii8+CisgICAgPHN0eWxlPgorICAgICAgYm9keSB7CisgICAg ICAgIGZvbnQtc2l6ZToyZW07CisgICAgICAgIHRleHQtYWxpZ246bGVmdDsKKyAgICAgIH0KKyAg ICAgIC50ZXN0IHsKKyAgICAgICAgYm9yZGVyOiBtZWRpdW0gc29saWQgZ3JheTsKKyAgICAgICAg cGFkZGluZzogMTBweDsKKyAgICAgICAgbWFyZ2luOiAyMHB4OworICAgICAgfQorICAgICAgLnBs YWludGV4dCB7CisgICAgICAgIHVuaWNvZGUtYmlkaTogLXdlYmtpdC1wbGFpbnRleHQ7CisgICAg ICB9CisgICAgICAuaXNvbGF0ZSB7CisgICAgICAgIHVuaWNvZGUtYmlkaTogLXdlYmtpdC1pc29s YXRlOworICAgICAgfQorICAgIDwvc3R5bGU+CisgIDwvaGVhZD4KKyAgPGJvZHk+CisgICAgPGRp diBjbGFzcz0idGVzdCI+CisgICAgICA8ZGl2IGNsYXNzPSJwbGFpbnRleHQiPgorICAgICAgPHNw YW4gY2xhc3M9Imlzb2xhdGUiPiYjeDA1RDA7LT48L3NwYW4+CisgICAgICA9PSA9PSA9PT4KKyAg ICAgIDxzcGFuIGNsYXNzPSJpc29sYXRlIj4mI3gwNUQwOyA9PSA9PT08L3NwYW4+CisgICAgICA8 c3Bhbj5UZXh0PC9zcGFuPgorICAgICAgPHNwYW4+JiN4MDVEMDs8L3NwYW4+CisgICAgPC9kaXY+ CisgIDwvYm9keT4KKzwvaHRtbD4K 242067 2014-11-21 13:32:34 -0800 2022-02-27 23:16:11 -0800 Patch bug-84543-20141121163352.patch text/plain 12822 igor.oliveira U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2Mzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjJiZGFlMzEzZTU0NDNk NTFlYmZkNDBmN2JlZmE2N2ZjN2MwNTQxNi4uNTMwMGEwODIyYWNlYjU1ZTM2NWZjMTZjYWM2Nzcy ZTQ0OWMzY2Q1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE0LTExLTIxICBJZ29y IE9saXZlaXJhICA8aWdvckB3b3JrLmNvPgorCisgICAgICAgIHVuaWNvZGUtYmlkaTpwbGFpbnRl eHQgdHJlYXRzIGVtYmVkZGVkIGVsZW1lbnQgd2l0aCB1bmljb2RlLWJpZGk6cGxhaW50ZXh0IG9y IGlzb2xhdGUgaW5jb3JyZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg0NTQzCisKKyAgICAgICAgSW4gdGhlIENTUyBXcml0aW5nIE1vZGVzIHNw ZWNpZmljYXRpb246CisgICAgICAgIEZvciB0aGUgcHVycG9zZSBvZiBiaWRpIHJlc29sdXRpb24g aW4gaXRzIGNvbnRhaW5pbmcgYmlkaSBwYXJhZ3JhcGgsCisgICAgICAgIHRoZSBzZXF1ZW5jZSBp cyB0cmVhdGVkIGFzIGlmIGl0IHdlcmUgYSBzaW5nbGUgT2JqZWN0IFJlcGxhY2VtZW50IENoYXJh Y3RlciAoVStGRkZDKS4KKworICAgICAgICBXZWJLaXQgZG9lcyBub3QgdHJlYXQgdGhlIGlzb2xh dGVkIHNlcXVlbmNlIGFzIGlmIGl0IHdlcmUgYSBVK1VGRkZDLgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZhc3QvdGV4dC9pbnRlcm5hdGlv bmFsL3VuaWNvZGUtYmlkaS1wbGFpbnRleHQtbmVzdGVkLWlzb2xhdGUtbmV1dHJhbC5odG1sCisg ICAgICAgICAgICAgIGZhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL3VuaWNvZGUtYmlkaS1wbGFpbnRl eHQtYXJvdW5kLWlubGluZS1wbGFpbnRleHQtZXhwZWN0ZWQuaHRtbAorCisgICAgICAgICogcmVu ZGVyaW5nL0lubGluZUl0ZXJhdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRv cjo6SW5saW5lSXRlcmF0b3IpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVM YXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Zmlyc3RSZW5kZXJPYmplY3RGb3JEaXJlY3Rp b25hbGl0eURldGVybWluYXRpb24pOiBHZXQKKyAgICAgICAgdGhlIGZpcnN0IG5lc3RlZCBiaWRp IG5vdCBpc29sYXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmRldGVybWluZVBsYWludGV4dERpcmVj dGlvbmFsaXR5KTogSXNvbGF0ZWQKKyAgICAgICAgcmVuZGVyZXJzIG5lZWQgdG8gYmUgdHJlYXRl ZCBhcyBuZXV0cmFsIGNoYXJhY3RlcnMuCisgICAgICAgIChXZWJDb3JlOjpjb25zdHJ1Y3RCaWRp UnVuc0ZvclNlZ21lbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjpsYXlv dXRSdW5zQW5kRmxvYXRzSW5SYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zs b3c6OmRldGVybWluZVN0YXJ0UG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6ZGV0ZXJtaW5l RGlyZWN0aW9uYWxpdHkpOiBEZWxldGVkLgorCiAyMDE0LTExLTE5ICBBbmRyZWFzIEtsaW5nICA8 YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgImRvY3VtZW50IGhhcyBubyA6OmJl Zm9yZSBhbmQvb3IgOjphZnRlciBydWxlcyIgb3B0aW1pemF0aW9uLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvSW5saW5lSXRlcmF0b3IuaAppbmRleCA3YTc2YWI5ODcwNWY4ZmI3ZGEyZDBhMmM5 NjI4NDQ4ZDU5YzRhNTI2Li5kMjY3YjI0YWE0NDViYzgxODU5NjFhNDZmMjg0NGNiMmU0Yjc3NjM4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lSXRlcmF0b3IuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lSXRlcmF0b3IuaApAQCAtNTQsNiAr NTQsMTUgQEAgcHVibGljOgogICAgIHsKICAgICB9CiAKKyAgICBJbmxpbmVJdGVyYXRvcihjb25z dCBJbmxpbmVJdGVyYXRvciAmaXRlcikKKyAgICAgICAgOiBtX3Jvb3QoaXRlci5yb290KCkpCisg ICAgICAgICwgbV9yZW5kZXJlcihpdGVyLnJlbmRlcmVyKCkpCisgICAgICAgICwgbV9uZXh0QnJl YWthYmxlUG9zaXRpb24oLTEpCisgICAgICAgICwgbV9wb3MoaXRlci5vZmZzZXQoKSkKKyAgICAg ICAgLCBtX3JlZmVyc1RvRW5kT2ZQcmV2aW91c05vZGUoZmFsc2UpCisgICAgeworICAgIH0KKwog ICAgIHZvaWQgY2xlYXIoKSB7IG1vdmVUbygwLCAwKTsgfQogCiAgICAgdm9pZCBtb3ZlVG9TdGFy dE9mKFJlbmRlck9iamVjdCogb2JqZWN0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAppbmRleCAwM2FmYzE1YWE1NjY2MDUzYzg5ZDk1 Y2ZlODY2ZDg2NWNhNGI4YTMyLi4zMTE2Y2I2YjRhNzkyYTdmZDVkZjk2NDJmYWM2Mjk4MzllZjM0 MDc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5l TGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5l TGF5b3V0LmNwcApAQCAtNTEsOSArNTEsNjIgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1z dGF0aWMgdm9pZCBkZXRlcm1pbmVEaXJlY3Rpb25hbGl0eShUZXh0RGlyZWN0aW9uJiBkaXIsIElu bGluZUl0ZXJhdG9yIGl0ZXIpCitzdGF0aWMgUmVuZGVyT2JqZWN0KiBmaXJzdFJlbmRlck9iamVj dEZvckRpcmVjdGlvbmFsaXR5RGV0ZXJtaW5hdGlvbihSZW5kZXJFbGVtZW50KiByb290LCBSZW5k ZXJPYmplY3QqIGN1cnJlbnQgPSAwKQogeworICAgIFJlbmRlck9iamVjdCogbmV4dCA9IGN1cnJl bnQ7CisgICAgd2hpbGUgKGN1cnJlbnQpIHsKKyAgICAgICAgaWYgKGlzSXNvbGF0ZWQoY3VycmVu dC0+c3R5bGUoKS51bmljb2RlQmlkaSgpKQorICAgICAgICAgICAgJiYgKGN1cnJlbnQtPmlzUmVu ZGVySW5saW5lKCkgfHwgY3VycmVudC0+aXNSZW5kZXJCbG9jaygpKSkgeworICAgICAgICAgICAg aWYgKGN1cnJlbnQgIT0gcm9vdCkKKyAgICAgICAgICAgICAgICBjdXJyZW50ID0gbnVsbHB0cjsK KyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBjdXJyZW50ID0gbmV4dDsKKyAgICAg ICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAgIGN1cnJlbnQgPSBjdXJyZW50LT5wYXJl bnQoKTsKKyAgICB9CisKKyAgICBpZiAoIWN1cnJlbnQpCisgICAgICAgIGN1cnJlbnQgPSByb290 LT5maXJzdENoaWxkKCk7CisKKyAgICB3aGlsZSAoY3VycmVudCkgeworICAgICAgICBuZXh0ID0g bnVsbHB0cjsKKyAgICAgICAgaWYgKGlzSXRlcmF0b3JUYXJnZXQoY3VycmVudCkgJiYgIShpczxS ZW5kZXJUZXh0PihjdXJyZW50KSAmJiBkb3duY2FzdDxSZW5kZXJUZXh0PihjdXJyZW50KS0+aXNB bGxDb2xsYXBzaWJsZVdoaXRlc3BhY2UoKSkpCisgICAgICAgICAgICBicmVhazsKKworICAgICAg ICBpZiAoIWlzSXRlcmF0b3JUYXJnZXQoY3VycmVudCkgJiYgIWlzSXNvbGF0ZWQoY3VycmVudC0+ c3R5bGUoKS51bmljb2RlQmlkaSgpKSkKKyAgICAgICAgICAgIG5leHQgPSBkb3duY2FzdDxSZW5k ZXJFbGVtZW50PigqY3VycmVudCkuZmlyc3RDaGlsZCgpOworCisgICAgICAgIGlmICghbmV4dCkg eworICAgICAgICAgICAgd2hpbGUgKGN1cnJlbnQgJiYgY3VycmVudCAhPSByb290KSB7CisgICAg ICAgICAgICAgICAgbmV4dCA9IGN1cnJlbnQtPm5leHRTaWJsaW5nKCk7CisgICAgICAgICAgICAg ICAgaWYgKG5leHQpCisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAg IGN1cnJlbnQgPSBjdXJyZW50LT5wYXJlbnQoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQor CisgICAgICAgIGlmICghbmV4dCkKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgIGN1cnJl bnQgPSBuZXh0OworICAgIH0KKworICAgIHJldHVybiBjdXJyZW50OworfQorCitzdGF0aWMgdm9p ZCBkZXRlcm1pbmVQbGFpbnRleHREaXJlY3Rpb25hbGl0eShUZXh0RGlyZWN0aW9uJiBkaXIsIElu bGluZUl0ZXJhdG9yIGl0ZXJhdG9yKQoreworICAgIFJlbmRlckVsZW1lbnQqIHJvb3RFbGVtZW50 ID0gaXRlcmF0b3Iucm9vdCgpOworICAgIElubGluZUl0ZXJhdG9yIGl0ZXIocm9vdEVsZW1lbnQs IGZpcnN0UmVuZGVyT2JqZWN0Rm9yRGlyZWN0aW9uYWxpdHlEZXRlcm1pbmF0aW9uKHJvb3RFbGVt ZW50LCBpdGVyYXRvci5yZW5kZXJlcigpKSwgaXRlcmF0b3Iub2Zmc2V0KCkpOworICAgIElubGlu ZUJpZGlSZXNvbHZlciBvYnNlcnZlcjsKKyAgICBvYnNlcnZlci5zZXRQb3NpdGlvbklnbm9yaW5n TmVzdGVkSXNvbGF0ZXMoaXRlcik7CisgICAgb2JzZXJ2ZXIuc2V0U3RhdHVzKEJpZGlTdGF0dXMo cm9vdEVsZW1lbnQtPnN0eWxlKCkuZGlyZWN0aW9uKCksIGlzT3ZlcnJpZGUocm9vdEVsZW1lbnQt PnN0eWxlKCkudW5pY29kZUJpZGkoKSkpKTsKICAgICB3aGlsZSAoIWl0ZXIuYXRFbmQoKSkgewor ICAgICAgICBpZiAob2JzZXJ2ZXIuaW5Jc29sYXRlKCkpIHsKKyAgICAgICAgICAgIGl0ZXIuaW5j cmVtZW50KCZvYnNlcnZlcik7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQogICAg ICAgICBpZiAoaXRlci5hdFBhcmFncmFwaFNlcGFyYXRvcigpKQogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICBpZiAoVUNoYXIgY3VycmVudCA9IGl0ZXIuY3VycmVudCgpKSB7CkBAIC02Nyw3 ICsxMjAsNyBAQCBzdGF0aWMgdm9pZCBkZXRlcm1pbmVEaXJlY3Rpb25hbGl0eShUZXh0RGlyZWN0 aW9uJiBkaXIsIElubGluZUl0ZXJhdG9yIGl0ZXIpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgICAgIGl0ZXIuaW5jcmVtZW50KCk7CisgICAg ICAgIGl0ZXIuaW5jcmVtZW50KCZvYnNlcnZlcik7CiAgICAgfQogfQogCkBAIC05MzAsMTMgKzk4 MywxMCBAQCBzdGF0aWMgaW5saW5lIHZvaWQgY29uc3RydWN0QmlkaVJ1bnNGb3JTZWdtZW50KElu bGluZUJpZGlSZXNvbHZlciYgdG9wUmVzb2x2ZXIsCiAKICAgICAgICAgSW5saW5lQmlkaVJlc29s dmVyIGlzb2xhdGVkUmVzb2x2ZXI7CiAgICAgICAgIEVVbmljb2RlQmlkaSB1bmljb2RlQmlkaSA9 IGlzb2xhdGVkSW5saW5lLT5zdHlsZSgpLnVuaWNvZGVCaWRpKCk7Ci0gICAgICAgIFRleHREaXJl Y3Rpb24gZGlyZWN0aW9uOworICAgICAgICBUZXh0RGlyZWN0aW9uIGRpcmVjdGlvbiA9IGlzb2xh dGVkSW5saW5lLT5zdHlsZSgpLmRpcmVjdGlvbigpOwogICAgICAgICBpZiAodW5pY29kZUJpZGkg PT0gUGxhaW50ZXh0KQotICAgICAgICAgICAgZGV0ZXJtaW5lRGlyZWN0aW9uYWxpdHkoZGlyZWN0 aW9uLCBJbmxpbmVJdGVyYXRvcihpc29sYXRlZElubGluZSwgJmlzb2xhdGVkUnVuLT5yZW5kZXJl cigpLCAwKSk7Ci0gICAgICAgIGVsc2UgewotICAgICAgICAgICAgQVNTRVJUKHVuaWNvZGVCaWRp ID09IElzb2xhdGUgfHwgdW5pY29kZUJpZGkgPT0gSXNvbGF0ZU92ZXJyaWRlKTsKLSAgICAgICAg ICAgIGRpcmVjdGlvbiA9IGlzb2xhdGVkSW5saW5lLT5zdHlsZSgpLmRpcmVjdGlvbigpOwotICAg ICAgICB9CisgICAgICAgICAgICBkZXRlcm1pbmVQbGFpbnRleHREaXJlY3Rpb25hbGl0eShkaXJl Y3Rpb24sIElubGluZUl0ZXJhdG9yKGlzb2xhdGVkSW5saW5lLCAmaXNvbGF0ZWRSdW4tPnJlbmRl cmVyKCksIDApKTsKKwogICAgICAgICBpc29sYXRlZFJlc29sdmVyLnNldFN0YXR1cyhCaWRpU3Rh dHVzKGRpcmVjdGlvbiwgaXNPdmVycmlkZSh1bmljb2RlQmlkaSkpKTsKIAogICAgICAgICBzZXRV cFJlc29sdmVyVG9SZXN1bWVJbklzb2xhdGUoaXNvbGF0ZWRSZXNvbHZlciwgaXNvbGF0ZWRJbmxp bmUsICZzdGFydE9iamVjdCk7CkBAIC0xMTYxLDcgKzEyMTEsNyBAQCB2b2lkIFJlbmRlckJsb2Nr Rmxvdzo6bGF5b3V0UnVuc0FuZEZsb2F0c0luUmFuZ2UoTGluZUxheW91dFN0YXRlJiBsYXlvdXRT dGF0ZSwgSQogCiAgICAgICAgICAgICBpZiAoaXNOZXdVQkFQYXJhZ3JhcGggJiYgc3R5bGVUb1Vz ZS51bmljb2RlQmlkaSgpID09IFBsYWludGV4dCAmJiAhcmVzb2x2ZXIuY29udGV4dCgpLT5wYXJl bnQoKSkgewogICAgICAgICAgICAgICAgIFRleHREaXJlY3Rpb24gZGlyZWN0aW9uID0gc3R5bGVU b1VzZS5kaXJlY3Rpb24oKTsKLSAgICAgICAgICAgICAgICBkZXRlcm1pbmVEaXJlY3Rpb25hbGl0 eShkaXJlY3Rpb24sIHJlc29sdmVyLnBvc2l0aW9uKCkpOworICAgICAgICAgICAgICAgIGRldGVy bWluZVBsYWludGV4dERpcmVjdGlvbmFsaXR5KGRpcmVjdGlvbiwgcmVzb2x2ZXIucG9zaXRpb24o KSk7CiAgICAgICAgICAgICAgICAgcmVzb2x2ZXIuc2V0U3RhdHVzKEJpZGlTdGF0dXMoZGlyZWN0 aW9uLCBpc092ZXJyaWRlKHN0eWxlVG9Vc2UudW5pY29kZUJpZGkoKSkpKTsKICAgICAgICAgICAg IH0KICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIG93bmVyc2hpcCBpcyByZXZlcnNlZC4gV2Ug c2hvdWxkIG93biB0aGUgQmlkaVJ1bkxpc3QgYW5kIHBhc3MgaXQgdG8gY3JlYXRlQmlkaVJ1bnNG b3JMaW5lLgpAQCAtMTY3MSw3ICsxNzIxLDcgQEAgUm9vdElubGluZUJveCogUmVuZGVyQmxvY2tG bG93OjpkZXRlcm1pbmVTdGFydFBvc2l0aW9uKExpbmVMYXlvdXRTdGF0ZSYgbGF5b3V0U3QKICAg ICB9IGVsc2UgewogICAgICAgICBUZXh0RGlyZWN0aW9uIGRpcmVjdGlvbiA9IHN0eWxlKCkuZGly ZWN0aW9uKCk7CiAgICAgICAgIGlmIChzdHlsZSgpLnVuaWNvZGVCaWRpKCkgPT0gUGxhaW50ZXh0 KQotICAgICAgICAgICAgZGV0ZXJtaW5lRGlyZWN0aW9uYWxpdHkoZGlyZWN0aW9uLCBJbmxpbmVJ dGVyYXRvcih0aGlzLCBiaWRpRmlyc3RTa2lwcGluZ0VtcHR5SW5saW5lcygqdGhpcyksIDApKTsK KyAgICAgICAgICAgIGRldGVybWluZVBsYWludGV4dERpcmVjdGlvbmFsaXR5KGRpcmVjdGlvbiwg SW5saW5lSXRlcmF0b3IodGhpcywgbnVsbHB0ciwgMCkpOwogICAgICAgICByZXNvbHZlci5zZXRT dGF0dXMoQmlkaVN0YXR1cyhkaXJlY3Rpb24sIGlzT3ZlcnJpZGUoc3R5bGUoKS51bmljb2RlQmlk aSgpKSkpOwogICAgICAgICBJbmxpbmVJdGVyYXRvciBpdGVyID0gSW5saW5lSXRlcmF0b3IodGhp cywgYmlkaUZpcnN0U2tpcHBpbmdFbXB0eUlubGluZXMoKnRoaXMsICZyZXNvbHZlciksIDApOwog ICAgICAgICByZXNvbHZlci5zZXRQb3NpdGlvbihpdGVyLCBudW1iZXJPZklzb2xhdGVBbmNlc3Rv cnMoaXRlcikpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCmluZGV4IDAwYjBiM2EyZTU4MzNmZGYwNDAwMmNiNWU3MmZiOTZiYjM5ZjA5 YzMuLmZlMTBlZTgwMjE3NjkzZDAxM2M1ZDAyN2YwOGJiNmJmYjhiM2JjY2MgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxNC0xMS0yMSAgSWdvciBPbGl2ZWlyYSAgPGlnb3JAd29yay5jbz4KKwor ICAgICAgICB1bmljb2RlLWJpZGk6cGxhaW50ZXh0IHRyZWF0cyBlbWJlZGRlZCBlbGVtZW50IHdp dGggdW5pY29kZS1iaWRpOnBsYWludGV4dCBvciBpc29sYXRlIGluY29ycmVjdGx5CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDU0MworCisgICAgICAg IFdlYktpdCBkb2VzIG5vdCB0cmVhdCB0aGUgaXNvbGF0ZWQgc2VxdWVuY2UgYXMgaWYgaXQgd2Vy ZSBhIFUrVUZGRkMoYXMgZGVzY3JpYmVkIGluIHRoZSBzcGVjaWZpY2F0aW9uKS4KKyAgICAgICAg VGhpcyBwYXRjaCBhZGRzIGEgbmV3IG1ldGhvZCBjYWxsZWQgZmlyc3RSZW5kZXJPYmplY3RGb3JE aXJlY3Rpb25hbGl0eURldGVybWluYXRpb24gdGhhdCBpcyB1c2VkIHRvIGdldCB0aGUKKyAgICAg ICAgZmlyc3QgbmVzdGVkIGJpZGkgbm90IGlzb2xhdGVkLgorCisgICAgICAgIE5lZWQgdGhlIGJ1 ZyBVUkwgKE9PUFMhKS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIGZhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL3VuaWNvZGUtYmlkaS1wbGFpbnRleHQt bmVzdGVkLWlzb2xhdGUtbmV1dHJhbC1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBm YXN0L3RleHQvaW50ZXJuYXRpb25hbC91bmljb2RlLWJpZGktcGxhaW50ZXh0LW5lc3RlZC1pc29s YXRlLW5ldXRyYWwuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC90ZXh0L2ludGVybmF0aW9u YWwvdW5pY29kZS1iaWRpLXBsYWludGV4dC1hcm91bmQtaW5saW5lLXBsYWludGV4dC1leHBlY3Rl ZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RleHQvaW50ZXJuYXRpb25hbC91bmljb2Rl LWJpZGktcGxhaW50ZXh0LWFyb3VuZC1pbmxpbmUtcGxhaW50ZXh0Lmh0bWw6IEFkZGVkLgorCiAy MDE0LTExLTE5ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAg ICAgICAgW09TIFhdIFVwcmlnaHQgdmVydGljYWwgdGV4dCBpcyBjb21wbGV0ZWx5IGJyb2tlbiBm b3IgbXVsdGktY29kZS11bml0IGNvZGVwb2ludHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvdGV4dC9pbnRlcm5hdGlvbmFsL3VuaWNvZGUtYmlkaS1wbGFpbnRleHQtYXJvdW5kLWlubGlu ZS1wbGFpbnRleHQtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9pbnRlcm5h dGlvbmFsL3VuaWNvZGUtYmlkaS1wbGFpbnRleHQtYXJvdW5kLWlubGluZS1wbGFpbnRleHQtZXhw ZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40MmViNmFmOTIzMTZiNGI3YzRjMzMyODVjZmViYTFkYzkz MGNmNWY2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0 aW9uYWwvdW5pY29kZS1iaWRpLXBsYWludGV4dC1hcm91bmQtaW5saW5lLXBsYWludGV4dC1leHBl Y3RlZC5odG1sCkBAIC0wLDAgKzEsMjcgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+CisgIDxo ZWFkPgorICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ii8+CisgICAgPHN0eWxlPgorICAgICAgYm9k eSB7CisgICAgICAgIGZvbnQtc2l6ZToyZW07CisgICAgICAgIHRleHQtYWxpZ246bGVmdDsKKyAg ICAgIH0KKyAgICAgIC5yZWYgeworICAgICAgICBib3JkZXI6IG1lZGl1bSBzb2xpZCBncmF5Owor ICAgICAgICBwYWRkaW5nOiAxMHB4OworICAgICAgICB3aWR0aDogNDAwcHg7CisgICAgICAgIG1h cmdpbjogMjBweDsKKyAgICAgIH0KKyAgICAgIC5wbGFpbnRleHQgeworICAgICAgICB1bmljb2Rl LWJpZGk6IC13ZWJraXQtcGxhaW50ZXh0OworICAgICAgfQorICAgIDwvc3R5bGU+CisgIDwvaGVh ZD4KKyAgPGJvZHk+CisgICAgPGRpdiBjbGFzcz0icmVmIj4KKyAgICAgICYjeDA1RDA7LT4mcmxt OyA9PSA9PSA9PT4mbHJtOworICAgICAgPGRpdiBkaXI9InJ0bCI+JiN4MDVEMTstPiA9PSA9PSA9 PT48L2Rpdj4KKyAgICA8L2Rpdj4KKyAgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvdW5pY29kZS1iaWRpLXBsYWludGV4dC1h cm91bmQtaW5saW5lLXBsYWludGV4dC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVy bmF0aW9uYWwvdW5pY29kZS1iaWRpLXBsYWludGV4dC1hcm91bmQtaW5saW5lLXBsYWludGV4dC5o dG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLjM2ODU1MGY0NzI1YjVmNzljMjUyYWUzYWU5Y2NmZDZiMjJlNjYwYjUK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC91 bmljb2RlLWJpZGktcGxhaW50ZXh0LWFyb3VuZC1pbmxpbmUtcGxhaW50ZXh0Lmh0bWwKQEAgLTAs MCArMSwyNyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgPGhlYWQ+CisgICAgPG1ldGEg Y2hhcnNldD0idXRmLTgiLz4KKyAgICA8c3R5bGU+CisgICAgICBib2R5IHsKKyAgICAgICAgZm9u dC1zaXplOjJlbTsKKyAgICAgICAgdGV4dC1hbGlnbjpsZWZ0OworICAgICAgfQorICAgICAgLnRl c3QgeworICAgICAgICBib3JkZXI6IG1lZGl1bSBzb2xpZCBncmF5OworICAgICAgICBwYWRkaW5n OiAxMHB4OworICAgICAgICB3aWR0aDogNDAwcHg7CisgICAgICAgIG1hcmdpbjogMjBweDsKKyAg ICAgIH0KKyAgICAgIC5wbGFpbnRleHQgeworICAgICAgICB1bmljb2RlLWJpZGk6IC13ZWJraXQt cGxhaW50ZXh0OworICAgICAgfQorICAgIDwvc3R5bGU+CisgIDwvaGVhZD4KKyAgPGJvZHk+Cisg ICAgPGRpdiBjbGFzcz0idGVzdCI+CisgICAgICA8ZGl2IGNsYXNzPSJwbGFpbnRleHQiPjxzcGFu IGNsYXNzPSJwbGFpbnRleHQiPiYjeDA1RDA7LT48L3NwYW4+ID09ID09ID09PjwvZGl2PgorICAg ICAgPGRpdiBjbGFzcz0icGxhaW50ZXh0Ij48c3Bhbj4mI3gwNUQxOy0+PC9zcGFuPiA9PSA9PSA9 PT48L2Rpdj4KKyAgICA8L2Rpdj4KKyAgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvdW5pY29kZS1iaWRpLXBsYWludGV4dC1u ZXN0ZWQtaXNvbGF0ZS1uZXV0cmFsLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3Rl eHQvaW50ZXJuYXRpb25hbC91bmljb2RlLWJpZGktcGxhaW50ZXh0LW5lc3RlZC1pc29sYXRlLW5l dXRyYWwtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40YWEzZTU3MTNhMDA2ZDM2MTU5MmEzZTlm ZTFmZDM2MTNiODdmMzBjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0 L2ludGVybmF0aW9uYWwvdW5pY29kZS1iaWRpLXBsYWludGV4dC1uZXN0ZWQtaXNvbGF0ZS1uZXV0 cmFsLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwyNiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRt bD4KKyAgPGhlYWQ+CisgICAgPG1ldGEgY2hhcnNldD0idXRmLTgiLz4KKyAgICA8c3R5bGU+Cisg ICAgICBib2R5IHsKKyAgICAgICAgZm9udC1zaXplOjJlbTsKKyAgICAgICAgdGV4dC1hbGlnbjps ZWZ0OworICAgICAgfQorICAgICAgLnJlZiB7CisgICAgICAgIGJvcmRlcjogbWVkaXVtIHNvbGlk IGdyYXk7CisgICAgICAgIHBhZGRpbmc6IDEwcHg7CisgICAgICAgIG1hcmdpbjogMjBweDsKKyAg ICAgIH0KKyAgICA8L3N0eWxlPgorICA8L2hlYWQ+CisgIDxib2R5PgorICAgIDxkaXYgY2xhc3M9 InJlZiI+CisgICAgICA8c3BhbiBkaXI9Imx0ciI+JiN4MDVEMDstPjwvc3Bhbj4KKyAgICAgICA9 PSA9PSA9PT4KKyAgICAgIDxzcGFuIGRpcj0ibHRyIj4mI3gwNUQwOyA9PSA9PT08L3NwYW4+Cisg ICAgICA8c3Bhbj5UZXh0PC9zcGFuPgorICAgICAgPHNwYW4+JiN4MDVEMDs8L3NwYW4+CisgICAg PC9kaXY+CisgIDwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv dGV4dC9pbnRlcm5hdGlvbmFsL3VuaWNvZGUtYmlkaS1wbGFpbnRleHQtbmVzdGVkLWlzb2xhdGUt bmV1dHJhbC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvdW5pY29k ZS1iaWRpLXBsYWludGV4dC1uZXN0ZWQtaXNvbGF0ZS1uZXV0cmFsLmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u ZjQ3OTYwNzc5M2Y0ZWQ1NTdjZWM3ODE2NWZiNDVhOWU1YzcxZDc4MgotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL3VuaWNvZGUtYmlkaS1wbGFp bnRleHQtbmVzdGVkLWlzb2xhdGUtbmV1dHJhbC5odG1sCkBAIC0wLDAgKzEsMzMgQEAKKzwhRE9D VFlQRSBodG1sPgorPGh0bWw+CisgIDxoZWFkPgorICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ii8+ CisgICAgPHN0eWxlPgorICAgICAgYm9keSB7CisgICAgICAgIGZvbnQtc2l6ZToyZW07CisgICAg ICAgIHRleHQtYWxpZ246bGVmdDsKKyAgICAgIH0KKyAgICAgIC50ZXN0IHsKKyAgICAgICAgYm9y ZGVyOiBtZWRpdW0gc29saWQgZ3JheTsKKyAgICAgICAgcGFkZGluZzogMTBweDsKKyAgICAgICAg bWFyZ2luOiAyMHB4OworICAgICAgfQorICAgICAgLnBsYWludGV4dCB7CisgICAgICAgIHVuaWNv ZGUtYmlkaTogLXdlYmtpdC1wbGFpbnRleHQ7CisgICAgICB9CisgICAgICAuaXNvbGF0ZSB7Cisg ICAgICAgIHVuaWNvZGUtYmlkaTogLXdlYmtpdC1pc29sYXRlOworICAgICAgfQorICAgIDwvc3R5 bGU+CisgIDwvaGVhZD4KKyAgPGJvZHk+CisgICAgPGRpdiBjbGFzcz0idGVzdCI+CisgICAgICA8 ZGl2IGNsYXNzPSJwbGFpbnRleHQiPgorICAgICAgPHNwYW4gY2xhc3M9Imlzb2xhdGUiPiYjeDA1 RDA7LT48L3NwYW4+CisgICAgICA9PSA9PSA9PT4KKyAgICAgIDxzcGFuIGNsYXNzPSJpc29sYXRl Ij4mI3gwNUQwOyA9PSA9PT08L3NwYW4+CisgICAgICA8c3Bhbj5UZXh0PC9zcGFuPgorICAgICAg PHNwYW4+JiN4MDVEMDs8L3NwYW4+CisgICAgPC9kaXY+CisgIDwvYm9keT4KKzwvaHRtbD4K