3733 2005-06-27 05:16:59 -0700 Incorrect bidi layout of ETs, ANs, and ENs in some contexts 2005-11-04 00:43:11 -0800 1 1 1 Unclassified WebKit Layout and Rendering 412 Mac OS X 10.4 CLOSED FIXED P2 Normal --- 3838 1 mitz hyatt oldest_to_newest 13296 0 mitz 2005-06-27 05:17:01 -0700 The testcase for this bug includes various bidi sequences that WebKit lays out in the wrong order, and other sequences that should be included in a layout test even though they're currently laid out as expected. Firefox renders everything as expected. Some of the testcases are based on the KHTML bidi layout test <http://websvn.kde.org/*checkout*/ trunk/tests/khtmltests/i18n/bidi.html?rev=409208>. (It uses directional overrides to display the expected layout, and WebKit doesn't handle them correctly, so the KHTML layout test can't be used as a WebKit layout test as-is). 13298 1 2667 mitz 2005-06-27 05:19:05 -0700 Created attachment 2667 Testcase 13299 2 2668 mitz 2005-06-27 05:22:42 -0700 Created attachment 2668 Proposed fix The proposed patch makes both the testcase and the KHTML layout test render as expected. It makes 12 of the layout tests fail, because it splits a few runs, but they render the same with it. It is possible, alternatively, to not split those runs and in fact merge many other currently-split runs (bidi.cpp:922), but then over 100 layout tests will fail and will have to be checked. I haven't tested the patch with "compact runs". I don't know what they are nor how to make them appear. 13300 3 mitz 2005-06-27 05:24:58 -0700 The proposed fix also addresses bug 3725. 13329 4 joost 2005-06-27 10:35:15 -0700 related to http://bugzilla.opendarwin.org/show_bug.cgi?id=3725 as seen in the comments. 13380 5 darin 2005-06-27 16:39:16 -0700 I like the idea of not splitting runs -- I'd love to see that patch landed after this one, even though it would affect a lot of layout tests. 13388 6 2668 darin 2005-06-27 17:41:12 -0700 Comment on attachment 2668 Proposed fix With a sizable patch like this, it would be nice if the new code fit our coding style guidelines <http://webkit.opendarwin.org/coding/coding-style.html>. I don't think it's good style to leave behind commented-out lines of code. That having been said, as long as the layout test results are still good, then it seems fine to land this. Unfortunately I don't know the concepts well enough to review this for real, but I don't think any of the reviewers do at the moment. I'd still very much like to see the version of this that makes fewer runs landed eventually. 13421 7 2685 mitz 2005-06-28 06:30:11 -0700 Created attachment 2685 Proposed fix Improved coding style. 13424 8 mitz 2005-06-28 06:43:41 -0700 (In reply to comment #6) > I'd still very much like to see the version of this that makes fewer runs > landed eventually. Going over those 130 or so failed layout tests could be easier if there was a tool that rendered any given layout test into a PNG. Even if the expected renderings weren't committed to the source tree (as they do in KHTML), it would still be possible to "flash" between the old and new renderings and verify that the differences, if any, are acceptable (when runs are merged, sometimes type moves a little horizontally, probably due to rounding). 13430 9 2685 darin 2005-06-28 10:42:41 -0700 Comment on attachment 2685 Proposed fix There are still some "if(" in here with no space, but looks ready to land to me, I guess. r=me 13496 10 ggaren 2005-06-29 12:01:05 -0700 This patch "breaks" the following layout tests: css1/basic/containment css1/box_properties/float_on_text_elements css1/font_properties/font css1/formatting_model/inline_elements css1/pseudo/anchor expected editing/style/relative-font-size-change-001 editing/style/relative-font-size-change-004 fast/block/basic/018 fast/invalid/nestedh3s fast/js/date-parse-test fast/lists/003 fast/selectors/166 fast/text/basic/004 Is this intended, or review- ? 13498 11 mitz 2005-06-29 12:14:47 -0700 (In reply to comment #10) > This patch "breaks" the following layout tests: > > css1/basic/containment > css1/box_properties/float_on_text_elements > css1/font_properties/font > css1/formatting_model/inline_elements > css1/pseudo/anchor expected > editing/style/relative-font-size-change-001 > editing/style/relative-font-size-change-004 > fast/block/basic/018 > fast/invalid/nestedh3s > fast/js/date-parse-test > fast/lists/003 > fast/selectors/166 > fast/text/basic/004 > > Is this intended, or review- ? fast/js/date-parse-test wasn't broken by this patch (see bug 3762). As for the others, see comment #2. I think those few split runs are acceptable (in most cases rendering isn't affected at all, and in others text moves by fractions of a pixel). 13505 12 hyatt 2005-06-29 13:38:19 -0700 Why do we need to split the runs? Can't the old behavior be preserved? 13506 13 mitz 2005-06-29 13:45:00 -0700 (In reply to comment #12) > Why do we need to split the runs? Can't the old behavior be preserved? We can avoid the splits, but the most straightforward way to do that (see patched bidi.cpp:922) would also fix a ton of other unnecessary splits that currently occur. I can try to replicate the old behavior (it will probably require an extra field in bidi.status just for that), but why is it important? 13511 14 mitz 2005-06-29 14:48:56 -0700 To elaborate on comment #13, old behavior was to split whenever there's EN followed by L (such as in "over 15px"). However, if the EN was at the beginning of the line (or immediately followed an L, such as in "PPC640e") then the EN would change to an L and the split wouldn't happen. It is only under those rare circumstances that the patch behaves differently, because the patch prevents the changing of EN into L. The reason for not changing EN into L is that in L EN ET AN you need to know that the EN really was an EN and not an L, since it affects the ET differently. 13634 15 hyatt 2005-07-01 15:43:33 -0700 Ok, sounds good. Can we get a followup bug filed on the work to fix these splits + the other unnecessary ones? 13789 16 mitz 2005-07-03 06:38:35 -0700 (In reply to comment #15) > Ok, sounds good. Can we get a followup bug filed on the work to fix these splits + the other unnecessary > ones? > Done. bug 3838 2667 2005-06-27 05:19:05 -0700 2005-06-27 05:19:05 -0700 Testcase 3733_testcase.html text/html 10020 mitz /v8APAAhAEQATwBDAFQAWQBQAEUAIABIAFQATQBMACAAUABVAEIATABJAEMAIAAiAC0ALwAvAFcA MwBDAC8ALwBEAFQARAAgAEgAVABNAEwAIAA0AC4AMAAxACAAVAByAGEAbgBzAGkAdABpAG8AbgBh AGwALwAvAEUATgAiACAACgAiAGgAdAB0AHAAOgAvAC8AdwB3AHcALgB3ADMALgBvAHIAZwAvAFQA UgAvAGgAdABtAGwANAAvAGwAbwBvAHMAZQAuAGQAdABkACIAPgAKADwAaAB0AG0AbAA+AA0ACgA8 AGgAZQBhAGQAPgANAAoAPAB0AGkAdABsAGUAPgBCAGkAZABpACAAYgB1AGcAcwA8AC8AdABpAHQA bABlAD4ACgA8AHMAdAB5AGwAZQAgAHQAeQBwAGUAPQAiAHQAZQB4AHQALwBjAHMAcwAiAD4ACgAu AHIAaQBnAGgAdAAgAHsAIABkAGkAcgBlAGMAdABpAG8AbgA6AHIAdABsADsAIAB9AAoAPAAvAHMA dAB5AGwAZQA+AA0ACgA8AC8AaABlAGEAZAA+AA0ACgA8AGIAbwBkAHkAPgAKADwAIQAtAC0AIABi AHIAbwBrAGUAbgAgAGkAbgAgAFcAZQBiAEsAaQB0AC0ANAAxADIAIAAtAC0APgAKADwAcAAgAGMA bABhAHMAcwA9ACIAcgBpAGcAaAB0ACIAPgAKACwAIAAxADIAMwAgACYAIwB4ADAANQBkADAAOwAm ACMAeAAwADUAZAAxADsAJgAjAHgAMAA1AGQAMgA7AAoAPAAvAHAAPgAKADwAIQAtAC0AIABSACAA bgAgAEUAVAAgAEUATgAgAC0ALQA+AAoAPABwACAAYwBsAGEAcwBzAD0AIgByAGkAZwBoAHQAIgA+ ACYAIwB4ADAANQBkADAAOwAgACQAMQA8AC8AcAA+AAoAPAAhAC0ALQAgAFIAIABuACAARQBUACAA RQBUACAARQBOACAALQAtAD4ACgA8AHAAIABjAGwAYQBzAHMAPQAiAHIAaQBnAGgAdAAiAD4AJgAj AHgAMAA1AGQAMAA7ACAAJAAkADEAPAAvAHAAPgAKAAoAPAAhAC0ALQAgAFIAIABFAFQAIABFAFQA IABFAE4AIAAtAC0APgAKADwAcAAgAGMAbABhAHMAcwA9ACIAcgBpAGcAaAB0ACIAPgAmACMAeAAw ADUAZAAwADsAJAAkADEAPAAvAHAAPgAKAAoAPAAhAC0ALQAgAHMAbwByACAAbgAgAEUAVAAgAG4A IABFAE4AIAAtAC0APgAKADwAcAAgAGMAbABhAHMAcwA9ACIAcgBpAGcAaAB0ACIAPgAqACQAIAAx ADwALwBwAD4ACgA8ACEALQAtACAAcwBvAHIAIABuACAARQBUACAARQBUACAAbgAgAEUATgAgAC0A LQA+AAoAPABwACAAYwBsAGEAcwBzAD0AIgByAGkAZwBoAHQAIgA+ACoAJAAkACAAMQA8AC8AcAA+ AAoAPAAhAC0ALQAgAHMAbwByACAAbgAgAEUAVAAgAEUATgAgAC0ALQA+AAoAPABwACAAYwBsAGEA cwBzAD0AIgByAGkAZwBoAHQAIgA+ACoAJAAxADwALwBwAD4ACgA8ACEALQAtACAAcwBvAHIAIABu ACAARQBUACAARQBUACAARQBOACAALQAtAD4ACgA8AHAAIABjAGwAYQBzAHMAPQAiAHIAaQBnAGgA dAAiAD4AKgAkACQAMQA8AC8AcAA+AAoAPAAhAC0ALQAgAHMAbwByACAARQBUACAAbgAgAEUATgAg AC0ALQA+AAoAPABwACAAYwBsAGEAcwBzAD0AIgByAGkAZwBoAHQAIgA+ACQAIAAxADwALwBwAD4A CgA8ACEALQAtACAAcwBvAHIAIABFAFQAIABFAFQAIABuACAARQBOACAALQAtAD4ACgA8AHAAIABj AGwAYQBzAHMAPQAiAHIAaQBnAGgAdAAiAD4AJAAkACAAMQA8AC8AcAA+AAoACgA8ACEALQAtACAA RQBOACAAbgAgAEUAVAAgAG4AIABFAE4AIAAtAC0APgAKADwAcAAgAGMAbABhAHMAcwA9ACIAcgBp AGcAaAB0ACIAPgAwACAAJAAgADEAPAAvAHAAPgAKADwAIQAtAC0AIABFAE4AIABuACAARQBUACAA RQBUACAAbgAgAEUATgAgAC0ALQA+AAoAPABwACAAYwBsAGEAcwBzAD0AIgByAGkAZwBoAHQAIgA+ ADAAIAAkACQAIAAxADwALwBwAD4ACgA8ACEALQAtACAARQBOACAAbgAgAEUAVAAgAEUATgAgAC0A LQA+AAoAPABwACAAYwBsAGEAcwBzAD0AIgByAGkAZwBoAHQAIgA+ADAAIAAkADEAPAAvAHAAPgAK ADwAIQAtAC0AIABFAE4AIABuACAARQBUACAARQBUACAARQBOACAALQAtAD4ACgA8AHAAIABjAGwA YQBzAHMAPQAiAHIAaQBnAGgAdAAiAD4AMAAgACQAJAAxADwALwBwAD4ACgAKADwAIQAtAC0AIABu AG8AdAAgAGIAcgBvAGsAZQBuACAAaQBuACAAVwBlAGIASwBpAHQALQA0ADEAMgAgAGIAdQB0ACAA cwBoAG8AdQBsAGQAIABiAGUAIAB0AGUAcwB0AGUAZAAgAC0ALQA+AAoACgA8ACEALQAtACAAUgAg AG4AIABFAFQAIABuACAARQBOACAALQAtAD4ACgA8AHAAIABjAGwAYQBzAHMAPQAiAHIAaQBnAGgA dAAiAD4AJgAjAHgAMAA1AGQAMAA7ACAAJAAgADEAPAAvAHAAPgAKADwAIQAtAC0AIABSACAAbgAg AEUAVAAgAEUAVAAgAG4AIABFAE4AIAAtAC0APgAKADwAcAAgAGMAbABhAHMAcwA9ACIAcgBpAGcA aAB0ACIAPgAmACMAeAAwADUAZAAwADsAIAAkACQAIAAxADwALwBwAD4ACgA8ACEALQAtACAAUgAg AEUAVAAgAG4AIABFAE4AIAAtAC0APgAKADwAcAAgAGMAbABhAHMAcwA9ACIAcgBpAGcAaAB0ACIA PgAmACMAeAAwADUAZAAwADsAJAAgADEAPAAvAHAAPgAKADwAIQAtAC0AIABSACAARQBUACAARQBU ACAAbgAgAEUATgAgAC0ALQA+AAoAPABwACAAYwBsAGEAcwBzAD0AIgByAGkAZwBoAHQAIgA+ACYA IwB4ADAANQBkADAAOwAkACQAIAAxADwALwBwAD4ACgA8ACEALQAtACAAUgAgAEUAVAAgAEUATgAg AC0ALQA+AAoAPABwACAAYwBsAGEAcwBzAD0AIgByAGkAZwBoAHQAIgA+ACYAIwB4ADAANQBkADAA OwAkADEAPAAvAHAAPgAKAAoACgA8ACEALQAtACAAcwBvAHIAIABFAFQAIABFAE4AIAAtAC0APgAK ADwAcAAgAGMAbABhAHMAcwA9ACIAcgBpAGcAaAB0ACIAPgAkADEAPAAvAHAAPgAKADwAIQAtAC0A IABzAG8AcgAgAEUAVAAgAEUAVAAgAEUATgAgAC0ALQA+AAoAPABwACAAYwBsAGEAcwBzAD0AIgBy AGkAZwBoAHQAIgA+ACQAJAAxADwALwBwAD4ACgAKADwAIQAtAC0AIABMACAAbgAgAEUAVAAgAG4A IABFAE4AIAAtAC0APgAKADwAcAAgAGMAbABhAHMAcwA9ACIAcgBpAGcAaAB0ACIAPgBhACAAJAAg ADEAPAAvAHAAPgAKADwAIQAtAC0AIABMACAAbgAgAEUAVAAgAEUAVAAgAG4AIABFAE4AIAAtAC0A PgAKADwAcAAgAGMAbABhAHMAcwA9ACIAcgBpAGcAaAB0ACIAPgBhACAAJAAkACAAMQA8AC8AcAA+ AAoAPAAhAC0ALQAgAEwAIABuACAARQBUACAARQBOACAALQAtAD4ACgA8AHAAIABjAGwAYQBzAHMA PQAiAHIAaQBnAGgAdAAiAD4AYQAgACQAMQA8AC8AcAA+AAoAPAAhAC0ALQAgAEwAIABuACAARQBU ACAARQBUACAARQBOACAALQAtAD4ACgA8AHAAIABjAGwAYQBzAHMAPQAiAHIAaQBnAGgAdAAiAD4A YQAgACQAJAAxADwALwBwAD4ACgA8ACEALQAtACAATAAgAEUAVAAgAG4AIABFAE4AIAAtAC0APgAK ADwAcAAgAGMAbABhAHMAcwA9ACIAcgBpAGcAaAB0ACIAPgBhACQAIAAxADwALwBwAD4ACgA8ACEA LQAtACAATAAgAEUAVAAgAEUAVAAgAG4AIABFAE4AIAAtAC0APgAKADwAcAAgAGMAbABhAHMAcwA9 ACIAcgBpAGcAaAB0ACIAPgBhACQAJAAgADEAPAAvAHAAPgAKADwAIQAtAC0AIABMACAARQBUACAA RQBOACAALQAtAD4ACgA8AHAAIABjAGwAYQBzAHMAPQAiAHIAaQBnAGgAdAAiAD4AYQAkADEAPAAv AHAAPgAKADwAIQAtAC0AIABMACAARQBUACAARQBUACAARQBOACAALQAtAD4ACgA8AHAAIABjAGwA YQBzAHMAPQAiAHIAaQBnAGgAdAAiAD4AYQAkACQAMQA8AC8AcAA+AAoACgA8ACEALQAtACAARQBO ACAARQBUACAAbgAgAEUATgAgAC0ALQA+AAoAPABwACAAYwBsAGEAcwBzAD0AIgByAGkAZwBoAHQA IgA+ADAAJAAgADEAPAAvAHAAPgAKADwAIQAtAC0AIABFAE4AIABFAFQAIABFAFQAIABuACAARQBO ACAALQAtAD4ACgA8AHAAIABjAGwAYQBzAHMAPQAiAHIAaQBnAGgAdAAiAD4AMAAkACQAIAAxADwA LwBwAD4ACgA8ACEALQAtACAARQBOACAARQBUACAARQBOACAALQAtAD4ACgA8AHAAIABjAGwAYQBz AHMAPQAiAHIAaQBnAGgAdAAiAD4AMAAkADEAPAAvAHAAPgAKADwAIQAtAC0AIABFAE4AIABFAFQA IABFAFQAIABFAE4AIAAtAC0APgAKADwAcAAgAGMAbABhAHMAcwA9ACIAcgBpAGcAaAB0ACIAPgAw ACQAJAAxADwALwBwAD4ACgAKADwAIQAtAC0AIABiAG8AcgBrAGUAbgAgAGkAbgAgAFcAZQBiAEsA aQB0AC0ANAAxADIAIAAtAC0APgAKAAoAPAAhAC0ALQAgAFIAIABuACAARQBUACAARQBOACAALQAt AD4ACgA8AHAAPgAmACMAeAAwADUAZAAwADsAIAAkADEAPAAvAHAAPgAKADwAIQAtAC0AIABSACAA bgAgAEUAVAAgAEUAVAAgAEUATgAgAC0ALQA+AAoAPABwAD4AJgAjAHgAMAA1AGQAMAA7ACAAJAAk ADEAPAAvAHAAPgAKAAoAPAAhAC0ALQAgAFIAIABFAFQAIABFAFQAIABFAE4AIAAtAC0APgAKADwA cAA+ACYAIwB4ADAANQBkADAAOwAkACQAMQA8AC8AcAA+AAoACgA8ACEALQAtACAAbgBvAHQAIABi AHIAbwBrAGUAbgAgAGkAbgAgAFcAZQBiAEsAaQB0AC0ANAAxADIAIABiAHUAdAAgAHMAaABvAHUA bABkACAAYgBlACAAdABlAHMAdABlAGQAIAAtAC0APgAKAAoAPAAhAC0ALQAgAFIAIABuACAARQBU ACAAbgAgAEUATgAgAC0ALQA+AAoAPABwAD4AJgAjAHgAMAA1AGQAMAA7ACAAJAAgADEAPAAvAHAA PgAKADwAIQAtAC0AIABSACAAbgAgAEUAVAAgAEUAVAAgAG4AIABFAE4AIAAtAC0APgAKADwAcAA+ ACYAIwB4ADAANQBkADAAOwAgACQAJAAgADEAPAAvAHAAPgAKADwAIQAtAC0AIABSACAARQBUACAA bgAgAEUATgAgAC0ALQA+AAoAPABwAD4AJgAjAHgAMAA1AGQAMAA7ACQAIAAxADwALwBwAD4ACgA8 ACEALQAtACAAUgAgAEUAVAAgAEUAVAAgAG4AIABFAE4AIAAtAC0APgAKADwAcAA+ACYAIwB4ADAA NQBkADAAOwAkACQAIAAxADwALwBwAD4ACgA8ACEALQAtACAAUgAgAEUAVAAgAEUATgAgAC0ALQA+ AAoAPABwAD4AJgAjAHgAMAA1AGQAMAA7ACQAMQA8AC8AcAA+AAoACgA8ACEALQAtACAAcwBvAHIA IABuACAARQBUACAAbgAgAEUATgAgAC0ALQA+AAoAPABwAD4AKgAkACAAMQA8AC8AcAA+AAoAPAAh AC0ALQAgAHMAbwByACAAbgAgAEUAVAAgAEUAVAAgAG4AIABFAE4AIAAtAC0APgAKADwAcAA+ACoA JAAkACAAMQA8AC8AcAA+AAoAPAAhAC0ALQAgAHMAbwByACAAbgAgAEUAVAAgAEUATgAgAC0ALQA+ AAoAPABwAD4AKgAkADEAPAAvAHAAPgAKADwAIQAtAC0AIABzAG8AcgAgAG4AIABFAFQAIABFAFQA IABFAE4AIAAtAC0APgAKADwAcAA+ACoAJAAkADEAPAAvAHAAPgAKADwAIQAtAC0AIABzAG8AcgAg AEUAVAAgAG4AIABFAE4AIAAtAC0APgAKADwAcAA+ACQAIAAxADwALwBwAD4ACgA8ACEALQAtACAA cwBvAHIAIABFAFQAIABFAFQAIABuACAARQBOACAALQAtAD4ACgA8AHAAPgAkACQAIAAxADwALwBw AD4ACgA8ACEALQAtACAAcwBvAHIAIABFAFQAIABFAE4AIAAtAC0APgAKADwAcAA+ACQAMQA8AC8A cAA+AAoAPAAhAC0ALQAgAHMAbwByACAARQBUACAARQBUACAARQBOACAALQAtAD4ACgA8AHAAPgAk ACQAMQA8AC8AcAA+AAoACgA8ACEALQAtACAATAAgAG4AIABFAFQAIABuACAARQBOACAALQAtAD4A CgA8AHAAPgBhACAAJAAgADEAPAAvAHAAPgAKADwAIQAtAC0AIABMACAAbgAgAEUAVAAgAEUAVAAg AG4AIABFAE4AIAAtAC0APgAKADwAcAA+AGEAIAAkACQAIAAxADwALwBwAD4ACgA8ACEALQAtACAA TAAgAG4AIABFAFQAIABFAE4AIAAtAC0APgAKADwAcAA+AGEAIAAkADEAPAAvAHAAPgAKADwAIQAt AC0AIABMACAAbgAgAEUAVAAgAEUAVAAgAEUATgAgAC0ALQA+AAoAPABwAD4AYQAgACQAJAAxADwA LwBwAD4ACgA8ACEALQAtACAATAAgAEUAVAAgAG4AIABFAE4AIAAtAC0APgAKADwAcAA+AGEAJAAg ADEAPAAvAHAAPgAKADwAIQAtAC0AIABMACAARQBUACAARQBUACAAbgAgAEUATgAgAC0ALQA+AAoA PABwAD4AYQAkACQAIAAxADwALwBwAD4ACgA8ACEALQAtACAATAAgAEUAVAAgAEUATgAgAC0ALQA+ AAoAPABwAD4AYQAkADEAPAAvAHAAPgAKADwAIQAtAC0AIABMACAARQBUACAARQBUACAARQBOACAA LQAtAD4ACgA8AHAAPgBhACQAJAAxADwALwBwAD4ACgAKADwAIQAtAC0AIABFAE4AIABuACAARQBU ACAAbgAgAEUATgAgAC0ALQA+AAoAPABwAD4AMAAgACQAIAAxADwALwBwAD4ACgA8ACEALQAtACAA RQBOACAAbgAgAEUAVAAgAEUAVAAgAG4AIABFAE4AIAAtAC0APgAKADwAcAA+ADAAIAAkACQAIAAx ADwALwBwAD4ACgA8ACEALQAtACAARQBOACAAbgAgAEUAVAAgAEUATgAgAC0ALQA+AAoAPABwAD4A MAAgACQAMQA8AC8AcAA+AAoAPAAhAC0ALQAgAEUATgAgAG4AIABFAFQAIABFAFQAIABFAE4AIAAt AC0APgAKADwAcAA+ADAAIAAkACQAMQA8AC8AcAA+AAoAPAAhAC0ALQAgAEUATgAgAEUAVAAgAG4A IABFAE4AIAAtAC0APgAKADwAcAA+ADAAJAAgADEAPAAvAHAAPgAKADwAIQAtAC0AIABFAE4AIABF AFQAIABFAFQAIABuACAARQBOACAALQAtAD4ACgA8AHAAPgAwACQAJAAgADEAPAAvAHAAPgAKADwA IQAtAC0AIABFAE4AIABFAFQAIABFAE4AIAAtAC0APgAKADwAcAA+ADAAJAAxADwALwBwAD4ACgA8 ACEALQAtACAARQBOACAARQBUACAARQBUACAARQBOACAALQAtAD4ACgA8AHAAPgAwACQAJAAxADwA LwBwAD4ACgAKADwAaAByAD4ACgAKADwAIQAtAC0AIABiAHIAbwBrAGUAbgAgAGkAbgAgAFcAZQBi AEsAaQB0AC0ANAAxADIAIAAtAC0APgAKADwAcAA+AAoAJgAjAHgAMAA1AGQAMAA7ADEALgAKADwA LwBwAD4ACgA8ACEALQAtACAAZQB4AHAAZQBjAHQAIABhAGIAYwAgAEEAcgBhAHIAYgBpAGMALQBu AHUAbQBiAGUAcgBzACAAZABlAGYAIAAtAC0APgAKADwAcAAgAGMAbABhAHMAcwA9ACIAcgBpAGcA aAB0ACIAPgAKAGQAZQBmACAAJgAjAHgAMAA2ADYAMQA7ACYAIwB4ADAANgA2ADIAOwAmACMAeAAw ADYANgAzADsAIABhAGIAYwAKADwALwBwAD4ACgA8ACEALQAtACAAZQB4AHAAZQBjAHQAIABBAHIA YQByAGIAaQBjAC0AbgB1AG0AYgBlAHIAcwBhAGIAYwAgAGQAZQBmACAALQAtAD4ACgA8AHAAIABj AGwAYQBzAHMAPQAiAHIAaQBnAGgAdAAiAD4ACgBkAGUAZgAgACYAIwB4ADAANgA2ADEAOwAmACMA eAAwADYANgAyADsAJgAjAHgAMAA2ADYAMwA7AGEAYgBjAAoAPAAvAHAAPgAKAAoAPAAhAC0ALQAg AHIAZQBnAHIAZQBzAHMAaQBvAG4AIABpAG4AIABiAGkAZABpAC4AYwBwAHAAIAByADEALgAxADIA NwAgAC0ALQA+AAoAPABwAD4ACgAmACMAeAAwADUAZAAwADsAMQAKADwALwBwAD4ACgAKADwAIQAt AC0AIABiAHIAbwBrAGUAbgAgAGkAbgAgAFcAZQBiAEsAaQB0AC0ANAAxADIAIAAtAC0APgAKAAoA CgA8AHAAIABjAGwAYQBzAHMAPQAiAHIAaQBnAGgAdAAiAD4ACgBhAGIAYwAgACYAIwB4ADAANgA2 ADEAOwAmACMAeAAwADYANgAyADsAJgAjAHgAMAA2ADYAMwA7AAoAPAAvAHAAPgAKADwAcAAgAGMA bABhAHMAcwA9ACIAcgBpAGcAaAB0ACIAPgAKACYAbgBiAHMAcAA7ACQAMQAyADMACgA8AC8AcAA+ AAoAPABwACAAYwBsAGEAcwBzAD0AIgByAGkAZwBoAHQAIgA+AAoAYQBiAGMAJAAmACMAeAAwADYA NgAxADsAJgAjAHgAMAA2ADYAMgA7ACYAIwB4ADAANgA2ADMAOwAKADwALwBwAD4ACgA8AHAAIABj AGwAYQBzAHMAPQAiAHIAaQBnAGgAdAAiAD4ACgBhADEAIAAkACYAIwB4ADAANgA2ADEAOwAmACMA eAAwADYANgAyADsAJgAjAHgAMAA2ADYAMwA7AAoAPAAvAHAAPgAKADwAcAAgAGMAbABhAHMAcwA9 ACIAcgBpAGcAaAB0ACIAPgAKACYAbgBiAHMAcAA7ACYAIwB4ADAANgA2ADEAOwAmACMAeAAwADYA NgAyADsAJgAjAHgAMAA2ADYAMwA7AAoAPAAvAHAAPgAKADwAcAAgAGMAbABhAHMAcwA9ACIAcgBp AGcAaAB0ACIAPgAKACQAJgAjAHgAMAA2ADYAMQA7ACYAIwB4ADAANgA2ADIAOwAmACMAeAAwADYA NgAzADsACgA8AC8AcAA+AAoAPABwACAAYwBsAGEAcwBzAD0AIgByAGkAZwBoAHQAIgA+AAoAJgBu AGIAcwBwADsAJAAmACMAeAAwADYANgAxADsAJgAjAHgAMAA2ADYAMgA7ACYAIwB4ADAANgA2ADMA OwAKADwALwBwAD4ACgA8AHAAIABjAGwAYQBzAHMAPQAiAHIAaQBnAGgAdAAiAD4ACgAkACQAJgAj AHgAMAA2ADYAMQA7ACYAIwB4ADAANgA2ADIAOwAmACMAeAAwADYANgAzADsACgA8AC8AcAA+AAoA PABwACAAYwBsAGEAcwBzAD0AIgByAGkAZwBoAHQAIgA+AAoAJgBuAGIAcwBwADsAJAAkACYAIwB4 ADAANgA2ADEAOwAmACMAeAAwADYANgAyADsAJgAjAHgAMAA2ADYAMwA7AAoAPAAvAHAAPgAKADwA cAAgAGMAbABhAHMAcwA9ACIAcgBpAGcAaAB0ACIAPgAKACYAbgBiAHMAcAA7ACYAbgBiAHMAcAA7 ACYAbgBiAHMAcAA7ACYAIwB4ADAANgA2ADEAOwAmACMAeAAwADYANgAyADsAJgAjAHgAMAA2ADYA MwA7AAoAPAAvAHAAPgAKADwAIQAtAC0AIABlAHgAcABlAGMAdAAgAEMAQgBBACAAMQAyADMAYQAg AC0ALQA+AAoAPABwACAAYwBsAGEAcwBzAD0AIgByAGkAZwBoAHQAIgA+AAoAMQAyADMAYQAgACYA IwB4ADAANQBkADAAOwAmACMAeAAwADUAZAAxADsAJgAjAHgAMAA1AGQAMgA7AAoAPAAvAHAAPgAK ADwAIQAtAC0AIABlAHgAcABlAGMAdAAgAEMAQgBBACAAKwAxADIAMwBhACAALQAtAD4ACgA8AHAA IABjAGwAYQBzAHMAPQAiAHIAaQBnAGgAdAAiAD4ACgAxADIAMwBhACsAIAAmACMAeAAwADUAZAAw ADsAJgAjAHgAMAA1AGQAMQA7ACYAIwB4ADAANQBkADIAOwAKADwALwBwAD4ACgA8ACEALQAtACAA ZQB4AHAAZQBjAHQAIABGAEUARAAgACwAMQArADUALgAyAHgAIABDAEIAQQAgAC0ALQA+AAoAPABw ACAAYwBsAGEAcwBzAD0AIgByAGkAZwBoAHQAIgA+AAoAJgAjAHgAMAA1AGQAMAA7ACYAIwB4ADAA NQBkADEAOwAmACMAeAAwADUAZAAyADsAIAAxACsANQAuADIAeAAsACAAJgAjAHgAMAA1AGQAMwA7 ACYAIwB4ADAANQBkADQAOwAmACMAeAAwADUAZAA1ADsACgA8AC8AcAA+AAoACgA8ACEALQAtACAA bgBvAHQAIABiAG8AcgBrAGUAbgAgAGIAdQB0ACAAbgBvAHQAIABpAG4AIABhAG4AeQAgAG8AZgAg AHQAaABlACAAYwB1AHIAcgBlAG4AdAAgAGwAYQB5AG8AdQB0ACAAdABlAHMAdABzACAALQAtAD4A CgA8AHAAIABjAGwAYQBzAHMAPQAiAHIAaQBnAGgAdAAiAD4ACgAmACMAeAAwADUAZAAwADsAMQAK ADwALwBwAD4ACgA8AHAAIABjAGwAYQBzAHMAPQAiAHIAaQBnAGgAdAAiAD4ACgAmACMAeAAwADUA ZAAwADsAMQAuAAoAPAAvAHAAPgAKADwAcAAgAGMAbABhAHMAcwA9ACIAcgBpAGcAaAB0ACIAPgAK AGEAYgBjACYAIwB4ADAANQBkADAAOwAmACMAeAAwADUAZAAxADsAJgAjAHgAMAA1AGQAMgA7AAoA PAAvAHAAPgAKAAoAPAAhAC0ALQAgAGUAeABwAGUAYwB0ACAAYQBiAGMAIAAxADIAMwBkAGUAZgAg AC0ALQA+AAoAPABwACAAYwBsAGEAcwBzAD0AIgByAGkAZwBoAHQAIgA+AAoAYQBiAGMAIAAxADIA MwBkAGUAZgAKADwALwBwAD4ACgA8ACEALQAtACAAZQB4AHAAZQBjAHQAIABhAGIAYwAgADEAMgAz ACAAZABlAGYAIAAtAC0APgAKADwAcAAgAGMAbABhAHMAcwA9ACIAcgBpAGcAaAB0ACIAPgAKAGEA YgBjACAAMQAyADMAIABkAGUAZgAKADwALwBwAD4ACgA8ACEALQAtACAAZQB4AHAAZQBjAHQAIABh AGIAYwAgADEAMgAzACAALQAtAD4ACgA8AHAAIABjAGwAYQBzAHMAPQAiAHIAaQBnAGgAdAAiAD4A CgAxADIAMwAgAGEAYgBjAAoAPAAvAHAAPgAKADwAIQAtAC0AIABlAHgAcABlAGMAdAAgAGEAYgBj ACAAMQAyADMAQQAgAGQAZQBmACAALQAtAD4ACgA8AHAAIABjAGwAYQBzAHMAPQAiAHIAaQBnAGgA dAAiAD4ACgBkAGUAZgAgACYAIwB4ADAANQBkADAAOwAxADIAMwAgAGEAYgBjAAoAPAAvAHAAPgAK AAoAPABwACAAYwBsAGEAcwBzAD0AIgByAGkAZwBoAHQAIgA+AAoAYQAxACQAJgAjAHgAMAA2ADYA MQA7ACYAIwB4ADAANgA2ADIAOwAmACMAeAAwADYANgAzADsACgA8AC8AcAA+AAoAPABwACAAYwBs AGEAcwBzAD0AIgByAGkAZwBoAHQAIgA+AAoAYQBiAGMAIAAmACMAeAAwADYAMgA4ADsAJgAjAHgA MAA2ADIAOAA7ACYAIwB4ADAANgAyADgAOwAKADwALwBwAD4ACgA8AHAAIABjAGwAYQBzAHMAPQAi AHIAaQBnAGgAdAAiAD4ACgAxACkAIAAmACMAeAAwADUAZAAwADsACgA8AC8AcAA+AAoAPABwACAA YwBsAGEAcwBzAD0AIgByAGkAZwBoAHQAIgA+AAoAJgAjAHgAMAA1AGQAMgA7AGEAIAAyACAAJgAj AHgAMAA1AGUAOQA7AAoAPAAvAHAAPgAKADwAIQAtAC0AIABlAHgAcABlAGMAdAAgAEMAQgBBACAA YQAgADEAMgAzACAALQAtAD4ACgA8AHAAIABjAGwAYQBzAHMAPQAiAHIAaQBnAGgAdAAiAD4ACgAx ADIAMwAgAGEAIAAmACMAeAAwADUAZAAwADsAJgAjAHgAMAA1AGQAMQA7ACYAIwB4ADAANQBkADIA OwAKADwALwBwAD4ACgAKADwALwBiAG8AZAB5AD4ACgA8AC8AaAB0AG0AbAA+ 2668 2005-06-27 05:22:42 -0700 2005-06-28 06:30:11 -0700 Proposed fix 3733_patch_r1.txt text/plain 9995 mitz SW5kZXg6IGJpZGkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9XZWJDb3JlL2to dG1sL3JlbmRlcmluZy9iaWRpLmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMzAKZGlmZiAt cCAtdSAtcjEuMTMwIGJpZGkuY3BwCi0tLSBiaWRpLmNwcAkyMDA1LzA2LzI1IDA1OjE3OjMyCTEu MTMwCisrKyBiaWRpLmNwcAkyMDA1LzA2LzI3IDEwOjE0OjI4CkBAIC01NDEsNyArNTQxLDcgQEAg c3RhdGljIHZvaWQgYXBwZW5kUnVuc0Zvck9iamVjdChpbnQgc3RhcgogCiBzdGF0aWMgdm9pZCBh cHBlbmRSdW4oIEJpZGlTdGF0ZSAmYmlkaSApCiB7Ci0gICAgaWYgKCBlbXB0eVJ1biApIHJldHVy bjsKKyAgICBpZiAoIGVtcHR5UnVuIHx8ICFiaWRpLmVvci5vYmogKSByZXR1cm47CiAjaWYgQklE SV9ERUJVRyA+IDEKICAgICBrZERlYnVnKDYwNDEpIDw8ICJhcHBlbmRSdW46IGRpcj0iPDwoaW50 KWRpcjw8ZW5kbDsKICNlbmRpZgpAQCAtODY3LDIxICs4NjcsMTAgQEAgdm9pZCBSZW5kZXJCbG9j azo6YmlkaVJlb3JkZXJMaW5lKGNvbnN0IAogICAgIAogICAgIC8vICAgIGNvbnRleHQtPnJlZigp OwogCi0gICAgZGlyID0gUUNoYXI6OkRpck9OOwotICAgIAotICAgIC8vIEFkb3B0IHRoZSBkaXJl Y3Rpb25hbGl0eSBvZiB0aGUgdGV4dCdzIGVsZW1lbnQgaWYgc3BlY2lmaWVkIGFzIFJUTAotICAg IC8vIGFuZCB0aGUgZmlyc3QgcG9zaXRpb24gaXMgbmV1dHJhbC4KLSAgICBpZiAoc3RhcnQuZGly ZWN0aW9uKCkgPT0gUUNoYXI6OkRpck9OKSB7Ci0gICAgICAgIGlmIChzdGFydC5vYmopIHsKLSAg ICAgICAgICAgIGlmIChzdGFydC5vYmotPnN0eWxlKCktPmRpcmVjdGlvbigpID09IFJUTCkKLSAg ICAgICAgICAgICAgICBkaXIgPSBRQ2hhcjo6RGlyUjsKLSAgICAgICAgfQotICAgICAgICBlbHNl IGlmIChzdHlsZSgpLT5kaXJlY3Rpb24oKSA9PSBSVEwpIHsKLSAgICAgICAgICAgIGRpciA9IFFD aGFyOjpEaXJSOwotICAgICAgICB9Ci0gICAgfQorICAgIGRpciA9IGJpZGkuY29udGV4dC0+ZGly OwogCiAgICAgZW1wdHlSdW4gPSB0cnVlOworICAgIGJpZGkuZW9yLm9iaiA9IDA7CiAKICAgICBu dW1TcGFjZXMgPSAwOwogCkBAIC05MjYsMTQgKzkxNSwxNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpi aWRpUmVvcmRlckxpbmUoY29uc3QgCiAgICAgICAgICAgICAgICAgZGlyID0gUUNoYXI6OkRpckw7 CiAgICAgICAgICAgICBzd2l0Y2goYmlkaS5zdGF0dXMubGFzdCkKICAgICAgICAgICAgICAgICB7 Ci0gICAgICAgICAgICAgICAgY2FzZSBRQ2hhcjo6RGlyTDoKLSAgICAgICAgICAgICAgICAgICAg YmlkaS5lb3IgPSBiaWRpLmN1cnJlbnQ7IGJpZGkuc3RhdHVzLmVvciA9IFFDaGFyOjpEaXJMOyBi cmVhazsKICAgICAgICAgICAgICAgICBjYXNlIFFDaGFyOjpEaXJSOgogICAgICAgICAgICAgICAg IGNhc2UgUUNoYXI6OkRpckFMOgogICAgICAgICAgICAgICAgIGNhc2UgUUNoYXI6OkRpckVOOgog ICAgICAgICAgICAgICAgIGNhc2UgUUNoYXI6OkRpckFOOgorICAgICAgICAgICAgICAgICAgICAv LyB0byBhdm9pZCBtYW55IHVubmNlc3Nhcnkgc3BsaXRzLCB0aGUgZm9sbG93aW5nIGFwcGVuZFJ1 biBjYW4KKyAgICAgICAgICAgICAgICAgICAgLy8gYmUgZG9uZSBvbmx5IGlmIChiaWRpLnN0YXR1 cy5sYXN0ICE9IFFDaGFyOjpEaXJFTiB8fCBiaWRpLnN0YXR1cy5sYXN0U3Ryb25nICE9IFFDaGFy OjpEaXJMICkKICAgICAgICAgICAgICAgICAgICAgYXBwZW5kUnVuKCBiaWRpICk7Ci0gICAgICAg ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICBkaXIgPSBRQ2hhcjo6RGly TDsKKyAgICAgICAgICAgICAgICAgICAgLy8gZmFsbCB0aHJvdWdoCisgICAgICAgICAgICAgICAg Y2FzZSBRQ2hhcjo6RGlyTDoKKyAgICAgICAgICAgICAgICAgICAgYmlkaS5lb3IgPSBiaWRpLmN1 cnJlbnQ7IGJpZGkuc3RhdHVzLmVvciA9IFFDaGFyOjpEaXJMOyBicmVhazsKICAgICAgICAgICAg ICAgICBjYXNlIFFDaGFyOjpEaXJFUzoKICAgICAgICAgICAgICAgICBjYXNlIFFDaGFyOjpEaXJF VDoKICAgICAgICAgICAgICAgICBjYXNlIFFDaGFyOjpEaXJDUzoKQEAgLTk0MiwyOSArOTM0LDQy IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmJpZGlSZW9yZGVyTGluZShjb25zdCAKICAgICAgICAgICAg ICAgICBjYXNlIFFDaGFyOjpEaXJTOgogICAgICAgICAgICAgICAgIGNhc2UgUUNoYXI6OkRpcldT OgogICAgICAgICAgICAgICAgIGNhc2UgUUNoYXI6OkRpck9OOgotICAgICAgICAgICAgICAgICAg ICBpZiggYmlkaS5zdGF0dXMuZW9yICE9IFFDaGFyOjpEaXJMICkgeworICAgICAgICAgICAgICAg ICAgICBpZiAoYmlkaS5zdGF0dXMuZW9yID09IFFDaGFyOjpEaXJFTikgeworICAgICAgICAgICAg ICAgICAgICAgICAgaWYgKGJpZGkuc3RhdHVzLmxhc3RTdHJvbmcgIT0gUUNoYXI6OkRpckwpIHsK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyB0aGUgbnVtYmVycyBuZWVkIHRvIGJlIG9u IGEgaGlnaGVyIGVtYmVkZGluZyBsZXZlbCwgc28gbGV0J3MgY2xvc2UgdGhhdCBydW4KKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICBkaXIgPSBRQ2hhcjo6RGlyRU47CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYXBwZW5kUnVuKGJpZGkpOworICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGlmIChiaWRpLmNvbnRleHQtPmRpciAhPSBRQ2hhcjo6RGlyTCkgeworICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAvLyB0aGUgbmV1dHJhbHMgdGFrZSB0aGUgZW1iZWRkaW5nIGRp cmVjdGlvbiwgd2hpY2ggaXMgUgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBiaWRp LmVvciA9IGJpZGkubGFzdDsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlyID0g UUNoYXI6OkRpclI7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1bihi aWRpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoYmlkaS5zdGF0dXMuZW9yID09 IFFDaGFyOjpEaXJBTikgeworICAgICAgICAgICAgICAgICAgICAgICAgLy8gQXJhYmljIG51bWJl cnMgYXJlIGFsd2F5cyBvbiBhIGhpZ2hlciBlbWJlZGRpbmcgbGV2ZWwsIHNvIGxldCdzIGNsb3Nl IHRoYXQgcnVuCisgICAgICAgICAgICAgICAgICAgICAgICBkaXIgPSBRQ2hhcjo6RGlyQU47Cisg ICAgICAgICAgICAgICAgICAgICAgICBhcHBlbmRSdW4oYmlkaSk7CisgICAgICAgICAgICAgICAg ICAgICAgICBpZiAoYmlkaS5jb250ZXh0LT5kaXIgIT0gUUNoYXI6OkRpckwpIHsKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAvLyB0aGUgbmV1dHJhbHMgdGFrZSB0aGUgZW1iZWRkaW5nIGRp cmVjdGlvbiwgd2hpY2ggaXMgUgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJpZGkuZW9y ID0gYmlkaS5sYXN0OworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpciA9IFFDaGFyOjpE aXJSOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1bihiaWRpKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgfSBlbHNlIGlmKCBiaWRp LnN0YXR1cy5lb3IgIT0gUUNoYXI6OkRpckwgKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAv L2xhc3Qgc3R1ZmYgdGFrZXMgZW1iZWRkaW5nIGRpcgogICAgICAgICAgICAgICAgICAgICAgICAg aWYoYmlkaS5jb250ZXh0LT5kaXIgPT0gUUNoYXI6OkRpckwgfHwgYmlkaS5zdGF0dXMubGFzdFN0 cm9uZyA9PSBRQ2hhcjo6RGlyTCkgeyAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAo IGJpZGkuc3RhdHVzLmVvciAhPSBRQ2hhcjo6RGlyRU4gJiYgYmlkaS5zdGF0dXMuZW9yICE9IFFD aGFyOjpEaXJBTiAmJiBiaWRpLnN0YXR1cy5lb3IgIT0gUUNoYXI6OkRpck9OICkgCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgaWYgKCBiaWRpLnN0YXR1cy5lb3IgIT0gUUNoYXI6OkRpck9O ICkgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXBwZW5kUnVuKCBiaWRpICk7Ci0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgZGlyID0gUUNoYXI6OkRpckw7Ci0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgYmlkaS5lb3IgPSBiaWRpLmN1cnJlbnQ7IAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGJpZGkuc3RhdHVzLmVvciA9IFFDaGFyOjpEaXJMOwogICAgICAgICAgICAg ICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoIGJp ZGkuc3RhdHVzLmVvciA9PSBRQ2hhcjo6RGlyRU4gfHwgYmlkaS5zdGF0dXMuZW9yID09IFFDaGFy OjpEaXJBTiApIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHsgCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGRpciA9IGJpZGkuc3RhdHVzLmVvcjsgCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1biggYmlkaSApOwotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaXIgPSBRQ2hhcjo6RGly UjsgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmlkaS5lb3IgPSBiaWRpLmxhc3Q7IAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1biggYmlkaSApOyAKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICBkaXIgPSBRQ2hhcjo6RGlyTDsgCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgYmlkaS5zdGF0dXMuZW9yID0gUUNoYXI6OkRpckw7IAogICAgICAgICAgICAg ICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAg ICAgICAgICAgICAgYmlkaS5lb3IgPSBiaWRpLmN1cnJlbnQ7IGJpZGkuc3RhdHVzLmVvciA9IFFD aGFyOjpEaXJMOwogICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIGJp ZGkuZW9yID0gYmlkaS5jdXJyZW50OworICAgICAgICAgICAgICAgICAgICBiaWRpLnN0YXR1cy5l b3IgPSBRQ2hhcjo6RGlyTDsKKyAgICAgICAgICAgICAgICAgICAgZGlyID0gUUNoYXI6OkRpckw7 CiAgICAgICAgICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgICAgICAgICAgfQpAQCAtMTExMiwyOCArMTExNywzMiBAQCB2b2lkIFJlbmRlckJsb2Nr OjpiaWRpUmVvcmRlckxpbmUoY29uc3QgCiAgICAgICAgICAgICAgICAgY2FzZSBRQ2hhcjo6RGly UzoKICAgICAgICAgICAgICAgICBjYXNlIFFDaGFyOjpEaXJXUzoKICAgICAgICAgICAgICAgICBj YXNlIFFDaGFyOjpEaXJPTjoKLSAgICAgICAgICAgICAgICAgICAgaWYoYmlkaS5zdGF0dXMuZW9y ID09IFFDaGFyOjpEaXJSKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAvLyBuZXV0cmFscyBn byB0byBSCi0gICAgICAgICAgICAgICAgICAgICAgICBiaWRpLmVvciA9IGJpZGkubGFzdDsKLSAg ICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1biggYmlkaSApOwotICAgICAgICAgICAgICAg ICAgICAgICAgZGlyID0gUUNoYXI6OkRpckFOOwotICAgICAgICAgICAgICAgICAgICAgICAgYmlk aS5zdGF0dXMuZW9yID0gUUNoYXI6OkRpckFOOwotICAgICAgICAgICAgICAgICAgICB9IGVsc2Ug aWYoIGJpZGkuc3RhdHVzLmVvciA9PSBRQ2hhcjo6RGlyTCB8fAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIChiaWRpLnN0YXR1cy5lb3IgPT0gUUNoYXI6OkRpckVOICYmIGJpZGkuc3Rh dHVzLmxhc3RTdHJvbmcgPT0gUUNoYXI6OkRpckwpKSB7Ci0gICAgICAgICAgICAgICAgICAgICAg ICBiaWRpLmVvciA9IGJpZGkuY3VycmVudDsgYmlkaS5zdGF0dXMuZW9yID0gZGlyQ3VycmVudDsK LSAgICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIC8v IG51bWJlcnMgb24gYm90aCBzaWRlcywgbmV1dHJhbHMgZ2V0IHJpZ2h0IHRvIGxlZnQgZGlyZWN0 aW9uCi0gICAgICAgICAgICAgICAgICAgICAgICBpZihkaXIgIT0gUUNoYXI6OkRpckwpIHsKKyAg ICAgICAgICAgICAgICAgICAgaWYoYmlkaS5zdGF0dXMuZW9yICE9IFFDaGFyOjpEaXJSICYmIGJp ZGkuc3RhdHVzLmVvciAhPSBRQ2hhcjo6RGlyQUwpIHsKKyAgICAgICAgICAgICAgICAgICAgICAg IC8vIHJ1biBvZiBMIGJlZm9yZSBuZXV0cmFscywgbmV1dHJhbHMgdGFrZSBlbWJlZGRpbmcgZGly IChOMikKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmKGJpZGkuY29udGV4dC0+ZGlyID09IFFD aGFyOjpEaXJSIHx8IGJpZGkuc3RhdHVzLmxhc3RTdHJvbmcgPT0gUUNoYXI6OkRpclIgCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgfHwgYmlkaS5zdGF0dXMubGFzdFN0cm9uZyA9PSBRQ2hh cjo6RGlyQUwpIHsgCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gZT1SCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgLy8gY2xvc2UgdGhlIEwgcnVuCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYXBwZW5kUnVuKCBiaWRpICk7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgLy8gbmV1dHJhbHMgYmVjb21lIGFuIFIgcnVuCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgYmlkaS5lb3IgPSBiaWRpLmxhc3Q7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGly ID0gUUNoYXI6OkRpclI7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXBwZW5kUnVuKCBi aWRpICk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlyID0gUUNoYXI6OkRpckFOOwot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJpZGkuc3RhdHVzLmVvciA9IFFDaGFyOjpEaXJB TjsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBiaWRpLmVvciA9IGJpZGkuY3VycmVudDsK ICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgYmlkaS5lb3IgPSBiaWRpLmN1cnJlbnQ7IGJpZGkuc3RhdHVzLmVvciA9IGRpckN1cnJl bnQ7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gZT1MCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgLy8gYXBwZW5kIG5ldXRyYWxzIHRvIHRoZSBMIHJ1biBhbmQgY2xvc2UgaXQK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaXIgPSBRQ2hhcjo6RGlyTDsgCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgYmlkaS5lb3IgPSBiaWRpLmxhc3Q7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYXBwZW5kUnVuKGJpZGkpOwogICAgICAgICAgICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgICAgICAgICAg YmlkaS5lb3IgPSBiaWRpLmxhc3Q7CisgICAgICAgICAgICAgICAgICAgICAgICBhcHBlbmRSdW4o YmlkaSk7CisgICAgICAgICAgICAgICAgICAgICAgICBiaWRpLmVvciA9IGJpZGkuY3VycmVudDsK ICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICBkaXIgPSBRQ2hhcjo6 RGlyQU47CisgICAgICAgICAgICAgICAgICAgIGJpZGkuc3RhdHVzLmVvciA9IFFDaGFyOjpEaXJB TjsKICAgICAgICAgICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgICAgICAgICB9CkBAIC0xMTQ2LDYgKzExNTUsMTcgQEAgdm9pZCBSZW5kZXJCbG9j azo6YmlkaVJlb3JkZXJMaW5lKGNvbnN0IAogICAgICAgICAgICAgICAgIGRpckN1cnJlbnQgPSBR Q2hhcjo6RGlyRU47CiAgICAgICAgICAgICAgICAgYmlkaS5lb3IgPSBiaWRpLmN1cnJlbnQ7IGJp ZGkuc3RhdHVzLmVvciA9IGRpckN1cnJlbnQ7CiAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgICAgICB9IGVsc2UgaWYgKChiaWRpLnN0YXR1cy5lb3IgPT0gUUNoYXI6OkRpclIgfHwgYmlk aS5zdGF0dXMuZW9yID09IFFDaGFyOjpEaXJBTCB8fCBiaWRpLnN0YXR1cy5lb3IgPT0gUUNoYXI6 OkRpckFOIHx8IChiaWRpLnN0YXR1cy5lb3IgPT0gUUNoYXI6OkRpckVOICYmIGJpZGkuc3RhdHVz Lmxhc3RTdHJvbmcgPT0gUUNoYXI6OkRpclIpKSAmJiBiaWRpLmxhc3QhPWJpZGkuY3VycmVudCkg eworICAgICAgICAgICAgICAgIC8vIG1vc3Qgb2YgdGhlIHRpbWUgdGhpcyBpcyB1bm5lY2Vzc2Fy eSwgYnV0IHdlIG5lZWQgdG8gc2VjdXJlIHRoZSBSIHJ1biBpbiBjYXNlCisgICAgICAgICAgICAg ICAgLy8gdGhlIEVUIGVuZHMgdXAgYmVpbmcgbmV1dHJhbCBhbmQgZm9sbG93ZWQgYnkgTAorICAg ICAgICAgICAgICAgIGlmIChiaWRpLnN0YXR1cy5sYXN0IT1RQ2hhcjo6RGlyRVQpIHsKKyAgICAg ICAgICAgICAgICAgICAgZGlyID0gYmlkaS5zdGF0dXMuZW9yOworICAgICAgICAgICAgICAgICAg ICBhcHBlbmRSdW4oYmlkaSk7CisgICAgICAgICAgICAgICAgICAgIGJpZGkuZW9yID0gYmlkaS5s YXN0OworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBiaWRpLnN0YXR1cy5lb3Ig PSBRQ2hhcjo6RGlyUjsKKyAgICAgICAgICAgICAgICBkaXIgPSBRQ2hhcjo6RGlyUjsKKyAgICAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwogCkBA IC0xMTc1LDYgKzExOTUsOSBAQCB2b2lkIFJlbmRlckJsb2NrOjpiaWRpUmVvcmRlckxpbmUoY29u c3QgCiAgICAgICAgIHN3aXRjaChkaXJDdXJyZW50KQogICAgICAgICAgICAgewogICAgICAgICAg ICAgY2FzZSBRQ2hhcjo6RGlyRVQ6CisgICAgICAgICAgICAgICAgaWYgKGJpZGkuc3RhdHVzLmxh c3QgIT0gUUNoYXI6OkRpckVOKQorICAgICAgICAgICAgICAgICAgICBiaWRpLnN0YXR1cy5sYXN0 ID0gUUNoYXI6OkRpckVUOworICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2Fz ZSBRQ2hhcjo6RGlyRVM6CiAgICAgICAgICAgICBjYXNlIFFDaGFyOjpEaXJDUzoKICAgICAgICAg ICAgIGNhc2UgUUNoYXI6OkRpclM6CkBAIC0xMTk4LDkgKzEyMjEsNiBAQCB2b2lkIFJlbmRlckJs b2NrOjpiaWRpUmVvcmRlckxpbmUoY29uc3QgCiAgICAgICAgICAgICAgICAgLy8gaWdub3JlIHRo ZXNlCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNlIFFDaGFyOjpEaXJF TjoKLSAgICAgICAgICAgICAgICBpZiAoIGJpZGkuc3RhdHVzLmxhc3QgPT0gUUNoYXI6OkRpckwg KSB7Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgICAgICAvLyBmYWxsIHRocm91Z2gKICAgICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAg ICAgICAgICAgYmlkaS5zdGF0dXMubGFzdCA9IGRpckN1cnJlbnQ7CkBAIC0xMjEyLDcgKzEyMzIs NiBAQCB2b2lkIFJlbmRlckJsb2NrOjpiaWRpUmVvcmRlckxpbmUoY29uc3QgCiAKIAlpZiAoIGVt cHR5UnVuICkgewogCSAgICBiaWRpLnNvciA9IGJpZGkuY3VycmVudDsKLQkgICAgYmlkaS5lb3Ig PSBiaWRpLmN1cnJlbnQ7CiAJICAgIGVtcHR5UnVuID0gZmFsc2U7CiAJfQogCkBAIC0xNDM1LDgg KzE0NTQsOSBAQCBRUmVjdCBSZW5kZXJCbG9jazo6bGF5b3V0SW5saW5lQ2hpbGRyZW4oCiAgICAg ICAgIH0KICAgICAgICAgc3RhcnRFbWJlZC0+cmVmKCk7CiAKLQliaWRpLnN0YXR1cy5sYXN0U3Ry b25nID0gUUNoYXI6OkRpck9OOwotCWJpZGkuc3RhdHVzLmxhc3QgPSBRQ2hhcjo6RGlyT047Cisv LyAgICBiaWRpLnN0YXR1cy5lb3IgPSBRQ2hhcjo6RGlyT047CisJYmlkaS5zdGF0dXMubGFzdFN0 cm9uZyA9IHN0YXJ0RW1iZWQtPmRpcjsKKwliaWRpLnN0YXR1cy5sYXN0ID0gc3RhcnRFbWJlZC0+ ZGlyOwogICAgICAgICBiaWRpLmNvbnRleHQgPSBzdGFydEVtYmVkOwogICAgICAgICAKICAgICAg ICAgaWYgKCFzbWlkcG9pbnRzKQo= 2685 2005-06-28 06:30:11 -0700 2005-06-28 10:42:41 -0700 Proposed fix 3733_patch_r2.txt text/plain 10001 mitz SW5kZXg6IGJpZGkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9XZWJDb3JlL2to dG1sL3JlbmRlcmluZy9iaWRpLmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMzAKZGlmZiAt dSAtcCAtcjEuMTMwIGJpZGkuY3BwCi0tLSBiaWRpLmNwcAkyMDA1LzA2LzI1IDA1OjE3OjMyCTEu MTMwCisrKyBiaWRpLmNwcAkyMDA1LzA2LzI4IDEzOjIyOjU2CkBAIC01NDEsNyArNTQxLDggQEAg c3RhdGljIHZvaWQgYXBwZW5kUnVuc0Zvck9iamVjdChpbnQgc3RhcgogCiBzdGF0aWMgdm9pZCBh cHBlbmRSdW4oIEJpZGlTdGF0ZSAmYmlkaSApCiB7Ci0gICAgaWYgKCBlbXB0eVJ1biApIHJldHVy bjsKKyAgICBpZiAoZW1wdHlSdW4gfHwgIWJpZGkuZW9yLm9iaikKKyAgICAgICAgcmV0dXJuOwog I2lmIEJJRElfREVCVUcgPiAxCiAgICAga2REZWJ1Zyg2MDQxKSA8PCAiYXBwZW5kUnVuOiBkaXI9 Ijw8KGludClkaXI8PGVuZGw7CiAjZW5kaWYKQEAgLTg2NywyMSArODY4LDEwIEBAIHZvaWQgUmVu ZGVyQmxvY2s6OmJpZGlSZW9yZGVyTGluZShjb25zdCAKICAgICAKICAgICAvLyAgICBjb250ZXh0 LT5yZWYoKTsKIAotICAgIGRpciA9IFFDaGFyOjpEaXJPTjsKLSAgICAKLSAgICAvLyBBZG9wdCB0 aGUgZGlyZWN0aW9uYWxpdHkgb2YgdGhlIHRleHQncyBlbGVtZW50IGlmIHNwZWNpZmllZCBhcyBS VEwKLSAgICAvLyBhbmQgdGhlIGZpcnN0IHBvc2l0aW9uIGlzIG5ldXRyYWwuCi0gICAgaWYgKHN0 YXJ0LmRpcmVjdGlvbigpID09IFFDaGFyOjpEaXJPTikgewotICAgICAgICBpZiAoc3RhcnQub2Jq KSB7Ci0gICAgICAgICAgICBpZiAoc3RhcnQub2JqLT5zdHlsZSgpLT5kaXJlY3Rpb24oKSA9PSBS VEwpCi0gICAgICAgICAgICAgICAgZGlyID0gUUNoYXI6OkRpclI7Ci0gICAgICAgIH0KLSAgICAg ICAgZWxzZSBpZiAoc3R5bGUoKS0+ZGlyZWN0aW9uKCkgPT0gUlRMKSB7Ci0gICAgICAgICAgICBk aXIgPSBRQ2hhcjo6RGlyUjsKLSAgICAgICAgfQotICAgIH0KKyAgICBkaXIgPSBiaWRpLmNvbnRl eHQtPmRpcjsKIAogICAgIGVtcHR5UnVuID0gdHJ1ZTsKKyAgICBiaWRpLmVvci5vYmogPSAwOwog CiAgICAgbnVtU3BhY2VzID0gMDsKIApAQCAtOTI2LDEzICs5MTYsMTggQEAgdm9pZCBSZW5kZXJC bG9jazo6YmlkaVJlb3JkZXJMaW5lKGNvbnN0IAogICAgICAgICAgICAgICAgIGRpciA9IFFDaGFy OjpEaXJMOwogICAgICAgICAgICAgc3dpdGNoKGJpZGkuc3RhdHVzLmxhc3QpCiAgICAgICAgICAg ICAgICAgewotICAgICAgICAgICAgICAgIGNhc2UgUUNoYXI6OkRpckw6Ci0gICAgICAgICAgICAg ICAgICAgIGJpZGkuZW9yID0gYmlkaS5jdXJyZW50OyBiaWRpLnN0YXR1cy5lb3IgPSBRQ2hhcjo6 RGlyTDsgYnJlYWs7CiAgICAgICAgICAgICAgICAgY2FzZSBRQ2hhcjo6RGlyUjoKICAgICAgICAg ICAgICAgICBjYXNlIFFDaGFyOjpEaXJBTDoKICAgICAgICAgICAgICAgICBjYXNlIFFDaGFyOjpE aXJFTjoKICAgICAgICAgICAgICAgICBjYXNlIFFDaGFyOjpEaXJBTjoKKyAgICAgICAgICAgICAg ICAgICAgLy8gdG8gYXZvaWQgbWFueSB1bm5jZXNzYXJ5IHNwbGl0cywgdGhlIGZvbGxvd2luZyBh cHBlbmRSdW4gY2FuCisgICAgICAgICAgICAgICAgICAgIC8vIGJlIGRvbmUgb25seSBpZiAoYmlk aS5zdGF0dXMubGFzdCAhPSBRQ2hhcjo6RGlyRU4gfHwgYmlkaS5zdGF0dXMubGFzdFN0cm9uZyAh PSBRQ2hhcjo6RGlyTCApCiAgICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1biggYmlkaSApOwor ICAgICAgICAgICAgICAgICAgICBkaXIgPSBRQ2hhcjo6RGlyTDsKKyAgICAgICAgICAgICAgICAg ICAgLy8gZmFsbCB0aHJvdWdoCisgICAgICAgICAgICAgICAgY2FzZSBRQ2hhcjo6RGlyTDoKKyAg ICAgICAgICAgICAgICAgICAgYmlkaS5lb3IgPSBiaWRpLmN1cnJlbnQ7CisgICAgICAgICAgICAg ICAgICAgIGJpZGkuc3RhdHVzLmVvciA9IFFDaGFyOjpEaXJMOwogICAgICAgICAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgICAgICAgICBjYXNlIFFDaGFyOjpEaXJFUzoKICAgICAgICAgICAg ICAgICBjYXNlIFFDaGFyOjpEaXJFVDoKQEAgLTk0MiwyOSArOTM3LDQyIEBAIHZvaWQgUmVuZGVy QmxvY2s6OmJpZGlSZW9yZGVyTGluZShjb25zdCAKICAgICAgICAgICAgICAgICBjYXNlIFFDaGFy OjpEaXJTOgogICAgICAgICAgICAgICAgIGNhc2UgUUNoYXI6OkRpcldTOgogICAgICAgICAgICAg ICAgIGNhc2UgUUNoYXI6OkRpck9OOgotICAgICAgICAgICAgICAgICAgICBpZiggYmlkaS5zdGF0 dXMuZW9yICE9IFFDaGFyOjpEaXJMICkgeworICAgICAgICAgICAgICAgICAgICBpZiAoYmlkaS5z dGF0dXMuZW9yID09IFFDaGFyOjpEaXJFTikgeworICAgICAgICAgICAgICAgICAgICAgICAgaWYg KGJpZGkuc3RhdHVzLmxhc3RTdHJvbmcgIT0gUUNoYXI6OkRpckwpIHsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAvLyB0aGUgbnVtYmVycyBuZWVkIHRvIGJlIG9uIGEgaGlnaGVyIGVtYmVk ZGluZyBsZXZlbCwgc28gbGV0J3MgY2xvc2UgdGhhdCBydW4KKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICBkaXIgPSBRQ2hhcjo6RGlyRU47CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg YXBwZW5kUnVuKGJpZGkpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChiaWRpLmNv bnRleHQtPmRpciAhPSBRQ2hhcjo6RGlyTCkgeworICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAvLyB0aGUgbmV1dHJhbHMgdGFrZSB0aGUgZW1iZWRkaW5nIGRpcmVjdGlvbiwgd2hpY2gg aXMgUgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBiaWRpLmVvciA9IGJpZGkubGFz dDsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlyID0gUUNoYXI6OkRpclI7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1bihiaWRpKTsKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgICAgICB9CisgICAgICAg ICAgICAgICAgICAgIH0gZWxzZSBpZiAoYmlkaS5zdGF0dXMuZW9yID09IFFDaGFyOjpEaXJBTikg eworICAgICAgICAgICAgICAgICAgICAgICAgLy8gQXJhYmljIG51bWJlcnMgYXJlIGFsd2F5cyBv biBhIGhpZ2hlciBlbWJlZGRpbmcgbGV2ZWwsIHNvIGxldCdzIGNsb3NlIHRoYXQgcnVuCisgICAg ICAgICAgICAgICAgICAgICAgICBkaXIgPSBRQ2hhcjo6RGlyQU47CisgICAgICAgICAgICAgICAg ICAgICAgICBhcHBlbmRSdW4oYmlkaSk7CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAoYmlk aS5jb250ZXh0LT5kaXIgIT0gUUNoYXI6OkRpckwpIHsKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAvLyB0aGUgbmV1dHJhbHMgdGFrZSB0aGUgZW1iZWRkaW5nIGRpcmVjdGlvbiwgd2hpY2gg aXMgUgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJpZGkuZW9yID0gYmlkaS5sYXN0Owor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpciA9IFFDaGFyOjpEaXJSOworICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1bihiaWRpKTsKKyAgICAgICAgICAgICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgICAgICAgICAgfSBlbHNlIGlmKGJpZGkuc3RhdHVzLmVvciAhPSBR Q2hhcjo6RGlyTCkgewogICAgICAgICAgICAgICAgICAgICAgICAgLy9sYXN0IHN0dWZmIHRha2Vz IGVtYmVkZGluZyBkaXIKICAgICAgICAgICAgICAgICAgICAgICAgIGlmKGJpZGkuY29udGV4dC0+ ZGlyID09IFFDaGFyOjpEaXJMIHx8IGJpZGkuc3RhdHVzLmxhc3RTdHJvbmcgPT0gUUNoYXI6OkRp ckwpIHsgCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCBiaWRpLnN0YXR1cy5lb3Ig IT0gUUNoYXI6OkRpckVOICYmIGJpZGkuc3RhdHVzLmVvciAhPSBRQ2hhcjo6RGlyQU4gJiYgYmlk aS5zdGF0dXMuZW9yICE9IFFDaGFyOjpEaXJPTiApIAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGlmIChiaWRpLnN0YXR1cy5lb3IgIT0gUUNoYXI6OkRpck9OKSAKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBhcHBlbmRSdW4oIGJpZGkgKTsKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBkaXIgPSBRQ2hhcjo6RGlyTDsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBiaWRp LmVvciA9IGJpZGkuY3VycmVudDsgCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgYmlkaS5z dGF0dXMuZW9yID0gUUNoYXI6OkRpckw7CiAgICAgICAgICAgICAgICAgICAgICAgICB9IGVsc2Ug ewotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICggYmlkaS5zdGF0dXMuZW9yID09IFFD aGFyOjpEaXJFTiB8fCBiaWRpLnN0YXR1cy5lb3IgPT0gUUNoYXI6OkRpckFOICkgCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgeyAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZGlyID0gYmlkaS5zdGF0dXMuZW9yOyAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg YXBwZW5kUnVuKCBiaWRpICk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGRpciA9IFFDaGFyOjpEaXJSOyAKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBiaWRpLmVvciA9IGJpZGkubGFzdDsgCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgYXBwZW5kUnVuKCBiaWRpICk7IAotICAgICAgICAgICAgICAgICAgICAgICAgICAg IGRpciA9IFFDaGFyOjpEaXJMOyAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBiaWRpLnN0 YXR1cy5lb3IgPSBRQ2hhcjo6RGlyTDsgCiAgICAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBiaWRpLmVv ciA9IGJpZGkuY3VycmVudDsgYmlkaS5zdGF0dXMuZW9yID0gUUNoYXI6OkRpckw7CiAgICAgICAg ICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgYmlkaS5lb3IgPSBiaWRpLmN1cnJl bnQ7CisgICAgICAgICAgICAgICAgICAgIGJpZGkuc3RhdHVzLmVvciA9IFFDaGFyOjpEaXJMOwor ICAgICAgICAgICAgICAgICAgICBkaXIgPSBRQ2hhcjo6RGlyTDsKICAgICAgICAgICAgICAgICBk ZWZhdWx0OgogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICB9CkBA IC0xMTEyLDI4ICsxMTIwLDMyIEBAIHZvaWQgUmVuZGVyQmxvY2s6OmJpZGlSZW9yZGVyTGluZShj b25zdCAKICAgICAgICAgICAgICAgICBjYXNlIFFDaGFyOjpEaXJTOgogICAgICAgICAgICAgICAg IGNhc2UgUUNoYXI6OkRpcldTOgogICAgICAgICAgICAgICAgIGNhc2UgUUNoYXI6OkRpck9OOgot ICAgICAgICAgICAgICAgICAgICBpZihiaWRpLnN0YXR1cy5lb3IgPT0gUUNoYXI6OkRpclIpIHsK LSAgICAgICAgICAgICAgICAgICAgICAgIC8vIG5ldXRyYWxzIGdvIHRvIFIKLSAgICAgICAgICAg ICAgICAgICAgICAgIGJpZGkuZW9yID0gYmlkaS5sYXN0OwotICAgICAgICAgICAgICAgICAgICAg ICAgYXBwZW5kUnVuKCBiaWRpICk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBkaXIgPSBRQ2hh cjo6RGlyQU47Ci0gICAgICAgICAgICAgICAgICAgICAgICBiaWRpLnN0YXR1cy5lb3IgPSBRQ2hh cjo6RGlyQU47Ci0gICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiggYmlkaS5zdGF0dXMuZW9y ID09IFFDaGFyOjpEaXJMIHx8Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGJpZGku c3RhdHVzLmVvciA9PSBRQ2hhcjo6RGlyRU4gJiYgYmlkaS5zdGF0dXMubGFzdFN0cm9uZyA9PSBR Q2hhcjo6RGlyTCkpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGJpZGkuZW9yID0gYmlkaS5j dXJyZW50OyBiaWRpLnN0YXR1cy5lb3IgPSBkaXJDdXJyZW50OwotICAgICAgICAgICAgICAgICAg ICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAgICAgICAgLy8gbnVtYmVycyBvbiBib3RoIHNp ZGVzLCBuZXV0cmFscyBnZXQgcmlnaHQgdG8gbGVmdCBkaXJlY3Rpb24KLSAgICAgICAgICAgICAg ICAgICAgICAgIGlmKGRpciAhPSBRQ2hhcjo6RGlyTCkgeworICAgICAgICAgICAgICAgICAgICBp ZihiaWRpLnN0YXR1cy5lb3IgIT0gUUNoYXI6OkRpclIgJiYgYmlkaS5zdGF0dXMuZW9yICE9IFFD aGFyOjpEaXJBTCkgeworICAgICAgICAgICAgICAgICAgICAgICAgLy8gcnVuIG9mIEwgYmVmb3Jl IG5ldXRyYWxzLCBuZXV0cmFscyB0YWtlIGVtYmVkZGluZyBkaXIgKE4yKQorICAgICAgICAgICAg ICAgICAgICAgICAgaWYoYmlkaS5jb250ZXh0LT5kaXIgPT0gUUNoYXI6OkRpclIgfHwgYmlkaS5z dGF0dXMubGFzdFN0cm9uZyA9PSBRQ2hhcjo6RGlyUiAKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICB8fCBiaWRpLnN0YXR1cy5sYXN0U3Ryb25nID09IFFDaGFyOjpEaXJBTCkgeyAKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAvLyB0aGUgZW1iZWRkaW5nIGRpcmVjdGlvbiBpcyBSCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gY2xvc2UgdGhlIEwgcnVuCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgYXBwZW5kUnVuKCBiaWRpICk7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgLy8gbmV1dHJhbHMgYmVjb21lIGFuIFIgcnVuCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgYmlkaS5lb3IgPSBiaWRpLmxhc3Q7CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZGlyID0gUUNoYXI6OkRpclI7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXBwZW5k UnVuKCBiaWRpICk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlyID0gUUNoYXI6OkRp ckFOOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJpZGkuc3RhdHVzLmVvciA9IFFDaGFy OjpEaXJBTjsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBiaWRpLmVvciA9IGJpZGkuY3Vy cmVudDsKICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgYmlkaS5lb3IgPSBiaWRpLmN1cnJlbnQ7IGJpZGkuc3RhdHVzLmVvciA9IGRp ckN1cnJlbnQ7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gdGhlIGVtYmVkZGluZyBk aXJlY3Rpb24gaXMgTAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGFwcGVuZCBuZXV0 cmFscyB0byB0aGUgTCBydW4gYW5kIGNsb3NlIGl0CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZGlyID0gUUNoYXI6OkRpckw7IAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJpZGku ZW9yID0gYmlkaS5sYXN0OworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1bihi aWRpKTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgfSBl bHNlIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJpZGkuZW9yID0gYmlkaS5sYXN0OworICAg ICAgICAgICAgICAgICAgICAgICAgYXBwZW5kUnVuKGJpZGkpOworICAgICAgICAgICAgICAgICAg ICAgICAgYmlkaS5lb3IgPSBiaWRpLmN1cnJlbnQ7CiAgICAgICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgICAgICAgZGlyID0gUUNoYXI6OkRpckFOOworICAgICAgICAgICAgICAgICAg ICBiaWRpLnN0YXR1cy5lb3IgPSBRQ2hhcjo6RGlyQU47CiAgICAgICAgICAgICAgICAgZGVmYXVs dDoKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgfQpAQCAtMTE0 Niw2ICsxMTU4LDE3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmJpZGlSZW9yZGVyTGluZShjb25zdCAK ICAgICAgICAgICAgICAgICBkaXJDdXJyZW50ID0gUUNoYXI6OkRpckVOOwogICAgICAgICAgICAg ICAgIGJpZGkuZW9yID0gYmlkaS5jdXJyZW50OyBiaWRpLnN0YXR1cy5lb3IgPSBkaXJDdXJyZW50 OwogICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfSBlbHNlIGlmICgoYmlkaS5z dGF0dXMuZW9yID09IFFDaGFyOjpEaXJSIHx8IGJpZGkuc3RhdHVzLmVvciA9PSBRQ2hhcjo6RGly QUwgfHwgYmlkaS5zdGF0dXMuZW9yID09IFFDaGFyOjpEaXJBTiB8fCAoYmlkaS5zdGF0dXMuZW9y ID09IFFDaGFyOjpEaXJFTiAmJiBiaWRpLnN0YXR1cy5sYXN0U3Ryb25nID09IFFDaGFyOjpEaXJS KSkgJiYgYmlkaS5sYXN0IT1iaWRpLmN1cnJlbnQpIHsKKyAgICAgICAgICAgICAgICAvLyBtb3N0 IG9mIHRoZSB0aW1lIHRoaXMgaXMgdW5uZWNlc3NhcnksIGJ1dCB3ZSBuZWVkIHRvIHNlY3VyZSB0 aGUgUiBydW4gaW4gY2FzZQorICAgICAgICAgICAgICAgIC8vIHRoZSBFVCBlbmRzIHVwIGJlaW5n IG5ldXRyYWwgYW5kIGZvbGxvd2VkIGJ5IEwKKyAgICAgICAgICAgICAgICBpZiAoYmlkaS5zdGF0 dXMubGFzdCE9UUNoYXI6OkRpckVUKSB7CisgICAgICAgICAgICAgICAgICAgIGRpciA9IGJpZGku c3RhdHVzLmVvcjsKKyAgICAgICAgICAgICAgICAgICAgYXBwZW5kUnVuKGJpZGkpOworICAgICAg ICAgICAgICAgICAgICBiaWRpLmVvciA9IGJpZGkubGFzdDsKKyAgICAgICAgICAgICAgICB9Cisg ICAgICAgICAgICAgICAgYmlkaS5zdGF0dXMuZW9yID0gUUNoYXI6OkRpclI7CisgICAgICAgICAg ICAgICAgZGlyID0gUUNoYXI6OkRpclI7CisgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg ICAgICB9CiAgICAgICAgICAgICBicmVhazsKIApAQCAtMTE3NSw2ICsxMTk4LDkgQEAgdm9pZCBS ZW5kZXJCbG9jazo6YmlkaVJlb3JkZXJMaW5lKGNvbnN0IAogICAgICAgICBzd2l0Y2goZGlyQ3Vy cmVudCkKICAgICAgICAgICAgIHsKICAgICAgICAgICAgIGNhc2UgUUNoYXI6OkRpckVUOgorICAg ICAgICAgICAgICAgIGlmIChiaWRpLnN0YXR1cy5sYXN0ICE9IFFDaGFyOjpEaXJFTikKKyAgICAg ICAgICAgICAgICAgICAgYmlkaS5zdGF0dXMubGFzdCA9IFFDaGFyOjpEaXJFVDsKKyAgICAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgUUNoYXI6OkRpckVTOgogICAgICAgICAg ICAgY2FzZSBRQ2hhcjo6RGlyQ1M6CiAgICAgICAgICAgICBjYXNlIFFDaGFyOjpEaXJTOgpAQCAt MTE5OCw5ICsxMjI0LDYgQEAgdm9pZCBSZW5kZXJCbG9jazo6YmlkaVJlb3JkZXJMaW5lKGNvbnN0 IAogICAgICAgICAgICAgICAgIC8vIGlnbm9yZSB0aGVzZQogICAgICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICAgICAgY2FzZSBRQ2hhcjo6RGlyRU46Ci0gICAgICAgICAgICAgICAgaWYgKCBi aWRpLnN0YXR1cy5sYXN0ID09IFFDaGFyOjpEaXJMICkgewotICAgICAgICAgICAgICAgICAgICBi cmVhazsKLSAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgLy8gZmFsbCB0aHJvdWdo CiAgICAgICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgICAgIGJpZGkuc3RhdHVzLmxhc3Qg PSBkaXJDdXJyZW50OwpAQCAtMTIxMiw3ICsxMjM1LDYgQEAgdm9pZCBSZW5kZXJCbG9jazo6Ymlk aVJlb3JkZXJMaW5lKGNvbnN0IAogCiAJaWYgKCBlbXB0eVJ1biApIHsKIAkgICAgYmlkaS5zb3Ig PSBiaWRpLmN1cnJlbnQ7Ci0JICAgIGJpZGkuZW9yID0gYmlkaS5jdXJyZW50OwogCSAgICBlbXB0 eVJ1biA9IGZhbHNlOwogCX0KIApAQCAtMTQzNSw4ICsxNDU3LDggQEAgUVJlY3QgUmVuZGVyQmxv Y2s6OmxheW91dElubGluZUNoaWxkcmVuKAogICAgICAgICB9CiAgICAgICAgIHN0YXJ0RW1iZWQt PnJlZigpOwogCi0JYmlkaS5zdGF0dXMubGFzdFN0cm9uZyA9IFFDaGFyOjpEaXJPTjsKLQliaWRp LnN0YXR1cy5sYXN0ID0gUUNoYXI6OkRpck9OOworICAgICAgICBiaWRpLnN0YXR1cy5sYXN0U3Ry b25nID0gc3RhcnRFbWJlZC0+ZGlyOworICAgICAgICBiaWRpLnN0YXR1cy5sYXN0ID0gc3RhcnRF bWJlZC0+ZGlyOwogICAgICAgICBiaWRpLmNvbnRleHQgPSBzdGFydEVtYmVkOwogICAgICAgICAK ICAgICAgICAgaWYgKCFzbWlkcG9pbnRzKQo=