790475 unknown 2012-09-11 17:02:22 -0700 Inline spellchecker does not correctly traverse text nodes 2013-09-10 20:15:56 -0700 1 1 3 Components Core DOM: Editor Trunk x86 All defect RESOLVED FIXED https://getsatisfaction.com/mozilla_messaging/tags/bug_790475 [GS] - See comment 95 before commenting. You almost certainly want to see bug 812638 instead. regression, verifyme -- normal mozilla19 812638 820017 590640 1 jbg mconley 2aec61ed antoine.mechelynck ayg bugzilla2007 dan.amsentry dannyfox ehsan.akhgari el.cameleon.1 garysch grmain home iannbugzilla jeff joel jsabash KenSaunders klasse LD_Bugzilla lukasblakk+bugs magicandre1981 mconley me.r.benz mike.hall mkmelin+mozilla piperpilot59 r4162821-mozbugzilla recycling.program rtanglao RytoEX sergei.ivn+bugzilla sfhowes smilingfrog standard8 virgil.dicu vseerror virgil.dicu --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- - --- + verified + verified --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- 2012-10-26 11:36:56 --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- 2012-10-26 11:36:56 12 6627314 jbg 2012-09-11 17:02:22 -0700 User Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.142 Safari/535.19 Steps to reproduce: Started to type words, allowing spell check to do its thing. Actual results: Partial words are marked in error, then the red underline is not removed when the word is spelled correctly (and in total). Expected results: Spell check should reevaluate words as they get spelled and not leave partial words marked as incorrect. Seems fine in 15.0.1, broken in 17.0a2 -- not sure where it broke. 6628042 bugzilla2007 2012-09-12 00:32:45 -0700 wfm on current trunk: WinXP/18.0a1 20120911030227 Mozilla/5.0 (Windows NT 5.1; rv:18.0) Gecko/18.0 Thunderbird/18.0a1 6717846 jbg 2012-10-10 18:28:11 -0700 This bug appears to have surfaced in TB 16 for me. 6741087 smilingfrog 2012-10-17 23:42:47 -0700 Not a TB user, but I have noticed this bug in Firefox since version 16.0 Only when using gmail and backspacing through a word, then retyping it. described in this forum: http://forums.mozillazine.org/viewtopic.php?f=31&t=2571011&sid=b16ccf58bf408f933121729f6860271e Some users could not reproduce this bug. I set up a blank gmail account, and sure enough, I couldn't reproduce the bug there. It seems to be a problem with the gmail interface when you have chosen a preformatted text setting. By clearing any preformatted setting, the error corrected itself. This was not happening in previous versions of FF. 6741103 el.cameleon.1 2012-10-17 23:50:58 -0700 More than 5 people report it on GSFN with TB16, so I confirmed the bug report. 6741228 standard8 2012-10-18 01:03:01 -0700 It would be very useful to get some steps to repeat on here. Browsing the forum mentioned in comment 3 I cannot repeat any of those steps. Things to consider when generating steps to repeat: Include all key presses, mouse clicks. Also include if you're using the default fonts, special fonts, non-en-US dictionaries, version of Thunderbird. Also, can you reproduce the issue on http://www-archive.mozilla.org/editor/midasdemo/ 6741254 el.cameleon.1 2012-10-18 01:27:37 -0700 see also http://forums.mozillazine.org/viewtopic.php?f=31&t=2571011 which as some STR, but which doesn't works for all users (personally I don't succeed to reproduce it). 6741257 el.cameleon.1 2012-10-18 01:29:00 -0700 and also http://support.mozilla.org/ca/questions/939293 for the Firefox side of this issue (10 peoples have this problem). 6741287 standard8 2012-10-18 01:56:08 -0700 Given the fact this seems to affect FF as well, moving to the core component. 6741390 vseerror 2012-10-18 03:04:57 -0700 question to those how can reproduce - does it reproduce with current trunk? I can't reproduce with TB18, html or plain text compose, and the mozillazine steps 1) Open a new email message. 2) Type 'In the middle of the day' 3) Backspace until you only have 'In the mi' 4) Then retype the rest so you end up with 'In the middle of the day' again. However, some say it is intermittent 6741394 liam 2012-10-18 03:06:16 -0700 I have been experiencing this since upgrading to Thunderbird 16.0.1. I'm using the en-GB dictionary, with 'Helvetica, Arial' as the font, entered as 'Body Text'. Here are the steps that enable me to reproduce the bug: 1) Open up Thunderbird (password required for me). 2) Go to Inbox for one of my IMAP accounts. 3) Click on 'Write' to compose a new email. 4) Click inside the main message area. (My HTML signature has appeared at the bottom of the new email.) 5) Type 'I am testung ' (the word 'testung', purposely spelt incorrectly, followed by a space). 6) Press backspace 4 times, leaving just 'I am test'. Currently nothing is underlined as red. 7) Type 'ing' (to make it into the word 'testing'), followed by a space. 8) Begin typing any word at all (e.g. 'this') and the moment the first non-space character is entered, the red underline comes up underneath 'ing', hich is treated as a separate word. 9) Right-clicking gives me the spelling correction options of 'in', 'sing', 'ring', 'ting', 'ling'. It appears to be an issue with backspacing into a word and then any new characters typed being treated as a new word entirely, as if you'd entered a space beforehand. For me, the issue only occurs in Thunderbird. I have been unable to recreate it in Firefox 16.0.1 (using the en-GB dictionary), even within Gmail. 6741815 mconley 2012-10-18 06:53:30 -0700 (In reply to LGLC from comment #10) > I have been experiencing this since upgrading to Thunderbird 16.0.1. I'm > using the en-GB dictionary, with 'Helvetica, Arial' as the font, entered as > 'Body Text'. > > Here are the steps that enable me to reproduce the bug: > > 1) Open up Thunderbird (password required for me). > 2) Go to Inbox for one of my IMAP accounts. > 3) Click on 'Write' to compose a new email. > 4) Click inside the main message area. (My HTML signature has appeared at > the bottom of the new email.) > 5) Type 'I am testung ' (the word 'testung', purposely spelt incorrectly, > followed by a space). > 6) Press backspace 4 times, leaving just 'I am test'. Currently nothing is > underlined as red. > 7) Type 'ing' (to make it into the word 'testing'), followed by a space. > 8) Begin typing any word at all (e.g. 'this') and the moment the first > non-space character is entered, the red underline comes up underneath 'ing', > hich is treated as a separate word. > 9) Right-clicking gives me the spelling correction options of 'in', 'sing', > 'ring', 'ting', 'ling'. > > It appears to be an issue with backspacing into a word and then any new > characters typed being treated as a new word entirely, as if you'd entered a > space beforehand. > > For me, the issue only occurs in Thunderbird. I have been unable to > recreate it in Firefox 16.0.1 (using the en-GB dictionary), even within > Gmail. I was able to reproduce this issue using these steps, but ONLY when I had the font set to Helvetica, Arial. The dictionary choice between US, Canadian and British English didn't affect this. Setting the font to Variable Width made the problem go away. 6741818 mconley 2012-10-18 06:56:23 -0700 This problem seems to affect Release, all the way to Daily. 6741834 mconley 2012-10-18 07:00:34 -0700 I was able to reproduce this in Firefox 16.0.1 with the following STR: 1) Go to http://www-archive.mozilla.org/editor/midasdemo/ 2) Change the font to Arial 3) In the textarea, type "I am testung" 4) Press space - you should see the red squiggly under "testung" 5) Hit backspace 4 times, so you just have "I am test" 6) Type "ing", followed by a space, followed by any alphanumeric character. What happens? "ing" in "testing" gets marked with a red squiggly as being incorrectly spelled. What's expected? "testing" should be recognized as a single word, and a valid one at that. 6741929 mconley 2012-10-18 07:30:36 -0700 After a long period of spell-check brokenness, the bug is first reproducible on the Firefox Nightly on July 14th, 2012. According to DOMi, what's happening is that the text is wrapped in a FONT tag, and is actually composed of two text nodes. The first contains "I am test", and the other contains "ing". If I don't set the font first, no font node exists, and there's only a single text node containing "I am testing". Standard8 and I are starting to suspect editor on this one. 6741964 mconley 2012-10-18 07:38:49 -0700 Here's an FTP for the first busted Nightly: http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2012/07/2012-07-14-03-05-54-mozilla-central/ 6742280 mconley 2012-10-18 08:51:47 -0700 Yeah, the regression window I had before wasn't very good - I was doing my regression testing on Windows, and a bunch of those builds were busted for various reasons. I was able to drill it down on OSX though. Last good Nightly was on May 18th. First bad was on May 19th. 6742315 mconley 2012-10-18 09:02:55 -0700 And here are the changesets between those two Nightlies: http://hg.mozilla.org/mozilla-central/pushloghtml?fromchange=e794cef56df6&tochange=642d1a36702f 6742781 mconley 2012-10-18 10:44:24 -0700 Bisecting revealed this to be a regression caused by bug 590640 landing. 6743080 lukasblakk+bugs 2012-10-18 11:38:14 -0700 We would not chemspill for this so not tracking for 16, but assigning to Aryeh to do some investigation on possible fix/backout for this regression. If you have something speculative we can take it in the next week and a half for consideration on 17. 6743141 ehsan.akhgari 2012-10-18 11:49:35 -0700 So this is caused by the fact that our spellchecker is stupid and cannot handle adjacent textnodes, and we need to fix that. Aryeh, I'd appreciate if you can take a look at this. 6743182 jbg 2012-10-18 11:59:34 -0700 I have seen this problem with the Calibri font as well. 6743306 me.r.benz 2012-10-18 12:30:48 -0700 I am also seeing these odd spelling markings. I did some experimenting and I can see this strange behavior in Thunderbird 16 that wasn't in Thunderbird 15. Create a new message and enter several lines of text. Highlight all of the lines of your email text with CTRL-A, then click on Toolbar Insert > HTML. Add a [font size=3] at the very beginning of your text and [/font] at the very end of all your text. NOTE: change the [ to < and the ] to > in last sentence. Then go back to your email body and insert more text in the middle of your email, backspace, pause, add, and correct the text. Again do a CTRL-A and highlight all your lines, Go to Toolbar Insert > HTML. What I then see is that Thunderbird has added multiple instances of the [font size=3] throughout my email message, often times breaking a word with that HTML. So the red underlined words look like this: In my regular email text body, looks like this: Check this crazy stuff out. In the Insert > HTML view, looks like this: Check this c[font size=3]razy stu[font size=3]ff out. I get the red underlines in the word where the extra [font size=3] is being generated and inserted in the words. NOTE: I used [ for the < character, and the ] for the > character to prevent the removal of the HTML tags in my example. 6743349 me.r.benz 2012-10-18 12:40:55 -0700 In my previous comments... I am seeing this in Thunderbird 16.0.1 on Windows XP SP3. After I entered my above comments, I noticed that this is marked for "OS X", but I am seeing this on Windows XP platform. I don't know how to add to the Bugzilla top details that this is also happening on Windows XP platform. 6743366 ehsan.akhgari 2012-10-18 12:44:54 -0700 (In reply to comment #21) > I have seen this problem with the Calibri font as well. Right. The actual font probably doesn't matter. The only reason why changing the font is required to reproduce it is to get us into a situation where we create two adjacent textnodes. 6743543 antoine.mechelynck 2012-10-18 13:24:33 -0700 (In reply to R Benz from comment #23) > In my previous comments... I am seeing this in Thunderbird 16.0.1 on Windows > XP SP3. After I entered my above comments, I noticed that this is marked > for "OS X", but I am seeing this on Windows XP platform. I don't know how > to add to the Bugzilla top details that this is also happening on Windows XP > platform. If the bug is seen on both OS X and Windows (or on two or more of Windows, Linux and Mac), it deserves "OS: All". To set that setting, you need EDITBUGS privileges on bugzilla.mozilla.org, except for bugs which you reported (which you can always edit). So if you don't have the necessary privs, just mention the fact (as you did) and someone will make the change (as I'm now doing). 6744600 smilingfrog 2012-10-18 18:58:10 -0700 (In reply to Tony Mechelynck [:tonymec] from comment #25) > If the bug is seen on both OS X and Windows (or on two or more of Windows, > Linux and Mac), it deserves "OS: All". To set that setting, you need > EDITBUGS privileges on bugzilla.mozilla.org, except for bugs which you > reported (which you can always edit). So if you don't have the necessary > privs, just mention the fact (as you did) and someone will make the change > (as I'm now doing). I have this bug on Linux. 6745184 el.cameleon.1 2012-10-19 01:35:39 -0700 *** Bug 800934 has been marked as a duplicate of this bug. *** 6745909 greta_watson 2012-10-19 07:39:58 -0700 Thunderbird 16, Fedora 17 64-bit is where the problem started for me. Comment 9 illustrates the problem I have. If I see the red underline while I'm still typing on the same line, if I then type a space followed by a backspace, the red underline goes away. 6746008 ehsan.akhgari 2012-10-19 08:19:02 -0700 Thanks everyone for trying to help here. I believe that at this point we have enough information about why this bug happens and which Firefox and Thunderbird versions if affects, and how we should fix it. Adding comments that are not directly related to fixing this bug just makes it harder for us to focus on it, so I would appreciate if you would consider voting for the bug instead. Thanks! :-) 6749548 ayg 2012-10-21 06:05:25 -0700 (In reply to Ehsan Akhgari [:ehsan] from comment #20) > So this is caused by the fact that our spellchecker is stupid and cannot > handle adjacent textnodes, and we need to fix that. Aryeh, I'd appreciate > if you can take a look at this. So I think what's happening here is that when a text node changes, in some cases we're invalidating only that node, not neighboring ones. I haven't found yet where this is happening, but it should be a simple fix once I do. Changing one text node really needs to invalidate the whole block. 6750909 ludovic 2012-10-22 06:05:10 -0700 *** Bug 804013 has been marked as a duplicate of this bug. *** 6751326 ludovic 2012-10-22 08:33:03 -0700 *** Bug 804164 has been marked as a duplicate of this bug. *** 6751725 ehsan.akhgari 2012-10-22 10:29:01 -0700 (In reply to comment #30) > (In reply to Ehsan Akhgari [:ehsan] from comment #20) > > So this is caused by the fact that our spellchecker is stupid and cannot > > handle adjacent textnodes, and we need to fix that. Aryeh, I'd appreciate > > if you can take a look at this. > > So I think what's happening here is that when a text node changes, in some > cases we're invalidating only that node, not neighboring ones. I haven't found > yet where this is happening, but it should be a simple fix once I do. Changing > one text node really needs to invalidate the whole block. Agreed. 6752619 piperpilot59 2012-10-22 13:42:40 -0700 This may help. First I use FF 15.0 and TB 16.0. I only have issues with the TB. Others in the office use TB 16.0 without issue. So it is random. I have tried changing fonts, variable vs. fixed and even other dictionaries with the same negative results. I just typed a note and emailed it to myself. The received email had an extra space between the words TB had thought were misspelled. In my email I back spaced into system (and TB underlined only tem)and the next word was and. The received email had two spaces between them (system _ _ and) So I think the composer is not displaying what it sees. It may think the first space after retyping letters is a character not a space. 6752664 ehsan.akhgari 2012-10-22 13:55:17 -0700 (In reply to comment #34) > I just typed a note and emailed it to myself. The received email had an extra > space between the words TB had thought were misspelled. In my email I back > spaced into system (and TB underlined only tem)and the next word was and. The > received email had two spaces between them (system _ _ and) So I think the > composer is not displaying what it sees. It may think the first space after > retyping letters is a character not a space. That's a different bug. Can you please report it separately? Thanks! 6753292 dannyfox 2012-10-22 16:41:27 -0700 Dan Moore: The issue is not random just because others are using TB16. The question is whether they are using the CHECK-AS-YOU-TYPE option which seems to be faulty in this release. 6755344 dan.amsentry 2012-10-23 09:20:49 -0700 The other PC does have TB16.0.1 and Check as you type is enabled. Since I forgot to uncheck "check for updates" on TB when I downgraded to 15 it went back to TB16 and the unwanted spell check as you type came back. I now have FF16 and I do not have a problem when composing in Gmail. I downloaded the new dictionary, but when I go to options and try to select the new US dictionary with the fix I don't see any new options, so I assume it is overwriting the existing. Does anyone know if I need to delete the existing US dictionary and install the fix one? 6755422 dan.amsentry 2012-10-23 09:43:38 -0700 When I sent the email to myself with the extra spaces here is the html This is a test of the spell check system  and its results when typing  words 6760426 mconley 2012-10-24 13:15:32 -0700 I'll try to take this. 6760472 674808 mconley 2012-10-24 13:26:16 -0700 Created attachment 674808 Patch v1 This patch addresses the bug exposed by the STR. Editor reftests pass, as well as the mochitests under editor/libeditor/text/tests. Going to toss this up on try to see what we get. 6760495 mconley 2012-10-24 13:29:52 -0700 Try builds coming in here: https://tbpl.mozilla.org/?tree=Try&rev=08c4bbb29212 6761388 jsabash 2012-10-24 17:27:30 -0700 Testing with the midas demo and a try build: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:19.0) Gecko/19.0 Firefox/19.0 I'm no longer able to reproduce. Given the importance of bug 590640 for TB, I'm happy the fix could be made in mozInlineSpellWordUtil.cpp rather than endangering the fixes there. 6761424 674808 ehsan.akhgari 2012-10-24 17:42:14 -0700 Comment on attachment 674808 Patch v1 Review of attachment 674808: ----------------------------------------------------------------- Here's my comments on the patch. Of course this needs a mochitest as well, and writing one should be fairly easy based on the STR in the bug. ::: extensions/spellcheck/src/mozInlineSpellWordUtil.cpp @@ +459,5 @@ > nsINode* node = mSoftBegin.mNode; > int32_t firstOffsetInNode = 0; > int32_t checkBeforeOffset = mSoftBegin.mOffset; > while (node) { > + Nit: drop the blank line please. @@ +461,5 @@ > int32_t checkBeforeOffset = mSoftBegin.mOffset; > while (node) { > + > + if (IsTextNode(node) && > + ContainsDOMWordSeparator(node, checkBeforeOffset, &firstOffsetInNode)) { This is adding a bug, since if IsTextNode returns true, IsBRElement called inside ContainsDOMWordSeparator can never return true, so we'll break those cases. This made me think about how we can make this code better. Maybe an easy way would be to refactor the stuff after "aNode is actually an nsIContent..." into its own function, say, TextNodeContainsDOMWordSeparator, don't touch this part of the code, and down in the inner loop call TextNodeContainsDOMWordSeparator directly. @@ +472,5 @@ > // of ContainsDOMWordSeparator here because there might be no preceding > // word separator (such as when we're at the end of the first word in > // the text node), in which case we just set the found offsets to 0. > // Otherwise, ContainsDOMWordSeparator finds us the correct word > // boundary so that we can avoid looking at too many words. This comment is no longer accurate, please correct it. @@ +474,5 @@ > // the text node), in which case we just set the found offsets to 0. > // Otherwise, ContainsDOMWordSeparator finds us the correct word > // boundary so that we can avoid looking at too many words. > + if (!ContainsDOMWordSeparator(node, firstOffsetInNode - 1, &newOffset)) { > + nsINode* prevNode = node->GetPreviousContent(mRootNode); You should do GetPreviousSibling here. @@ +477,5 @@ > + if (!ContainsDOMWordSeparator(node, firstOffsetInNode - 1, &newOffset)) { > + nsINode* prevNode = node->GetPreviousContent(mRootNode); > + while (prevNode && IsTextNode(prevNode)) { > + if (ContainsDOMWordSeparator(prevNode, INT32_MAX, &newOffset)) > + break; See above. 6764034 675227 mconley 2012-10-25 11:43:02 -0700 Created attachment 675227 Patch v2 Thanks for the review, Ehsan. Any better? 6764036 675228 mconley 2012-10-25 11:43:49 -0700 Created attachment 675228 Regression test 6764085 675227 ehsan.akhgari 2012-10-25 11:54:10 -0700 Comment on attachment 675227 Patch v2 Review of attachment 675227: ----------------------------------------------------------------- ::: extensions/spellcheck/src/mozInlineSpellWordUtil.cpp @@ +492,5 @@ > int32_t newOffset = 0; > if (firstOffsetInNode > 0) { > + // Try to find the previous word boundary in the current node. If > + // we can't find one, start checking previous sibling nodes (if any) > + // to see if we can find any text nodes with DOM word separators. s/any/any adjacent/ @@ +508,5 @@ > + &newOffset)) { > + break; > + } > + prevNode = prevNode->GetPreviousSibling(); > + mSoftBegin.mNode = prevNode; This code has a bug. If TextNodeContainsDOMWordSeparator returns true on the first iteration for example, mSoftBegin.mNode will point to the next node. 6764146 675228 ehsan.akhgari 2012-10-25 12:10:00 -0700 Comment on attachment 675228 Regression test Review of attachment 675228: ----------------------------------------------------------------- I think it's better to test the behavior of multiple adjacent textnodes explicitly, since we might change something in the future which would prevent the creation of multiple textnodes, and then this will end up being untested. 6764417 675255 mconley 2012-10-25 13:06:57 -0700 Created attachment 675255 Patch v3 Thanks for the review - and good catches. Fixed. 6764437 675257 mconley 2012-10-25 13:09:55 -0700 Created attachment 675257 Regression test v2 6764447 675259 mconley 2012-10-25 13:11:38 -0700 Created attachment 675259 Regression test v3 6764490 mconley 2012-10-25 13:21:45 -0700 Try for the latest patch for m-c: https://tbpl.mozilla.org/?tree=Try&rev=f55f364f9ae0 I'm also doing a Thunderbird try as well: https://tbpl.mozilla.org/?tree=Thunderbird-Try&rev=ad320e7e5772 6764937 675259 ehsan.akhgari 2012-10-25 14:51:46 -0700 Comment on attachment 675259 Regression test v3 Review of attachment 675259: ----------------------------------------------------------------- ::: editor/libeditor/html/tests/test_bug790475.html @@ +27,5 @@ > + > +var gMisspeltWords; > + > +function getEditor() { > + var Ci = Components.interfaces; Nit: const. @@ +28,5 @@ > +var gMisspeltWords; > + > +function getEditor() { > + var Ci = Components.interfaces; > + var win = window; What's the point of doing this? 6765070 675332 mconley 2012-10-25 15:28:04 -0700 Created attachment 675332 Regression test v4 (r+'d by ehsan) Thanks ehsan - nits fixed. 6765090 mconley 2012-10-25 15:34:43 -0700 Landed on inbound: Fix: https://hg.mozilla.org/integration/mozilla-inbound/rev/72e6fd5a0358 Regression test: https://hg.mozilla.org/integration/mozilla-inbound/rev/a75c3d861bf8 6765286 mconley 2012-10-25 16:39:22 -0700 I've got some try builds here - unfortunately, my Windows ones didn't go through (mozilla-central patch didn't apply cleanly on them for some reason), so I only have Linux and OSX. I'd love it if some people could try them out and see if we've addressed the bug: Linux: http://ftp.mozilla.org/pub/mozilla.org/thunderbird/try-builds/mconley@mozilla.com-ad320e7e5772/try-comm-central-linux/thunderbird-19.0a1.en-US.linux-i686.tar.bz2 OSX: http://ftp.mozilla.org/pub/mozilla.org/thunderbird/try-builds/mconley@mozilla.com-ad320e7e5772/try-comm-central-macosx64/thunderbird-19.0a1.en-US.mac.dmg If the patch I just landed on inbound sticks, Windows users might be able to test in Daily either tomorrow or the next day. 6766370 ryanvm 2012-10-26 04:36:56 -0700 https://hg.mozilla.org/mozilla-central/rev/72e6fd5a0358 https://hg.mozilla.org/mozilla-central/rev/a75c3d861bf8 6766597 675255 mconley 2012-10-26 06:53:56 -0700 Comment on attachment 675255 Patch v3 [Approval Request Comment] Bug caused by (feature/regressing bug #): 590640 User impact if declined: Broken behaviour for inline spellcheck - particularly evident in Thunderbird. Testing completed (on m-c, etc.): Simple regression test. We'd need more people to kick the tires on this - especially if this is something we wanted to fix in the ESRs... Risk to taking this patch (and alternatives if risky): The inline spellchecking code is pretty complex, and doesn't have much in the way of automated testing, so while I believe I've fixed the original problem, I can't guarantee I haven't introduced any new problems. The alternative is simply to keep having busted inline spellcheck. Backing out 590640 isn't really an option, and might be riskier than taking this patch. String or UUID changes made by this patch: None. 6766599 675255 mconley 2012-10-26 06:54:27 -0700 Comment on attachment 675255 Patch v3 See above. 6766609 675255 mconley 2012-10-26 06:56:39 -0700 Comment on attachment 675255 Patch v3 ESR 17 hasn't branched yet - de-requesting approval. 6767431 675255 lukasblakk+bugs 2012-10-26 11:02:03 -0700 Comment on attachment 675255 Patch v3 Go ahead and land to branches so we can get the tire kicking needed. Getting this in now will put it in ESR 17 for free, it doesn't fit the criteria for ESR uplift so we wouldn't take it for ESR 10. 6767435 lukasblakk+bugs 2012-10-26 11:02:57 -0700 adding qawanted and verifyme to make sure we get some testing around this once it's on Beta. 6767540 ehsan.akhgari 2012-10-26 11:25:29 -0700 https://hg.mozilla.org/releases/mozilla-aurora/rev/94e58a4f2153 https://hg.mozilla.org/releases/mozilla-aurora/rev/3e92a75116bb https://hg.mozilla.org/releases/mozilla-beta/rev/6efc3102c810 https://hg.mozilla.org/releases/mozilla-beta/rev/8fb3c3ea5e07 6782957 ludovic 2012-11-01 02:05:54 -0700 *** Bug 807128 has been marked as a duplicate of this bug. *** 6792919 ludovic 2012-11-05 07:27:21 -0800 *** Bug 779943 has been marked as a duplicate of this bug. *** 6792921 ludovic 2012-11-05 07:27:25 -0800 *** Bug 808034 has been marked as a duplicate of this bug. *** 6796989 virgil.dicu 2012-11-06 08:22:26 -0800 Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/17.0 Firefox/17.0 Could reproduce the initial issue on an older beta when using Arial font as in comment 13. Could no longer reproduce the initial issue in 17 beta 4. Verified with Windows 7, Mac OS 10.7 and Ubuntu 12.04. Misspelled words are underlined as expected, correctly spelled words are not underlined. Used random fonts within Preferences/Content, mail.yahoo.com, gmail.com. Also installed a Romanian dictionary, everything worked as expected afterwards as well. 6811492 sfhowes 2012-11-10 19:19:22 -0800 Still getting correctly-spelled words partially flagged (red line) with English (CA) dictionary, Variable width, on Earlybird (TB 18, Nov. 10)/XP. 6812123 mconley 2012-11-11 13:47:33 -0800 (In reply to sfhowes from comment #67) > Still getting correctly-spelled words partially flagged (red line) with > English (CA) dictionary, Variable width, on Earlybird (TB 18, Nov. 10)/XP. Can you give us some steps to reproduce? 6813768 sfhowes 2012-11-12 09:03:11 -0800 (In reply to Mike Conley (:mconley) from comment #68) > (In reply to sfhowes from comment #67) > > Still getting correctly-spelled words partially flagged (red line) with > > English (CA) dictionary, Variable width, on Earlybird (TB 18, Nov. 10)/XP. > > Can you give us some steps to reproduce? I wish I could, but it seems to appear randomly. I even replied to the same message with the same words, but this time there were no issues. 6827349 me.r.benz 2012-11-15 15:49:54 -0800 I think the real root cause of this problem is not in the spelling logic. Rather, I see that Thunderbird is putting random tags throughout my email message. When these font size tags split a word, that is when the spelling logic flags it as bad. For example: When I type this line The HTML email message has: When I type this line So spelling would not be flagging this as incorrect if all those extraneous font size tags were not getting put in there by mistake. So is this a spelling logic issue ... or is this an issue with the font size tags being generated randomly and incorrectly? 6827598 ehsan.akhgari 2012-11-15 17:27:46 -0800 This was a spell checking logic issue. 6828550 klasse 2012-11-16 04:16:59 -0800 (In reply to Ehsan Akhgari [:ehsan] from comment #71) > This was a spell checking logic issue. Does that mean that we need to submit another bug for the massively superfluous addition of information (in e.g. TB 16.0.2)? Because that's what became visible as the "spell check issue" to the user. The info is being added randomly, with no reason, sometimes within a word, which then for the spell checker splits the word. (Which one might even argue could be an expected behavior on the part of the spell checker, e.g. with artificially put together words e.g. in company logos, etc., when the font is manually changed within the word by the user.) One can see it when they save an e-mail to the drafts and then open the source code view of the e-mail; or view the source code of an already sent e-mail. Another side effect is that the e-mail size grows significantly with no reason. 6829468 ehsan.akhgari 2012-11-16 10:15:35 -0800 Yes, if you can reproduce, please file another bug with exact steps to reproduce. 6830270 me.r.benz 2012-11-16 14:09:02 -0800 (In reply to Ehsan Akhgari [:ehsan] from comment #73) > Yes, if you can reproduce, please file another bug with exact steps to > reproduce. I submitted Bug 812638 - Thunderbird is inserting random and incorrect tags in the middle of words throughout my email message. 6844249 KenSaunders 2012-11-21 18:17:11 -0800 Hey I hate to bother everyone getting this, and I'm not sure if this is uncommon or not, and, if I had a better way to do this then I would, but I wanted to send sincere thanks for fixing this. You all rock. This bug drove me nuts. It interrupted my workflow and distracted me. Kudos. Consider a virtual beer, or whatever your favorite beverage is sent. :) 6844279 klasse 2012-11-21 18:33:51 -0800 Unfortunately, this is still broken for me in the TB 17.0 release. Please see https://bugzilla.mozilla.org/show_bug.cgi?id=812638#c11 for reproduction procedure. 6849101 garysch 2012-11-24 05:48:04 -0800 Still have the problem. Updated both Firefox and Thunderbird to version 17, nothing seems to have changed. Agree with Comment 75. Have resorted to composing messages with HTML turned off, which is what I did with version 16. Not only is spell check problem still there, when composing in HTML, when spell check error occurs, outgoing message text changes font part-way down the message. I was holding off on installing pre-version 16 waiting for your fix, now guess I must try to go back to version 15. 6849556 KenSaunders 2012-11-24 16:59:20 -0800 Unfortunately, this issue has just made an appearance again. It's the first time since updating to 17 and oddly enough, it's only happened once and I can't reproduce it (sorry). I typed resources > data and urces was underlined with "sources" as one of the spell check suggestions. I first of all have to add my "I'm not a coder so I really don't know what I'm talking about and I'm just throwing darts" line, and I haven't read all of the comments but I'm wondering. Has this bug been reproduced in a new profile? I can't check that since it's only occurred once in 17.0. I could try 16.0 or 0.2 if anyone thinks it would help. I ask because I have a decent amount of add-ons in my default profile and the profile is very old. I don't remember this issue going all the way back to 10/9 or 11, but it may have on 10/29 with the update, I'm not sure but was it an update that has caused this, or some sort of corruption in a file? Or is that known? 6850295 lukasblakk+bugs 2012-11-25 18:16:06 -0800 Anthony/Juan - can you try reproducing in FF17 with or without a new profile? 6851181 virgil.dicu 2012-11-26 05:53:51 -0800 If anyone can reproduce, mind specifying the fonts you use, the dictionaries the steps to reproduce (if you can reproduce reliably)? FTR, this was initially reproduced consistently with the Arial font. Comment 13 lists the initial steps. These work for me with F17. If anyone wants to try to reproduce, those can be a good start (without switching to Arial and keeping your own fonts). 6851866 ehsan.akhgari 2012-11-26 09:29:05 -0800 (In reply to comment #80) > If anyone can reproduce, mind specifying the fonts you use, the dictionaries > the steps to reproduce (if you can reproduce reliably)? > > FTR, this was initially reproduced consistently with the Arial font. Comment 13 > lists the initial steps. These work for me with F17. If anyone wants to try to > reproduce, those can be a good start (without switching to Arial and keeping > your own fonts). The font being used doesn't (shouldn't!) make any difference. The most interesting bits are the source for the original email and the exact editing operations performed on it. FWIW, I'm fairly confident that the original bug here has been fixed, and what we're seeing is an unrelated issue which has the same manifestation. 6852078 sergei.ivn+bugzilla 2012-11-26 10:16:41 -0800 here's two screencasts with def. font and with changed font (to courier). http://db.tt/DgcAAuag http://db.tt/Lpyi71Yy but it's not new issues. my ancient TB14 has exactly the same behavior so i'm not sure if my report can help you. 6852429 klasse 2012-11-26 11:38:13 -0800 (In reply to Ehsan Akhgari [:ehsan] from comment #81) > (In reply to comment #80) > > If anyone can reproduce, mind specifying the fonts you use, the dictionaries > > the steps to reproduce (if you can reproduce reliably)? > > > > FTR, this was initially reproduced consistently with the Arial font. Comment 13 > > lists the initial steps. These work for me with F17. If anyone wants to try to > > reproduce, those can be a good start (without switching to Arial and keeping > > your own fonts). > > The font being used doesn't (shouldn't!) make any difference. The most > interesting bits are the source for the original email and the exact editing > operations performed on it. FWIW, I'm fairly confident that the original > bug here has been fixed, and what we're seeing is an unrelated issue which > has the same manifestation. 1. As repetition of comment 76, please see https://bugzilla.mozilla.org/show_bug.cgi?id=812638#c11 for step-by-step reproduction procedure on Thunderbird (also release 17.0). The issue is 100% reproducible. The "spell checking brocken" issue occurs when the info is placed within of a word. (Additionally to the backspacing described in the reproduction procedure, one could also try other in-text modifications, e.g. replacement, insertion within written text.) 2. Please see https://bugzilla.mozilla.org/show_bug.cgi?id=812638#c8 for used dictionaries. (I don't think they matter.) 2. It does, indeed, not depend of the used font (size) - it just needs to be non-default. 6852588 KenSaunders 2012-11-26 12:18:46 -0800 Results (17.0) I am writing to you about what's up. Spell check reproducing bug Hi, I am writing to you about what's up. Spell check reproducing bug Changing font to Arial. We'll see what happens Changing font to Arial. We'll see what happens Fixed width font. Does this work? I suppose I'll find out <tt>Fixed width f<tt>ont<tt>. Does this wo<tt>rk?<tt> I suppo<tt>se I'll find out</tt></tt> </tt></tt></tt></tt> Now some notes. After saving and editing again, the (supposedly) misspelled words are not underlined as they were when composing. When replying to an email, this issue has only occurred twice now for me (despite what's shown above), since updating to 17 but it happened while composing a new email or replying to one with 16.0.1 (or 2) every time. 6852661 klasse 2012-11-26 12:44:25 -0800 (In reply to Gary Schweinshaupt from comment #77) > [...] > Not only is spell check problem still there, when composing in HTML, when > spell check error occurs, outgoing message text changes font part-way down > the message. > [...] That could be one of the following (related?): bug 664615 bug 782215 bug 780406 6853308 me.r.benz 2012-11-26 15:13:20 -0800 (In reply to Ken Saunders from comment #84) > Results (17.0) > > I am writing to you about what's up. Spell check reproducing bug > > Hi, > > I am > writ sans-serif">ing to you abo face="Helvetica, Arial, sans-serif">ut what's up. > Spell check reproduc face="Helvetica, Arial, sans-serif">ing > bug > > > [...] This looks like the problem being described in: Bug 812638 - Thunderbird is inserting random and incorrect tags in the middle of words throughout my email message. You might want to post your comments in that bug report regarding the insertion of font tags in the middle of words. 6853319 me.r.benz 2012-11-26 15:16:50 -0800 (In reply to Joe Smith from comment #85) > That could be one of the following (related?): > bug 664615 > bug 782215 > bug 780406 Bug 812638 might also be related to this. 6859601 virgil.dicu 2012-11-28 06:43:23 -0800 Mozilla/5.0 (X11; Linux i686; rv:18.0) Gecko/18.0 Firefox/18.0 Marking as verified with Firefox 18 beta 1 on Windows 7, Mac OS 10.7 and Ubuntu 12.04. The initial issue described in comment 13 is fixed. Logged a similar bug in the process of verifying: bug 816073 (regression from Firefox 15). 6864153 virgil.dicu 2012-11-29 07:10:00 -0800 None of the issues reported in the last few comments have spun off from this bug, so I'll remove qawanted. Please re-add if there's anything left to do/test. 6917985 grmain 2012-12-15 09:59:40 -0800 NOT FIXED! Problem persists in TB17.0 6918054 mconley 2012-12-15 11:39:07 -0800 (In reply to G. R. Main from comment #90) > NOT FIXED! > > Problem persists in TB17.0 Hello G.R. Main. If you're seeing the described symptoms after following the precise steps in comment 13, we'll consider re-opening this bug. If not, what you're seeing is likely a separate bug that has a similar manifestation. Please see the comments above for the related bugs that have been filed, and please comment and follow those, as opposed to this closed bug. Thanks! -Mike 6940885 grmain 2012-12-22 11:17:42 -0800 Sir, Problem persists: TB 17.0 Linux (Linux Mint 12 64Bit) WinXP Sp3 (32Bit) With Composition Perfs set to default for HTML ( Variable Width, Medium size) Problem appears to be gone. Set Composition Perfs for HTML to Helvectia,Arial Large Size, Problem of inserting " " reappears. View of Source Code: User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 X-Enigmail-Version: 1.4.6 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit <html> <head> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> Now is the time for all good men to come to the aid of their country. The quick brown fox jumped over the lazy dog's back 134567890 times. Now is the time for all good men to come to the aid of their country. The quick brown fox jumped over the lazy dog's back 1234567890 times. </body> </html> End of Source Code Cheers, G. R. Main 6944646 bugzilla2007 2012-12-26 04:00:58 -0800 Whatever the technical relation of this bug to bug Bug 812638, let's add a link for ease of tracking and analysis, per Bug 812638 Comment 2. 6978422 bugzilla2007 2013-01-09 02:07:17 -0800 (In reply to Mike Conley (:mconley) from comment #91) > (In reply to G. R. Main from comment #90) > > NOT FIXED! > > Problem persists in TB17.0 +1 > If you're seeing the described symptoms after following the precise steps in > comment 13, we'll consider re-opening this bug. (In reply to Mike Conley (:mconley) from comment #13) > I was able to reproduce this in Firefox 16.0.1 with the following STR: > 1) Go to http://www-archive.mozilla.org/editor/midasdemo/ > 2) Change the font to Arial > 3) In the textarea, type "I am testung" > 4) Press space - you should see the red squiggly under "testung" Mike, typing misspelled English words like "testung" into *Midasdemo* per your STR does *not* show any red squiggly underlining for me. Does it for you? Otherwise, basically following your STR of comment 13 in Thunderbird reproduces this bug for me every time (both release & trunk), albeit only if using certain size values for deprecated font size attribute in around the msg body (which is what we use when changing composition's default font size in preferences!). STR 1 compose new HTML msg 2 in msg body, type misspelled word "I am testung " (sic! testung followed by one space) 3 Ctrl+A, Insert > HTML 4 add font tags around msg body HTML, then [Insert], like this: I am testung where x must be between 1 and 6 (sic!), or between -3 and +3 (sic!); surprisingly, bug will *not* occur for - max values of font size attribute (7, +4) - invalid values of font size attribute (>7, or >+4, e.g. 8 or +5 etc.) - non-default font *face* attributes aka 5 hit backspace 4 times to erase "ung " 6 type "ing x" to make it "I am testing x" where x is any alphanumeric character 7 observe spell check marks on "testing" (red squiggly) 8 verify HTML source (Ctrl+A, Insert > HTML) Actual result 7 "ing" part of "testing" is marked as misspelled (red squiggly) - this bug 8 redundant font tags are wrongly added in source (emphasis stars added by me), Bug 812638: I am test**ing a** Expected result 7 "testing" is correctly spelled hence should not get marked misspelled in any way (this bug 790475, currently titled "Spell checking is broken"!) 8 redundant font tags should not be added (Bug 812638; imho this is a major bug which should be fixed immediately to stop that tag pollution) (In reply to Mike Conley (:mconley) from comment #91) > (In reply to G. R. Main from comment #90) > > NOT FIXED! > > Problem persists in TB17.0 > If you're seeing the described symptoms after following the precise steps in > comment 13, we'll consider re-opening this bug. > > If not, what you're seeing is likely a separate bug that has a similar > manifestation. Please see the comments above for the related bugs that have > been filed, and please comment and follow those, as opposed to this closed > bug. Thanks! -Mike Mike, if you think that that this bug is fixed and whatever remains should be fixed in other bugs like bug 812638, then I recommend the following: 1) clarify in the bug summary and a comment what exactly this bug has fixed, and for which version of TB these fixes will land: The current summary ("Spell checking broken") is very unspecific and will naturally invite "me too" comments of all sorts, even after reading STR of comment 13, more so given that the exact *symptoms* of this bug as described in comment 13 are still present (as shown above in this comment) 2) add a whiteboard disclaimer pointing to an authoritative comment that explains what this bug is (not) about, to what extent further comments here are unwanted, and in which bugs the remaining problems are addressed. 6979471 mconley 2013-01-09 06:44:10 -0800 (In reply to Thomas D. from comment #94) > (In reply to Mike Conley (:mconley) from comment #91) > > (In reply to G. R. Main from comment #90) > > > NOT FIXED! > > > Problem persists in TB17.0 > > +1 > > > If you're seeing the described symptoms after following the precise steps in > > comment 13, we'll consider re-opening this bug. > > (In reply to Mike Conley (:mconley) from comment #13) > > I was able to reproduce this in Firefox 16.0.1 with the following STR: > > 1) Go to http://www-archive.mozilla.org/editor/midasdemo/ > > 2) Change the font to Arial > > 3) In the textarea, type "I am testung" > > 4) Press space - you should see the red squiggly under "testung" > > Mike, typing misspelled English words like "testung" into *Midasdemo* per > your STR does *not* show any red squiggly underlining for me. Does it for > you? > > Otherwise, basically following your STR of comment 13 in Thunderbird > reproduces this bug for me every time (both release & trunk), albeit only if > using certain size values for deprecated font size attribute in size="x"> around the msg body (which is what we use when changing > composition's default font size in preferences!). > > STR > > 1 compose new HTML msg > 2 in msg body, type misspelled word "I am testung " (sic! testung followed > by one space) > 3 Ctrl+A, Insert > HTML > 4 add font tags around msg body HTML, then [Insert], like this: > > I am testung > where x must be between 1 and 6 (sic!), or between -3 and +3 (sic!); > surprisingly, bug will *not* occur for > - max values of font size attribute (7, +4) > - invalid values of font size attribute (>7, or >+4, e.g. 8 or +5 etc.) > - non-default font *face* attributes aka > > 5 hit backspace 4 times to erase "ung " > 6 type "ing x" to make it "I am testing x" where x is any alphanumeric > character > 7 observe spell check marks on "testing" (red squiggly) > 8 verify HTML source (Ctrl+A, Insert > HTML) > > Actual result > > 7 "ing" part of "testing" is marked as misspelled (red squiggly) - this bug > 8 redundant font tags are wrongly added in source (emphasis stars added by > me), Bug 812638: > > I am test**ing a** > > > > Expected result > > 7 "testing" is correctly spelled hence should not get marked misspelled in > any way (this bug 790475, currently titled "Spell checking is broken"!) > > 8 redundant font tags should not be added (Bug 812638; imho this is a major > bug which should be fixed immediately to stop that tag pollution) > I believe that Actual Result #7 is a direct result of Actual Result #8. I believe you're seeing symptoms of bug 812638. > (In reply to Mike Conley (:mconley) from comment #91) > > (In reply to G. R. Main from comment #90) > > > NOT FIXED! > > > Problem persists in TB17.0 > > If you're seeing the described symptoms after following the precise steps in > > comment 13, we'll consider re-opening this bug. > > > > If not, what you're seeing is likely a separate bug that has a similar > > manifestation. Please see the comments above for the related bugs that have > > been filed, and please comment and follow those, as opposed to this closed > > bug. Thanks! -Mike > > Mike, if you think that that this bug is fixed and whatever remains should > be fixed in other bugs like bug 812638, then I recommend the following: > > 1) clarify in the bug summary and a comment what exactly this bug has fixed, > and for which version of TB these fixes will land: The current summary > ("Spell checking broken") is very unspecific and will naturally invite "me > too" comments of all sorts, even after reading STR of comment 13, more so > given that the exact *symptoms* of this bug as described in comment 13 are > still present (as shown above in this comment) > Good idea. > 2) add a whiteboard disclaimer pointing to an authoritative comment that > explains what this bug is (not) about, to what extent further comments here > are unwanted, and in which bugs the remaining problems are addressed. Ok, I'm making this the authoritative comment. Folks: this bug dealt with the inline spellcheck not correctly traversing sibling text nodes. The exact steps to reproduce are in Comment 13, and should be executed in a new profile. If you're seeing similar behaviours, it's almost certainly due to bug 812638. 7185484 2aec61ed 2013-03-09 04:03:12 -0800 Statuus should NOT be FIXED! Still having this bug in 17.0.3, and it's really getting old! 7185487 2aec61ed 2013-03-09 04:04:05 -0800 Status should NOT be "resolved". Still having this bug in 17.0.3, and it's really getting old! 7185488 2aec61ed 2013-03-09 04:05:14 -0800 Damn, why isn't there an edit/delete link?! 7197996 ayg 2013-03-13 06:50:38 -0700 "Target Milestone" says mozilla19. That means that the fix has landed in the central source code repository, and is present in Firefox/Thunderbird 19. It isn't fixed in 17 or 18. Hope that helps! 7198145 LD_Bugzilla 2013-03-13 07:30:55 -0700 howdy y'all, i'm a tad ignorant of what this means ... "status-firefox17: verified " i THOT it meant that this was fixed in ff17. i also thot it would mean that it would be fixed in tbird17 since this is apparently core stuff, not firefox specific stuff. i'm aware that the poster from comment 96 may well be seeing the results of related bug 812638. that one is listed as "Target Milestone: mozilla21" and marked as FIXED. that won't show up until tbird 17.0.5 or later, i suppose. that's another bug, tho. so, is this specific core bug NOT fixed in tb17? take care, lee 7202311 ayg 2013-03-14 05:22:45 -0700 (In reply to Lee_Dailey from comment #100) > i'm a tad ignorant of what this means ... > "status-firefox17: verified " IIUC, it means that it has been verified that the bug exists in version 17, not that it's been fixed. The first fixed version is given by the target milestone. If the fix were backported, it would be "status-firefox17: fixed". But I'm not sure what the difference is between "affected"/"verified" and "wontfix", and can't find any page that gives info on the status flags. Hope that helps. 7204111 mkmelin+mozilla 2013-03-14 12:09:04 -0700 AFAIK - "affected" means it's known to exist in a certian version (but not yet fixed) - "verified" means QA has tested that a fix committed for that version ineeed works (status is changed from "fixed" to "verified"). 7204686 ehsan.akhgari 2013-03-14 14:06:11 -0700 (In reply to comment #102) > AFAIK > - "affected" means it's known to exist in a certian version (but not yet > fixed) > - "verified" means QA has tested that a fix committed for that version ineeed > works (status is changed from "fixed" to "verified"). Yeah I think that's the case. 7206552 LD_Bugzilla 2013-03-15 01:06:41 -0700 howdy y'all, thanks for the confirmation. i had seen another bug comment that explained what was meant but can't find it. as i recall, it matches the info from Magnus Melin. so this _specific_ bug otta be fixed in any gecko-17 based app. that would include both ff17 and tb17. hopefully the poster from comment 96 will see this and look into bug 812638. take care, lee 7611535 magicandre1981 2013-07-08 13:39:55 -0700 In Firefox 23 (beta) the spellcheck is broken again for me. 674808 2012-10-24 13:26:16 -0700 2012-10-25 11:43:02 -0700 Patch v1 790475-v1.diff text/plain 3042 mconley ZGlmZiAtLWdpdCBhL2V4dGVuc2lvbnMvc3BlbGxjaGVjay9zcmMvbW96SW5saW5lU3BlbGxXb3Jk VXRpbC5jcHAgYi9leHRlbnNpb25zL3NwZWxsY2hlY2svc3JjL21veklubGluZVNwZWxsV29yZFV0 aWwuY3BwCi0tLSBhL2V4dGVuc2lvbnMvc3BlbGxjaGVjay9zcmMvbW96SW5saW5lU3BlbGxXb3Jk VXRpbC5jcHAKKysrIGIvZXh0ZW5zaW9ucy9zcGVsbGNoZWNrL3NyYy9tb3pJbmxpbmVTcGVsbFdv cmRVdGlsLmNwcApAQCAtMzc3LDE5ICszNzcsMTYgQEAgSXNCUkVsZW1lbnQobnNJTm9kZSogYU5v ZGUpCiBzdGF0aWMgYm9vbAogQ29udGFpbnNET01Xb3JkU2VwYXJhdG9yKG5zSU5vZGUqIGFOb2Rl LCBpbnQzMl90IGFCZWZvcmVPZmZzZXQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgaW50MzJf dCogYVNlcGFyYXRvck9mZnNldCkKIHsKICAgaWYgKElzQlJFbGVtZW50KGFOb2RlKSkgewogICAg ICphU2VwYXJhdG9yT2Zmc2V0ID0gMDsKICAgICByZXR1cm4gdHJ1ZTsKICAgfQotICAKLSAgaWYg KCFJc1RleHROb2RlKGFOb2RlKSkKLSAgICByZXR1cm4gZmFsc2U7CiAKICAgLy8gYU5vZGUgaXMg YWN0dWFsbHkgYW4gbnNJQ29udGVudCwgc2luY2UgaXQncyBlVEVYVAogICBuc0lDb250ZW50KiBj b250ZW50ID0gc3RhdGljX2Nhc3Q8bnNJQ29udGVudCo+KGFOb2RlKTsKICAgY29uc3QgbnNUZXh0 RnJhZ21lbnQqIHRleHRGcmFnbWVudCA9IGNvbnRlbnQtPkdldFRleHQoKTsKICAgTlNfQVNTRVJU SU9OKHRleHRGcmFnbWVudCwgIldoZXJlIGlzIG91ciB0ZXh0PyIpOwogICBmb3IgKGludDMyX3Qg aSA9IE5TX01JTihhQmVmb3JlT2Zmc2V0LCBpbnQzMl90KHRleHRGcmFnbWVudC0+R2V0TGVuZ3Ro KCkpKSAtIDE7IGkgPj0gMDsgLS1pKSB7CiAgICAgaWYgKElzRE9NV29yZFNlcGFyYXRvcih0ZXh0 RnJhZ21lbnQtPkNoYXJBdChpKSkpIHsKICAgICAgIC8vIEJlIGdyZWVkeSwgZmluZCBhcyBtYW55 IHNlcGFyYXRvcnMgYXMgd2UgY2FuCkBAIC00NTgsMjkgKzQ1NSwzOSBAQCBtb3pJbmxpbmVTcGVs bFdvcmRVdGlsOjpCdWlsZFNvZnRUZXh0KCkKICAgLy8gRmlyc3Qgd2UgaGF2ZSB0byB3b3JrIGJh Y2t3YXJkcyBmcm9tIG1Tb2Z0U3RhcnQgdG8gZmluZCBhIHRleHQgbm9kZQogICAvLyBjb250YWlu aW5nIGEgRE9NIHdvcmQgc2VwYXJhdG9yLCBhIG5vbi1pbmxpbmUtZWxlbWVudAogICAvLyBib3Vu ZGFyeSwgb3IgdGhlIGhhcmQgc3RhcnQgbm9kZS4gVGhhdCdzIHdoZXJlIHdlJ2xsIHN0YXJ0IGJ1 aWxkaW5nIHRoZQogICAvLyBzb2Z0IHN0cmluZyBmcm9tLgogICBuc0lOb2RlKiBub2RlID0gbVNv ZnRCZWdpbi5tTm9kZTsKICAgaW50MzJfdCBmaXJzdE9mZnNldEluTm9kZSA9IDA7CiAgIGludDMy X3QgY2hlY2tCZWZvcmVPZmZzZXQgPSBtU29mdEJlZ2luLm1PZmZzZXQ7CiAgIHdoaWxlIChub2Rl KSB7Ci0gICAgaWYgKENvbnRhaW5zRE9NV29yZFNlcGFyYXRvcihub2RlLCBjaGVja0JlZm9yZU9m ZnNldCwgJmZpcnN0T2Zmc2V0SW5Ob2RlKSkgeworCisgICAgaWYgKElzVGV4dE5vZGUobm9kZSkg JiYKKyAgICAgICAgQ29udGFpbnNET01Xb3JkU2VwYXJhdG9yKG5vZGUsIGNoZWNrQmVmb3JlT2Zm c2V0LCAmZmlyc3RPZmZzZXRJbk5vZGUpKSB7CiAgICAgICBpZiAobm9kZSA9PSBtU29mdEJlZ2lu Lm1Ob2RlKSB7CiAgICAgICAgIC8vIElmIHdlIGZpbmQgYSB3b3JkIHNlcGFyYXRvciBvbiB0aGUg Zmlyc3Qgbm9kZSwgbG9vayBhdCB0aGUgcHJlY2VkaW5nCiAgICAgICAgIC8vIHdvcmQgb24gdGhl IHRleHQgbm9kZSBhcyB3ZWxsLgogICAgICAgICBpbnQzMl90IG5ld09mZnNldCA9IDA7CiAgICAg ICAgIGlmIChmaXJzdE9mZnNldEluTm9kZSA+IDApIHsKICAgICAgICAgICAvLyBUcnkgdG8gZmlu ZCB0aGUgcHJldmlvdXMgd29yZCBib3VuZGFyeS4gIFdlIGlnbm9yZSB0aGUgcmV0dXJuIHZhbHVl CiAgICAgICAgICAgLy8gb2YgQ29udGFpbnNET01Xb3JkU2VwYXJhdG9yIGhlcmUgYmVjYXVzZSB0 aGVyZSBtaWdodCBiZSBubyBwcmVjZWRpbmcKICAgICAgICAgICAvLyB3b3JkIHNlcGFyYXRvciAo c3VjaCBhcyB3aGVuIHdlJ3JlIGF0IHRoZSBlbmQgb2YgdGhlIGZpcnN0IHdvcmQgaW4KICAgICAg ICAgICAvLyB0aGUgdGV4dCBub2RlKSwgaW4gd2hpY2ggY2FzZSB3ZSBqdXN0IHNldCB0aGUgZm91 bmQgb2Zmc2V0cyB0byAwLgogICAgICAgICAgIC8vIE90aGVyd2lzZSwgQ29udGFpbnNET01Xb3Jk U2VwYXJhdG9yIGZpbmRzIHVzIHRoZSBjb3JyZWN0IHdvcmQKICAgICAgICAgICAvLyBib3VuZGFy eSBzbyB0aGF0IHdlIGNhbiBhdm9pZCBsb29raW5nIGF0IHRvbyBtYW55IHdvcmRzLgotICAgICAg ICAgIENvbnRhaW5zRE9NV29yZFNlcGFyYXRvcihub2RlLCBmaXJzdE9mZnNldEluTm9kZSAtIDEs ICZuZXdPZmZzZXQpOworICAgICAgICAgIGlmICghQ29udGFpbnNET01Xb3JkU2VwYXJhdG9yKG5v ZGUsIGZpcnN0T2Zmc2V0SW5Ob2RlIC0gMSwgJm5ld09mZnNldCkpIHsKKyAgICAgICAgICAgIG5z SU5vZGUqIHByZXZOb2RlID0gbm9kZS0+R2V0UHJldmlvdXNDb250ZW50KG1Sb290Tm9kZSk7Cisg ICAgICAgICAgICB3aGlsZSAocHJldk5vZGUgJiYgSXNUZXh0Tm9kZShwcmV2Tm9kZSkpIHsKKyAg ICAgICAgICAgICAgaWYgKENvbnRhaW5zRE9NV29yZFNlcGFyYXRvcihwcmV2Tm9kZSwgSU5UMzJf TUFYLCAmbmV3T2Zmc2V0KSkKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAg cHJldk5vZGUgPSBwcmV2Tm9kZS0+R2V0UHJldmlvdXNTaWJsaW5nKCk7CisgICAgICAgICAgICAg IG1Tb2Z0QmVnaW4ubU5vZGUgPSBwcmV2Tm9kZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9 CiAgICAgICAgIH0KICAgICAgICAgZmlyc3RPZmZzZXRJbk5vZGUgPSBuZXdPZmZzZXQ7CiAgICAg ICAgIG1Tb2Z0QmVnaW4ubU9mZnNldCA9IG5ld09mZnNldDsKICAgICAgIH0KICAgICAgIGJyZWFr OwogICAgIH0KICAgICBjaGVja0JlZm9yZU9mZnNldCA9IElOVDMyX01BWDsKICAgICBpZiAoSXNC cmVha0VsZW1lbnQobm9kZSkpIHsK 675227 2012-10-25 11:43:02 -0700 2012-10-25 13:06:57 -0700 Patch v2 790475-v2.diff text/plain 5771 mconley ZGlmZiAtLWdpdCBhL2V4dGVuc2lvbnMvc3BlbGxjaGVjay9zcmMvbW96SW5saW5lU3BlbGxXb3Jk VXRpbC5jcHAgYi9leHRlbnNpb25zL3NwZWxsY2hlY2svc3JjL21veklubGluZVNwZWxsV29yZFV0 aWwuY3BwCi0tLSBhL2V4dGVuc2lvbnMvc3BlbGxjaGVjay9zcmMvbW96SW5saW5lU3BlbGxXb3Jk VXRpbC5jcHAKKysrIGIvZXh0ZW5zaW9ucy9zcGVsbGNoZWNrL3NyYy9tb3pJbmxpbmVTcGVsbFdv cmRVdGlsLmNwcApAQCAtMzYyLDM1ICszNjIsMzMgQEAgSXNET01Xb3JkU2VwYXJhdG9yKFBSVW5p Y2hhciBjaCkKIHN0YXRpYyBpbmxpbmUgYm9vbAogSXNCUkVsZW1lbnQobnNJTm9kZSogYU5vZGUp CiB7CiAgIHJldHVybiBhTm9kZS0+SXNFbGVtZW50KCkgJiYKICAgICAgICAgIGFOb2RlLT5Bc0Vs ZW1lbnQoKS0+SXNIVE1MKG5zR2tBdG9tczo6YnIpOwogfQogCiAvKioKLSAqIENoZWNrIGlmIHRo ZXJlJ3MgYSBET00gd29yZCBzZXBhcmF0b3IgYmVmb3JlIGFCZWZvcmVPZmZzZXQgaW4gdGhpcyBu b2RlLgotICogQWx3YXlzIHJldHVybnMgdHJ1ZSBpZiBpdCdzIGEgQlIgZWxlbWVudC4KLSAqIGFT ZXBhcmF0b3JPZmZzZXQgaXMgc2V0IHRvIHRoZSBpbmRleCBvZiB0aGUgZmlyc3QgY2hhcmFjdGVy IGluIHRoZSBsYXN0Ci0gKiBzZXBhcmF0b3IgaWYgYW55IGlzIGZvdW5kICgwIGZvciBCUiBlbGVt ZW50cykuCisgKiBHaXZlbiBhIFRleHROb2RlLCBjaGVja3MgdG8gc2VlIGlmIHRoZXJlJ3MgYSBE T00gd29yZCBzZXBhcmF0b3IgYmVmb3JlCisgKiBhQmVmb3JlT2Zmc2V0IHdpdGhpbiBpdC4gVGhp cyBmdW5jdGlvbiBkb2VzIG5vdCBtb2RpZnkgYVNlcGFyYXRvck9mZnNldCB3aGVuCisgKiBpdCBy ZXR1cm5zIGZhbHNlLgogICoKLSAqIFRoaXMgZnVuY3Rpb24gZG9lcyBub3QgbW9kaWZ5IGFTZXBh cmF0b3JPZmZzZXQgd2hlbiBpdCByZXR1cm5zIGZhbHNlLgorICogQHBhcmFtIGFOb2RlIHRoZSBU ZXh0Tm9kZSB0byBjaGVjay4KKyAqIEBwYXJhbSBhQmVmb3JlT2Zmc2V0IHRoZSBvZmZzZXQgaW4g dGhlIFRleHROb2RlIGJlZm9yZSB3aGljaCB3ZSB3aWxsIHNlYXJjaAorICogICAgICAgIGZvciB0 aGUgRE9NIHNlcGFyYXRvci4gWW91IGNhbiBwYXNzIElOVDMyX01BWCB0byBzZWFyY2ggdGhlIGVu dGlyZQorICogICAgICAgIGxlbmd0aCBvZiB0aGUgc3RyaW5nLgorICogQHBhcmFtIGFTZXBhcmF0 b3JPZmZzZXQgd2lsbCBiZSBzZXQgdG8gdGhlIG9mZnNldCBvZiB0aGUgZmlyc3Qgc2VwYXJhdG9y IGl0CisgKiAgICAgICAgZW5jb3VudGVycy4gV2lsbCBub3QgYmUgd3JpdHRlbiB0byBpZiBubyBz ZXBhcmF0b3IgaXMgZm91bmQuCisgKiBAcmV0dXJucyBUcnVlIGlmIGl0IGZvdW5kIGEgc2VwYXJh dG9yLgogICovCiBzdGF0aWMgYm9vbAotQ29udGFpbnNET01Xb3JkU2VwYXJhdG9yKG5zSU5vZGUq IGFOb2RlLCBpbnQzMl90IGFCZWZvcmVPZmZzZXQsCi0gICAgICAgICAgICAgICAgICAgICAgICAg aW50MzJfdCogYVNlcGFyYXRvck9mZnNldCkKK1RleHROb2RlQ29udGFpbnNET01Xb3JkU2VwYXJh dG9yKG5zSU5vZGUqIGFOb2RlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50 MzJfdCBhQmVmb3JlT2Zmc2V0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50 MzJfdCogYVNlcGFyYXRvck9mZnNldCkKIHsKLSAgaWYgKElzQlJFbGVtZW50KGFOb2RlKSkgewot ICAgICphU2VwYXJhdG9yT2Zmc2V0ID0gMDsKLSAgICByZXR1cm4gdHJ1ZTsKLSAgfQotICAKLSAg aWYgKCFJc1RleHROb2RlKGFOb2RlKSkKLSAgICByZXR1cm4gZmFsc2U7Ci0KICAgLy8gYU5vZGUg aXMgYWN0dWFsbHkgYW4gbnNJQ29udGVudCwgc2luY2UgaXQncyBlVEVYVAogICBuc0lDb250ZW50 KiBjb250ZW50ID0gc3RhdGljX2Nhc3Q8bnNJQ29udGVudCo+KGFOb2RlKTsKICAgY29uc3QgbnNU ZXh0RnJhZ21lbnQqIHRleHRGcmFnbWVudCA9IGNvbnRlbnQtPkdldFRleHQoKTsKICAgTlNfQVNT RVJUSU9OKHRleHRGcmFnbWVudCwgIldoZXJlIGlzIG91ciB0ZXh0PyIpOwogICBmb3IgKGludDMy X3QgaSA9IE5TX01JTihhQmVmb3JlT2Zmc2V0LCBpbnQzMl90KHRleHRGcmFnbWVudC0+R2V0TGVu Z3RoKCkpKSAtIDE7IGkgPj0gMDsgLS1pKSB7CiAgICAgaWYgKElzRE9NV29yZFNlcGFyYXRvcih0 ZXh0RnJhZ21lbnQtPkNoYXJBdChpKSkpIHsKICAgICAgIC8vIEJlIGdyZWVkeSwgZmluZCBhcyBt YW55IHNlcGFyYXRvcnMgYXMgd2UgY2FuCiAgICAgICBmb3IgKGludDMyX3QgaiA9IGkgLSAxOyBq ID49IDA7IC0taikgewpAQCAtNDAyLDE2ICs0MDAsNDAgQEAgQ29udGFpbnNET01Xb3JkU2VwYXJh dG9yKG5zSU5vZGUqIGFOb2RlLAogICAgICAgfQogICAgICAgKmFTZXBhcmF0b3JPZmZzZXQgPSBp OwogICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogICB9CiAgIHJldHVybiBmYWxzZTsKIH0KIAor LyoqCisgKiBDaGVjayBpZiB0aGVyZSdzIGEgRE9NIHdvcmQgc2VwYXJhdG9yIGJlZm9yZSBhQmVm b3JlT2Zmc2V0IGluIHRoaXMgbm9kZS4KKyAqIEFsd2F5cyByZXR1cm5zIHRydWUgaWYgaXQncyBh IEJSIGVsZW1lbnQuCisgKiBhU2VwYXJhdG9yT2Zmc2V0IGlzIHNldCB0byB0aGUgaW5kZXggb2Yg dGhlIGZpcnN0IGNoYXJhY3RlciBpbiB0aGUgbGFzdAorICogc2VwYXJhdG9yIGlmIGFueSBpcyBm b3VuZCAoMCBmb3IgQlIgZWxlbWVudHMpLgorICoKKyAqIFRoaXMgZnVuY3Rpb24gZG9lcyBub3Qg bW9kaWZ5IGFTZXBhcmF0b3JPZmZzZXQgd2hlbiBpdCByZXR1cm5zIGZhbHNlLgorICovCitzdGF0 aWMgYm9vbAorQ29udGFpbnNET01Xb3JkU2VwYXJhdG9yKG5zSU5vZGUqIGFOb2RlLCBpbnQzMl90 IGFCZWZvcmVPZmZzZXQsCisgICAgICAgICAgICAgICAgICAgICAgICAgaW50MzJfdCogYVNlcGFy YXRvck9mZnNldCkKK3sKKyAgaWYgKElzQlJFbGVtZW50KGFOb2RlKSkgeworICAgICphU2VwYXJh dG9yT2Zmc2V0ID0gMDsKKyAgICByZXR1cm4gdHJ1ZTsKKyAgfQorCisgIGlmICghSXNUZXh0Tm9k ZShhTm9kZSkpCisgICAgcmV0dXJuIGZhbHNlOworCisgIHJldHVybiBUZXh0Tm9kZUNvbnRhaW5z RE9NV29yZFNlcGFyYXRvcihhTm9kZSwgYUJlZm9yZU9mZnNldCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGFTZXBhcmF0b3JPZmZzZXQpOworfQorCiBzdGF0aWMg Ym9vbAogSXNCcmVha0VsZW1lbnQobnNJTm9kZSogYU5vZGUpCiB7CiAgIGlmICghYU5vZGUtPklz RWxlbWVudCgpKSB7CiAgICAgcmV0dXJuIGZhbHNlOwogICB9CiAKICAgZG9tOjpFbGVtZW50ICpl bGVtZW50ID0gYU5vZGUtPkFzRWxlbWVudCgpOwpAQCAtNDY0LDIzICs0ODYsMzcgQEAgbW96SW5s aW5lU3BlbGxXb3JkVXRpbDo6QnVpbGRTb2Z0VGV4dCgpCiAgIGludDMyX3QgY2hlY2tCZWZvcmVP ZmZzZXQgPSBtU29mdEJlZ2luLm1PZmZzZXQ7CiAgIHdoaWxlIChub2RlKSB7CiAgICAgaWYgKENv bnRhaW5zRE9NV29yZFNlcGFyYXRvcihub2RlLCBjaGVja0JlZm9yZU9mZnNldCwgJmZpcnN0T2Zm c2V0SW5Ob2RlKSkgewogICAgICAgaWYgKG5vZGUgPT0gbVNvZnRCZWdpbi5tTm9kZSkgewogICAg ICAgICAvLyBJZiB3ZSBmaW5kIGEgd29yZCBzZXBhcmF0b3Igb24gdGhlIGZpcnN0IG5vZGUsIGxv b2sgYXQgdGhlIHByZWNlZGluZwogICAgICAgICAvLyB3b3JkIG9uIHRoZSB0ZXh0IG5vZGUgYXMg d2VsbC4KICAgICAgICAgaW50MzJfdCBuZXdPZmZzZXQgPSAwOwogICAgICAgICBpZiAoZmlyc3RP ZmZzZXRJbk5vZGUgPiAwKSB7Ci0gICAgICAgICAgLy8gVHJ5IHRvIGZpbmQgdGhlIHByZXZpb3Vz IHdvcmQgYm91bmRhcnkuICBXZSBpZ25vcmUgdGhlIHJldHVybiB2YWx1ZQotICAgICAgICAgIC8v IG9mIENvbnRhaW5zRE9NV29yZFNlcGFyYXRvciBoZXJlIGJlY2F1c2UgdGhlcmUgbWlnaHQgYmUg bm8gcHJlY2VkaW5nCi0gICAgICAgICAgLy8gd29yZCBzZXBhcmF0b3IgKHN1Y2ggYXMgd2hlbiB3 ZSdyZSBhdCB0aGUgZW5kIG9mIHRoZSBmaXJzdCB3b3JkIGluCi0gICAgICAgICAgLy8gdGhlIHRl eHQgbm9kZSksIGluIHdoaWNoIGNhc2Ugd2UganVzdCBzZXQgdGhlIGZvdW5kIG9mZnNldHMgdG8g MC4KLSAgICAgICAgICAvLyBPdGhlcndpc2UsIENvbnRhaW5zRE9NV29yZFNlcGFyYXRvciBmaW5k cyB1cyB0aGUgY29ycmVjdCB3b3JkCi0gICAgICAgICAgLy8gYm91bmRhcnkgc28gdGhhdCB3ZSBj YW4gYXZvaWQgbG9va2luZyBhdCB0b28gbWFueSB3b3Jkcy4KLSAgICAgICAgICBDb250YWluc0RP TVdvcmRTZXBhcmF0b3Iobm9kZSwgZmlyc3RPZmZzZXRJbk5vZGUgLSAxLCAmbmV3T2Zmc2V0KTsK KyAgICAgICAgICAvLyBUcnkgdG8gZmluZCB0aGUgcHJldmlvdXMgd29yZCBib3VuZGFyeSBpbiB0 aGUgY3VycmVudCBub2RlLiBJZgorICAgICAgICAgIC8vIHdlIGNhbid0IGZpbmQgb25lLCBzdGFy dCBjaGVja2luZyBwcmV2aW91cyBzaWJsaW5nIG5vZGVzIChpZiBhbnkpCisgICAgICAgICAgLy8g dG8gc2VlIGlmIHdlIGNhbiBmaW5kIGFueSB0ZXh0IG5vZGVzIHdpdGggRE9NIHdvcmQgc2VwYXJh dG9ycy4KKyAgICAgICAgICAvLyBXZSBiYWlsIG91dCBhcyBzb29uIGFzIHdlIHNlZSBhIG5vZGUg dGhhdCBpcyBub3QgYSB0ZXh0IG5vZGUsCisgICAgICAgICAgLy8gb3Igd2UgcnVuIG91dCBvZiBw cmV2aW91cyBzaWJsaW5nIG5vZGVzLiBJbiB0aGUgZXZlbnQgdGhhdCB3ZQorICAgICAgICAgIC8v IHNpbXBseSBjYW5ub3QgZmluZCBhbnkgcHJlY2VkaW5nIHdvcmQgc2VwYXJhdG9yLCB0aGUgb2Zm c2V0IGlzCisgICAgICAgICAgLy8gc2V0IHRvIDAsIGFuZCB0aGUgc29mdCB0ZXh0IGJlZ2lubmlu ZyBub2RlIGlzIHNldCB0byB0aGUgIm1vc3QKKyAgICAgICAgICAvLyBwcmV2aW91cyIgdGV4dCBu b2RlIGJlZm9yZSB0aGUgb3JpZ2luYWwgc3RhcnRpbmcgbm9kZSwgb3Iga2VwdCBhdAorICAgICAg ICAgIC8vIHRoZSBvcmlnaW5hbCBzdGFydGluZyBub2RlIGlmIG5vIHByZXZpb3VzIHRleHQgbm9k ZXMgZXhpc3QuCisgICAgICAgICAgaWYgKCFDb250YWluc0RPTVdvcmRTZXBhcmF0b3Iobm9kZSwg Zmlyc3RPZmZzZXRJbk5vZGUgLSAxLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICZuZXdPZmZzZXQpKSB7CisgICAgICAgICAgICBuc0lOb2RlKiBwcmV2Tm9kZSA9IG5v ZGUtPkdldFByZXZpb3VzU2libGluZygpOworICAgICAgICAgICAgd2hpbGUgKHByZXZOb2RlICYm IElzVGV4dE5vZGUocHJldk5vZGUpKSB7CisgICAgICAgICAgICAgIGlmIChUZXh0Tm9kZUNvbnRh aW5zRE9NV29yZFNlcGFyYXRvcihwcmV2Tm9kZSwgSU5UMzJfTUFYLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJm5ld09mZnNldCkpIHsKKyAgICAg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICBwcmV2Tm9k ZSA9IHByZXZOb2RlLT5HZXRQcmV2aW91c1NpYmxpbmcoKTsKKyAgICAgICAgICAgICAgbVNvZnRC ZWdpbi5tTm9kZSA9IHByZXZOb2RlOworICAgICAgICAgICAgfQorICAgICAgICAgIH0KICAgICAg ICAgfQogICAgICAgICBmaXJzdE9mZnNldEluTm9kZSA9IG5ld09mZnNldDsKICAgICAgICAgbVNv ZnRCZWdpbi5tT2Zmc2V0ID0gbmV3T2Zmc2V0OwogICAgICAgfQogICAgICAgYnJlYWs7CiAgICAg fQogICAgIGNoZWNrQmVmb3JlT2Zmc2V0ID0gSU5UMzJfTUFYOwogICAgIGlmIChJc0JyZWFrRWxl bWVudChub2RlKSkgewo= 675228 2012-10-25 11:43:49 -0700 2012-10-25 13:09:55 -0700 Regression test 790475-tests-v1.diff text/plain 4980 mconley ZGlmZiAtLWdpdCBhL2VkaXRvci9saWJlZGl0b3IvaHRtbC90ZXN0cy9NYWtlZmlsZS5pbiBiL2Vk aXRvci9saWJlZGl0b3IvaHRtbC90ZXN0cy9NYWtlZmlsZS5pbgotLS0gYS9lZGl0b3IvbGliZWRp dG9yL2h0bWwvdGVzdHMvTWFrZWZpbGUuaW4KKysrIGIvZWRpdG9yL2xpYmVkaXRvci9odG1sL3Rl c3RzL01ha2VmaWxlLmluCkBAIC03NiwxNiArNzYsMTcgQEAgTU9DSElURVNUX0ZJTEVTID0gXAog CQl0ZXN0X3NlbGVjdF9hbGxfd2l0aG91dF9ib2R5Lmh0bWwgXAogCQlmaWxlX3NlbGVjdF9hbGxf d2l0aG91dF9ib2R5Lmh0bWwgXAogCQl0ZXN0X3Jvb3RfZWxlbWVudF9yZXBsYWNlbWVudC5odG1s IFwKIAkJdGVzdF9idWc3MzgzNjYuaHRtbCBcCiAJCXRlc3RfYnVnNzU3MzcxLmh0bWwgXAogCQl0 ZXN0X2J1Zzc2NzY4NC5odG1sIFwKIAkJdGVzdF9idWc3ODAwMzUuaHRtbCBcCiAJCXRlc3RfYnVn Nzg3NDMyLmh0bWwgXAorCQl0ZXN0X2J1Zzc5MDQ3NS5odG1sIFwKIAkJdGVzdF9idWc3OTY4Mzku aHRtbCBcCiAJCXRlc3Rfc3BlbGxjaGVja19wcmVmLmh0bWwgXAogCQkkKE5VTEwpCiAKIF9EQVRB X0ZJTEVTID0gXAogCQlkYXRhL2NmaHRtbC1jaHJvbWl1bS50eHQgXAogCQlkYXRhL2NmaHRtbC1m aXJlZm94LnR4dCBcCiAJCWRhdGEvY2ZodG1sLWllLnR4dCBcCmRpZmYgLS1naXQgYS9lZGl0b3Iv bGliZWRpdG9yL2h0bWwvdGVzdHMvdGVzdF9idWc3OTA0NzUuaHRtbCBiL2VkaXRvci9saWJlZGl0 b3IvaHRtbC90ZXN0cy90ZXN0X2J1Zzc5MDQ3NS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Ci0t LSAvZGV2L251bGwKKysrIGIvZWRpdG9yL2xpYmVkaXRvci9odG1sL3Rlc3RzL3Rlc3RfYnVnNzkw NDc1Lmh0bWwKQEAgLTAsMCArMSwxMzggQEAKKzwhRE9DVFlQRSBIVE1MPgorPGh0bWw+Cis8IS0t CitodHRwczovL2J1Z3ppbGxhLm1vemlsbGEub3JnL3Nob3dfYnVnLmNnaT9pZD03OTA0NzUKKy0t PgorPGhlYWQ+CisgIDx0aXRsZT5UZXN0IGZvciBCdWcgNzkwNDc1PC90aXRsZT4KKyAgPHNjcmlw dCB0eXBlPSJhcHBsaWNhdGlvbi9qYXZhc2NyaXB0IiBzcmM9Ii90ZXN0cy9TaW1wbGVUZXN0L1Np bXBsZVRlc3QuanMiPjwvc2NyaXB0PgorICA8bGluayByZWw9InN0eWxlc2hlZXQiIHR5cGU9InRl eHQvY3NzIiBocmVmPSIvdGVzdHMvU2ltcGxlVGVzdC90ZXN0LmNzcyIvPgorICA8c2NyaXB0IHR5 cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSIvdGVzdHMvU2ltcGxlVGVzdC9FdmVudFV0aWxzLmpz Ij48L3NjcmlwdD4gIAorPC9oZWFkPgorPGJvZHk+Cis8YSB0YXJnZXQ9Il9ibGFuayIgaHJlZj0i aHR0cHM6Ly9idWd6aWxsYS5tb3ppbGxhLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzkwNDc1Ij5Nb3pp bGxhIEJ1ZyA3OTA0NzU8L2E+Cis8cCBpZD0iZGlzcGxheSI+PC9wPgorPGRpdiBpZD0iY29udGVu dCIgc3R5bGU9ImRpc3BsYXk6IG5vbmUiPjwvZGl2PgorPHByZSBpZD0idGVzdCI+Cis8c2NyaXB0 IHR5cGU9ImFwcGxpY2F0aW9uL2phdmFzY3JpcHQiPgorCisvKioKKyAqIFRlc3QgZm9yIEJ1ZyA3 OTA0NzUKKyAqCisgKiBUaGlzIHRlc3Qgc3RhcnRzIHdpdGggIlRoaXMgaXMgYSB0ZXN0IiBpbiBh IGZvbnQgdGFnIHdpdGhpbiBhIGNvbnRlbnQtZWRpdGFibGUKKyAqIGRpdi4gVGhlIGNoYXJhY3Rl cnMgInVuZyIgYXJlIGluc2VydGVkIGFmdGVyICJ0ZXN0IiB0byB0cmlnZ2VyIGEgbWlzc3BlbGxl ZAorICogd29yZCBzcXVpZ2dseSB1bmRlciAidGVzdHVuZyIuIFRoZW4gInVuZyIgaXMgcmVtb3Zl ZCwgYW5kICJpbmciIGlzIHB1dCBpbgorICogaXRzIHBsYWNlLgorICoKKyAqIEZpbmFsbHksIGEg c3BhY2UgYW5kICJjYXNlIiBhcmUgaW5zZXJ0ZWQuCisgKgorICogQnVnIDc5MDQ3NSB3b3VsZCBt YXJrIHRoZSAiaW5nIiBpbiAidGVzdGluZyIgYXMgYSBtaXNzcGVsbGVkIHdvcmQgYWZ0ZXIKKyAq IHRoZSBzcGFjZSBhbmQgYW55IGNoYXJhY3RlciB3ZXJlIGluc2VydGVkIGFmdGVyIGl0LgorICov CisKK1NpbXBsZVRlc3Qud2FpdEZvckV4cGxpY2l0RmluaXNoKCk7CithZGRMb2FkRXZlbnQocnVu VGVzdCk7CisKK3ZhciBnTWlzc3BlbHRXb3JkczsKKworZnVuY3Rpb24gZ2V0RWRpdG9yKCkgewor ICB2YXIgQ2kgPSBDb21wb25lbnRzLmludGVyZmFjZXM7CisgIHZhciB3aW4gPSB3aW5kb3c7Cisg IHZhciBlZGl0aW5nU2Vzc2lvbiA9IHdpbi5RdWVyeUludGVyZmFjZShDaS5uc0lJbnRlcmZhY2VS ZXF1ZXN0b3IpCisgICAgICAgICAgICAgICAgICAgICAgICAgIC5nZXRJbnRlcmZhY2UoQ2kubnNJ V2ViTmF2aWdhdGlvbikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgLlF1ZXJ5SW50ZXJmYWNl KENpLm5zSUludGVyZmFjZVJlcXVlc3RvcikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgLmdl dEludGVyZmFjZShDaS5uc0lFZGl0aW5nU2Vzc2lvbik7CisgIHJldHVybiBlZGl0aW5nU2Vzc2lv bi5nZXRFZGl0b3JGb3JXaW5kb3cod2luKTsKK30KKworZnVuY3Rpb24gZ2V0U3BlbGxDaGVja1Nl bGVjdGlvbigpIHsKKyAgdmFyIGVkaXRvciA9IGdldEVkaXRvcigpOworICB2YXIgc2VsY29uID0g ZWRpdG9yLnNlbGVjdGlvbkNvbnRyb2xsZXI7CisgIHJldHVybiBzZWxjb24uZ2V0U2VsZWN0aW9u KHNlbGNvbi5TRUxFQ1RJT05fU1BFTExDSEVDSyk7Cit9CisKK2Z1bmN0aW9uIGFwcGVuZChzdHIp IHsKKyAgbmV0c2NhcGUuc2VjdXJpdHkuUHJpdmlsZWdlTWFuYWdlci5lbmFibGVQcml2aWxlZ2Uo IlVuaXZlcnNhbFhQQ29ubmVjdCIpOworICB2YXIgZm9udFRhZyA9IGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCJmb250VGFnIik7CisgIHZhciBlZGl0b3IgPSBnZXRFZGl0b3IoKTsKKyAgdmFyIHNl bCA9IGVkaXRvci5zZWxlY3Rpb247CisKKyAgc2VsLmNvbGxhcHNlKGZvbnRUYWcubGFzdENoaWxk LCBmb250VGFnLmxhc3RDaGlsZC50ZXh0Q29udGVudC5sZW5ndGgpOworCisgIGZvciAodmFyIGkg PSAwOyBpIDwgc3RyLmxlbmd0aDsgKytpKSB7CisgICAgc3ludGhlc2l6ZUtleShzdHJbaV0sIHt9 KTsKKyAgfQorfQorCitmdW5jdGlvbiBiYWNrc3BhY2UoYVRpbWVzKSB7CisgIHZhciBiYWNrc3Bh Y2VzID0gW107CisgIGZvciAodmFyIGkgPSAwOyBpIDwgYVRpbWVzOyArK2kpIHsKKyAgICBiYWNr c3BhY2VzLnB1c2goIlZLX0JBQ0tfU1BBQ0UiKTsKKyAgfQorICBhcHBlbmQoYmFja3NwYWNlcyk7 Cit9CisKK2Z1bmN0aW9uIHJ1blRlc3QoKSB7CisgIGdNaXNzcGVsdFdvcmRzID0gW107CisgIHZh ciBlZGl0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImVkaXQiKTsKKyAgZWRpdC5mb2N1cygp OworCisgIFNpbXBsZVRlc3QuZXhlY3V0ZVNvb24oZnVuY3Rpb24oKSB7CisgICAgZ01pc3NwZWx0 V29yZHMgPSBbXTsKKyAgICBpcyhpc1NwZWxsaW5nQ2hlY2tPaygpLCB0cnVlLCAiU2hvdWxkIG5v dCBmaW5kIGFueSBtaXNzcGVsbGluZ3MgeWV0LiIpOworCisgICAgZ01pc3NwZWx0V29yZHMucHVz aCgidGVzdHVuZyIpOworICAgIGFwcGVuZCgidW5nIik7CisgICAgZWRpdC5ibHVyKCk7CisKKyAg ICBTaW1wbGVUZXN0LmV4ZWN1dGVTb29uKGZ1bmN0aW9uKCkgeworICAgICAgZWRpdC5mb2N1cygp OworICAgICAgaXMoaXNTcGVsbGluZ0NoZWNrT2soKSwgdHJ1ZSwgIlNob3VsZCBoYXZlIGZvdW5k IFwidGVzdHVuZ1wiIGFzIGEgbWlzc3BlbGxpbmcuIik7CisgICAgICAvLyBFcmFzZSAidW5nIiwg YW5kIHRoZW4gcHJlc3Mgc3BhY2UuIFdlIHNob3VsZCBub3QgaGF2ZSBhbnkgbWlzc3BlbGxpbmdz IG5vdy4KKyAgICAgIGJhY2tzcGFjZSgzKTsKKyAgICAgIGFwcGVuZCgiaW5nIik7CisgICAgICBl ZGl0LmJsdXIoKTsKKworICAgICAgU2ltcGxlVGVzdC5leGVjdXRlU29vbihmdW5jdGlvbigpIHsK KyAgICAgICAgZ01pc3NwZWx0V29yZHMgPSBbXTsKKyAgICAgICAgaXMoaXNTcGVsbGluZ0NoZWNr T2soKSwgdHJ1ZSwgIlNob3VsZCBub3QgaGF2ZSBmb3VuZCBhbnkgbWlzc3BlbGxpbmdzLiAyIik7 CisgICAgICAgIGVkaXQuZm9jdXMoKTsKKyAgICAgICAgYXBwZW5kKCIgY2FzZSIpOworICAgICAg ICBlZGl0LmJsdXIoKTsKKworICAgICAgICBTaW1wbGVUZXN0LmV4ZWN1dGVTb29uKGZ1bmN0aW9u KCkgeworICAgICAgICAgIGlzKGlzU3BlbGxpbmdDaGVja09rKCksIHRydWUsICJTaG91bGQgbm90 IGhhdmUgZm91bmQgYW55IG1pc3NwZWxsaW5ncy4gIik7CisgICAgICAgICAgU2ltcGxlVGVzdC5m aW5pc2goKTsKKyAgICAgICAgfSk7CisgICAgICB9KTsKKyAgICB9KTsKKyAgfSk7Cit9CisKK2Z1 bmN0aW9uIGlzU3BlbGxpbmdDaGVja09rKCkgeworICBuZXRzY2FwZS5zZWN1cml0eS5Qcml2aWxl Z2VNYW5hZ2VyLmVuYWJsZVByaXZpbGVnZSgiVW5pdmVyc2FsWFBDb25uZWN0Iik7CisKKyAgdmFy IHNlbCA9IGdldFNwZWxsQ2hlY2tTZWxlY3Rpb24oKTsKKyAgdmFyIG51bVdvcmRzID0gc2VsLnJh bmdlQ291bnQ7CisKKyAgaXMobnVtV29yZHMsIGdNaXNzcGVsdFdvcmRzLmxlbmd0aCwgIkNvcnJl Y3QgbnVtYmVyIG9mIG1pc3NwZWxsaW5ncyBhbmQgd29yZHMuIik7CisKKyAgaWYgKG51bVdvcmRz ICE9IGdNaXNzcGVsdFdvcmRzLmxlbmd0aCkKKyAgICByZXR1cm4gZmFsc2U7CisKKyAgZm9yICh2 YXIgaSA9IDA7IGkgPCBudW1Xb3JkczsgaSsrKSB7CisgICAgdmFyIHdvcmQgPSBzZWwuZ2V0UmFu Z2VBdChpKTsKKyAgICBpcyAod29yZCwgZ01pc3NwZWx0V29yZHNbaV0sICJNaXNzcGVsbGluZyBp cyB3aGF0IHdlIHRoaW5rIGl0IGlzLiIpOworICAgIGlmICh3b3JkICE9IGdNaXNzcGVsdFdvcmRz W2ldKQorICAgICAgcmV0dXJuIGZhbHNlOworICB9CisgIHJldHVybiB0cnVlOworfQorCis8L3Nj cmlwdD4KKzwvcHJlPgorCis8ZGl2IGlkPSJlZGl0IiBjb250ZW50ZWRpdGFibGU9InRydWUiPjxm b250IGlkPSJmb250VGFnIiBmYWNlPSJBcmlhbCI+VGhpcyBpcyBhIHRlc3Q8L2ZvbnQ+PC9kaXY+ CisKKzwvYm9keT4KKzwvaHRtbD4K 675255 2012-10-25 13:06:57 -0700 2012-10-26 11:02:03 -0700 Patch v3 790475-3.diff text/plain 5791 mconley ZGlmZiAtLWdpdCBhL2V4dGVuc2lvbnMvc3BlbGxjaGVjay9zcmMvbW96SW5saW5lU3BlbGxXb3Jk VXRpbC5jcHAgYi9leHRlbnNpb25zL3NwZWxsY2hlY2svc3JjL21veklubGluZVNwZWxsV29yZFV0 aWwuY3BwCi0tLSBhL2V4dGVuc2lvbnMvc3BlbGxjaGVjay9zcmMvbW96SW5saW5lU3BlbGxXb3Jk VXRpbC5jcHAKKysrIGIvZXh0ZW5zaW9ucy9zcGVsbGNoZWNrL3NyYy9tb3pJbmxpbmVTcGVsbFdv cmRVdGlsLmNwcApAQCAtMzYyLDM1ICszNjIsMzMgQEAgSXNET01Xb3JkU2VwYXJhdG9yKFBSVW5p Y2hhciBjaCkKIHN0YXRpYyBpbmxpbmUgYm9vbAogSXNCUkVsZW1lbnQobnNJTm9kZSogYU5vZGUp CiB7CiAgIHJldHVybiBhTm9kZS0+SXNFbGVtZW50KCkgJiYKICAgICAgICAgIGFOb2RlLT5Bc0Vs ZW1lbnQoKS0+SXNIVE1MKG5zR2tBdG9tczo6YnIpOwogfQogCiAvKioKLSAqIENoZWNrIGlmIHRo ZXJlJ3MgYSBET00gd29yZCBzZXBhcmF0b3IgYmVmb3JlIGFCZWZvcmVPZmZzZXQgaW4gdGhpcyBu b2RlLgotICogQWx3YXlzIHJldHVybnMgdHJ1ZSBpZiBpdCdzIGEgQlIgZWxlbWVudC4KLSAqIGFT ZXBhcmF0b3JPZmZzZXQgaXMgc2V0IHRvIHRoZSBpbmRleCBvZiB0aGUgZmlyc3QgY2hhcmFjdGVy IGluIHRoZSBsYXN0Ci0gKiBzZXBhcmF0b3IgaWYgYW55IGlzIGZvdW5kICgwIGZvciBCUiBlbGVt ZW50cykuCisgKiBHaXZlbiBhIFRleHROb2RlLCBjaGVja3MgdG8gc2VlIGlmIHRoZXJlJ3MgYSBE T00gd29yZCBzZXBhcmF0b3IgYmVmb3JlCisgKiBhQmVmb3JlT2Zmc2V0IHdpdGhpbiBpdC4gVGhp cyBmdW5jdGlvbiBkb2VzIG5vdCBtb2RpZnkgYVNlcGFyYXRvck9mZnNldCB3aGVuCisgKiBpdCBy ZXR1cm5zIGZhbHNlLgogICoKLSAqIFRoaXMgZnVuY3Rpb24gZG9lcyBub3QgbW9kaWZ5IGFTZXBh cmF0b3JPZmZzZXQgd2hlbiBpdCByZXR1cm5zIGZhbHNlLgorICogQHBhcmFtIGFOb2RlIHRoZSBU ZXh0Tm9kZSB0byBjaGVjay4KKyAqIEBwYXJhbSBhQmVmb3JlT2Zmc2V0IHRoZSBvZmZzZXQgaW4g dGhlIFRleHROb2RlIGJlZm9yZSB3aGljaCB3ZSB3aWxsIHNlYXJjaAorICogICAgICAgIGZvciB0 aGUgRE9NIHNlcGFyYXRvci4gWW91IGNhbiBwYXNzIElOVDMyX01BWCB0byBzZWFyY2ggdGhlIGVu dGlyZQorICogICAgICAgIGxlbmd0aCBvZiB0aGUgc3RyaW5nLgorICogQHBhcmFtIGFTZXBhcmF0 b3JPZmZzZXQgd2lsbCBiZSBzZXQgdG8gdGhlIG9mZnNldCBvZiB0aGUgZmlyc3Qgc2VwYXJhdG9y IGl0CisgKiAgICAgICAgZW5jb3VudGVycy4gV2lsbCBub3QgYmUgd3JpdHRlbiB0byBpZiBubyBz ZXBhcmF0b3IgaXMgZm91bmQuCisgKiBAcmV0dXJucyBUcnVlIGlmIGl0IGZvdW5kIGEgc2VwYXJh dG9yLgogICovCiBzdGF0aWMgYm9vbAotQ29udGFpbnNET01Xb3JkU2VwYXJhdG9yKG5zSU5vZGUq IGFOb2RlLCBpbnQzMl90IGFCZWZvcmVPZmZzZXQsCi0gICAgICAgICAgICAgICAgICAgICAgICAg aW50MzJfdCogYVNlcGFyYXRvck9mZnNldCkKK1RleHROb2RlQ29udGFpbnNET01Xb3JkU2VwYXJh dG9yKG5zSU5vZGUqIGFOb2RlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50 MzJfdCBhQmVmb3JlT2Zmc2V0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50 MzJfdCogYVNlcGFyYXRvck9mZnNldCkKIHsKLSAgaWYgKElzQlJFbGVtZW50KGFOb2RlKSkgewot ICAgICphU2VwYXJhdG9yT2Zmc2V0ID0gMDsKLSAgICByZXR1cm4gdHJ1ZTsKLSAgfQotICAKLSAg aWYgKCFJc1RleHROb2RlKGFOb2RlKSkKLSAgICByZXR1cm4gZmFsc2U7Ci0KICAgLy8gYU5vZGUg aXMgYWN0dWFsbHkgYW4gbnNJQ29udGVudCwgc2luY2UgaXQncyBlVEVYVAogICBuc0lDb250ZW50 KiBjb250ZW50ID0gc3RhdGljX2Nhc3Q8bnNJQ29udGVudCo+KGFOb2RlKTsKICAgY29uc3QgbnNU ZXh0RnJhZ21lbnQqIHRleHRGcmFnbWVudCA9IGNvbnRlbnQtPkdldFRleHQoKTsKICAgTlNfQVNT RVJUSU9OKHRleHRGcmFnbWVudCwgIldoZXJlIGlzIG91ciB0ZXh0PyIpOwogICBmb3IgKGludDMy X3QgaSA9IE5TX01JTihhQmVmb3JlT2Zmc2V0LCBpbnQzMl90KHRleHRGcmFnbWVudC0+R2V0TGVu Z3RoKCkpKSAtIDE7IGkgPj0gMDsgLS1pKSB7CiAgICAgaWYgKElzRE9NV29yZFNlcGFyYXRvcih0 ZXh0RnJhZ21lbnQtPkNoYXJBdChpKSkpIHsKICAgICAgIC8vIEJlIGdyZWVkeSwgZmluZCBhcyBt YW55IHNlcGFyYXRvcnMgYXMgd2UgY2FuCiAgICAgICBmb3IgKGludDMyX3QgaiA9IGkgLSAxOyBq ID49IDA7IC0taikgewpAQCAtNDAyLDE2ICs0MDAsNDAgQEAgQ29udGFpbnNET01Xb3JkU2VwYXJh dG9yKG5zSU5vZGUqIGFOb2RlLAogICAgICAgfQogICAgICAgKmFTZXBhcmF0b3JPZmZzZXQgPSBp OwogICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogICB9CiAgIHJldHVybiBmYWxzZTsKIH0KIAor LyoqCisgKiBDaGVjayBpZiB0aGVyZSdzIGEgRE9NIHdvcmQgc2VwYXJhdG9yIGJlZm9yZSBhQmVm b3JlT2Zmc2V0IGluIHRoaXMgbm9kZS4KKyAqIEFsd2F5cyByZXR1cm5zIHRydWUgaWYgaXQncyBh IEJSIGVsZW1lbnQuCisgKiBhU2VwYXJhdG9yT2Zmc2V0IGlzIHNldCB0byB0aGUgaW5kZXggb2Yg dGhlIGZpcnN0IGNoYXJhY3RlciBpbiB0aGUgbGFzdAorICogc2VwYXJhdG9yIGlmIGFueSBpcyBm b3VuZCAoMCBmb3IgQlIgZWxlbWVudHMpLgorICoKKyAqIFRoaXMgZnVuY3Rpb24gZG9lcyBub3Qg bW9kaWZ5IGFTZXBhcmF0b3JPZmZzZXQgd2hlbiBpdCByZXR1cm5zIGZhbHNlLgorICovCitzdGF0 aWMgYm9vbAorQ29udGFpbnNET01Xb3JkU2VwYXJhdG9yKG5zSU5vZGUqIGFOb2RlLCBpbnQzMl90 IGFCZWZvcmVPZmZzZXQsCisgICAgICAgICAgICAgICAgICAgICAgICAgaW50MzJfdCogYVNlcGFy YXRvck9mZnNldCkKK3sKKyAgaWYgKElzQlJFbGVtZW50KGFOb2RlKSkgeworICAgICphU2VwYXJh dG9yT2Zmc2V0ID0gMDsKKyAgICByZXR1cm4gdHJ1ZTsKKyAgfQorCisgIGlmICghSXNUZXh0Tm9k ZShhTm9kZSkpCisgICAgcmV0dXJuIGZhbHNlOworCisgIHJldHVybiBUZXh0Tm9kZUNvbnRhaW5z RE9NV29yZFNlcGFyYXRvcihhTm9kZSwgYUJlZm9yZU9mZnNldCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGFTZXBhcmF0b3JPZmZzZXQpOworfQorCiBzdGF0aWMg Ym9vbAogSXNCcmVha0VsZW1lbnQobnNJTm9kZSogYU5vZGUpCiB7CiAgIGlmICghYU5vZGUtPklz RWxlbWVudCgpKSB7CiAgICAgcmV0dXJuIGZhbHNlOwogICB9CiAKICAgZG9tOjpFbGVtZW50ICpl bGVtZW50ID0gYU5vZGUtPkFzRWxlbWVudCgpOwpAQCAtNDY0LDIzICs0ODYsMzcgQEAgbW96SW5s aW5lU3BlbGxXb3JkVXRpbDo6QnVpbGRTb2Z0VGV4dCgpCiAgIGludDMyX3QgY2hlY2tCZWZvcmVP ZmZzZXQgPSBtU29mdEJlZ2luLm1PZmZzZXQ7CiAgIHdoaWxlIChub2RlKSB7CiAgICAgaWYgKENv bnRhaW5zRE9NV29yZFNlcGFyYXRvcihub2RlLCBjaGVja0JlZm9yZU9mZnNldCwgJmZpcnN0T2Zm c2V0SW5Ob2RlKSkgewogICAgICAgaWYgKG5vZGUgPT0gbVNvZnRCZWdpbi5tTm9kZSkgewogICAg ICAgICAvLyBJZiB3ZSBmaW5kIGEgd29yZCBzZXBhcmF0b3Igb24gdGhlIGZpcnN0IG5vZGUsIGxv b2sgYXQgdGhlIHByZWNlZGluZwogICAgICAgICAvLyB3b3JkIG9uIHRoZSB0ZXh0IG5vZGUgYXMg d2VsbC4KICAgICAgICAgaW50MzJfdCBuZXdPZmZzZXQgPSAwOwogICAgICAgICBpZiAoZmlyc3RP ZmZzZXRJbk5vZGUgPiAwKSB7Ci0gICAgICAgICAgLy8gVHJ5IHRvIGZpbmQgdGhlIHByZXZpb3Vz IHdvcmQgYm91bmRhcnkuICBXZSBpZ25vcmUgdGhlIHJldHVybiB2YWx1ZQotICAgICAgICAgIC8v IG9mIENvbnRhaW5zRE9NV29yZFNlcGFyYXRvciBoZXJlIGJlY2F1c2UgdGhlcmUgbWlnaHQgYmUg bm8gcHJlY2VkaW5nCi0gICAgICAgICAgLy8gd29yZCBzZXBhcmF0b3IgKHN1Y2ggYXMgd2hlbiB3 ZSdyZSBhdCB0aGUgZW5kIG9mIHRoZSBmaXJzdCB3b3JkIGluCi0gICAgICAgICAgLy8gdGhlIHRl eHQgbm9kZSksIGluIHdoaWNoIGNhc2Ugd2UganVzdCBzZXQgdGhlIGZvdW5kIG9mZnNldHMgdG8g MC4KLSAgICAgICAgICAvLyBPdGhlcndpc2UsIENvbnRhaW5zRE9NV29yZFNlcGFyYXRvciBmaW5k cyB1cyB0aGUgY29ycmVjdCB3b3JkCi0gICAgICAgICAgLy8gYm91bmRhcnkgc28gdGhhdCB3ZSBj YW4gYXZvaWQgbG9va2luZyBhdCB0b28gbWFueSB3b3Jkcy4KLSAgICAgICAgICBDb250YWluc0RP TVdvcmRTZXBhcmF0b3Iobm9kZSwgZmlyc3RPZmZzZXRJbk5vZGUgLSAxLCAmbmV3T2Zmc2V0KTsK KyAgICAgICAgICAvLyBUcnkgdG8gZmluZCB0aGUgcHJldmlvdXMgd29yZCBib3VuZGFyeSBpbiB0 aGUgY3VycmVudCBub2RlLiBJZgorICAgICAgICAgIC8vIHdlIGNhbid0IGZpbmQgb25lLCBzdGFy dCBjaGVja2luZyBwcmV2aW91cyBzaWJsaW5nIG5vZGVzIChpZiBhbnkKKyAgICAgICAgICAvLyBh ZGphY2VudCBvbmVzIGV4aXN0KSB0byBzZWUgaWYgd2UgY2FuIGZpbmQgYW55IHRleHQgbm9kZXMg d2l0aAorICAgICAgICAgIC8vIERPTSB3b3JkIHNlcGFyYXRvcnMuIFdlIGJhaWwgb3V0IGFzIHNv b24gYXMgd2Ugc2VlIGEgbm9kZSB0aGF0IGlzCisgICAgICAgICAgLy8gbm90IGEgdGV4dCBub2Rl LCBvciB3ZSBydW4gb3V0IG9mIHByZXZpb3VzIHNpYmxpbmcgbm9kZXMuIEluIHRoZQorICAgICAg ICAgIC8vIGV2ZW50IHRoYXQgd2Ugc2ltcGx5IGNhbm5vdCBmaW5kIGFueSBwcmVjZWRpbmcgd29y ZCBzZXBhcmF0b3IsIHRoZQorICAgICAgICAgIC8vIG9mZnNldCBpcyBzZXQgdG8gMCwgYW5kIHRo ZSBzb2Z0IHRleHQgYmVnaW5uaW5nIG5vZGUgaXMgc2V0IHRvIHRoZQorICAgICAgICAgIC8vICJt b3N0IHByZXZpb3VzIiB0ZXh0IG5vZGUgYmVmb3JlIHRoZSBvcmlnaW5hbCBzdGFydGluZyBub2Rl LCBvcgorICAgICAgICAgIC8vIGtlcHQgYXQgdGhlIG9yaWdpbmFsIHN0YXJ0aW5nIG5vZGUgaWYg bm8gcHJldmlvdXMgdGV4dCBub2RlcyBleGlzdC4KKyAgICAgICAgICBpZiAoIUNvbnRhaW5zRE9N V29yZFNlcGFyYXRvcihub2RlLCBmaXJzdE9mZnNldEluTm9kZSAtIDEsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJm5ld09mZnNldCkpIHsKKyAgICAgICAgICAgIG5z SU5vZGUqIHByZXZOb2RlID0gbm9kZS0+R2V0UHJldmlvdXNTaWJsaW5nKCk7CisgICAgICAgICAg ICB3aGlsZSAocHJldk5vZGUgJiYgSXNUZXh0Tm9kZShwcmV2Tm9kZSkpIHsKKyAgICAgICAgICAg ICAgbVNvZnRCZWdpbi5tTm9kZSA9IHByZXZOb2RlOworICAgICAgICAgICAgICBpZiAoVGV4dE5v ZGVDb250YWluc0RPTVdvcmRTZXBhcmF0b3IocHJldk5vZGUsIElOVDMyX01BWCwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZuZXdPZmZzZXQpKSB7 CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAg cHJldk5vZGUgPSBwcmV2Tm9kZS0+R2V0UHJldmlvdXNTaWJsaW5nKCk7CisgICAgICAgICAgICB9 CisgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIGZpcnN0T2Zmc2V0SW5Ob2RlID0gbmV3 T2Zmc2V0OwogICAgICAgICBtU29mdEJlZ2luLm1PZmZzZXQgPSBuZXdPZmZzZXQ7CiAgICAgICB9 CiAgICAgICBicmVhazsKICAgICB9CiAgICAgY2hlY2tCZWZvcmVPZmZzZXQgPSBJTlQzMl9NQVg7 CiAgICAgaWYgKElzQnJlYWtFbGVtZW50KG5vZGUpKSB7Cg== 675257 2012-10-25 13:09:55 -0700 2012-10-25 13:11:38 -0700 Regression test v2 790475-tests-v2.diff text/plain 4032 mconley ZGlmZiAtLWdpdCBhL2VkaXRvci9saWJlZGl0b3IvaHRtbC90ZXN0cy9NYWtlZmlsZS5pbiBiL2Vk aXRvci9saWJlZGl0b3IvaHRtbC90ZXN0cy9NYWtlZmlsZS5pbgotLS0gYS9lZGl0b3IvbGliZWRp dG9yL2h0bWwvdGVzdHMvTWFrZWZpbGUuaW4KKysrIGIvZWRpdG9yL2xpYmVkaXRvci9odG1sL3Rl c3RzL01ha2VmaWxlLmluCkBAIC03NiwxNiArNzYsMTcgQEAgTU9DSElURVNUX0ZJTEVTID0gXAog CQl0ZXN0X3NlbGVjdF9hbGxfd2l0aG91dF9ib2R5Lmh0bWwgXAogCQlmaWxlX3NlbGVjdF9hbGxf d2l0aG91dF9ib2R5Lmh0bWwgXAogCQl0ZXN0X3Jvb3RfZWxlbWVudF9yZXBsYWNlbWVudC5odG1s IFwKIAkJdGVzdF9idWc3MzgzNjYuaHRtbCBcCiAJCXRlc3RfYnVnNzU3MzcxLmh0bWwgXAogCQl0 ZXN0X2J1Zzc2NzY4NC5odG1sIFwKIAkJdGVzdF9idWc3ODAwMzUuaHRtbCBcCiAJCXRlc3RfYnVn Nzg3NDMyLmh0bWwgXAorCQl0ZXN0X2J1Zzc5MDQ3NS5odG1sIFwKIAkJdGVzdF9idWc3OTY4Mzku aHRtbCBcCiAJCXRlc3Rfc3BlbGxjaGVja19wcmVmLmh0bWwgXAogCQkkKE5VTEwpCiAKIF9EQVRB X0ZJTEVTID0gXAogCQlkYXRhL2NmaHRtbC1jaHJvbWl1bS50eHQgXAogCQlkYXRhL2NmaHRtbC1m aXJlZm94LnR4dCBcCiAJCWRhdGEvY2ZodG1sLWllLnR4dCBcCmRpZmYgLS1naXQgYS9lZGl0b3Iv bGliZWRpdG9yL2h0bWwvdGVzdHMvdGVzdF9idWc3OTA0NzUuaHRtbCBiL2VkaXRvci9saWJlZGl0 b3IvaHRtbC90ZXN0cy90ZXN0X2J1Zzc5MDQ3NS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Ci0t LSAvZGV2L251bGwKKysrIGIvZWRpdG9yL2xpYmVkaXRvci9odG1sL3Rlc3RzL3Rlc3RfYnVnNzkw NDc1Lmh0bWwKQEAgLTAsMCArMSwxMDUgQEAKKzwhRE9DVFlQRSBIVE1MPgorPGh0bWw+Cis8IS0t CitodHRwczovL2J1Z3ppbGxhLm1vemlsbGEub3JnL3Nob3dfYnVnLmNnaT9pZD03OTA0NzUKKy0t PgorPGhlYWQ+CisgIDx0aXRsZT5UZXN0IGZvciBCdWcgNzkwNDc1PC90aXRsZT4KKyAgPHNjcmlw dCB0eXBlPSJhcHBsaWNhdGlvbi9qYXZhc2NyaXB0IiBzcmM9Ii90ZXN0cy9TaW1wbGVUZXN0L1Np bXBsZVRlc3QuanMiPjwvc2NyaXB0PgorICA8bGluayByZWw9InN0eWxlc2hlZXQiIHR5cGU9InRl eHQvY3NzIiBocmVmPSIvdGVzdHMvU2ltcGxlVGVzdC90ZXN0LmNzcyIvPgorICA8c2NyaXB0IHR5 cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSIvdGVzdHMvU2ltcGxlVGVzdC9FdmVudFV0aWxzLmpz Ij48L3NjcmlwdD4gIAorPC9oZWFkPgorPGJvZHk+Cis8YSB0YXJnZXQ9Il9ibGFuayIgaHJlZj0i aHR0cHM6Ly9idWd6aWxsYS5tb3ppbGxhLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzkwNDc1Ij5Nb3pp bGxhIEJ1ZyA3OTA0NzU8L2E+Cis8cCBpZD0iZGlzcGxheSI+PC9wPgorPGRpdiBpZD0iY29udGVu dCIgc3R5bGU9ImRpc3BsYXk6IG5vbmUiPjwvZGl2PgorPHByZSBpZD0idGVzdCI+Cis8c2NyaXB0 IHR5cGU9ImFwcGxpY2F0aW9uL2phdmFzY3JpcHQiPgorCisvKioKKyAqIFRlc3QgZm9yIEJ1ZyA3 OTA0NzUKKyAqCisgKiBUaGlzIHRlc3Qgc3RhcnRzIHdpdGggIlRoaXMgaXMgYSB0ZXN0IiBpbiBh IGZvbnQgdGFnIHdpdGhpbiBhIGNvbnRlbnQtZWRpdGFibGUKKyAqIGRpdi4gVGhlIGNoYXJhY3Rl cnMgInVuZyIgYXJlIGluc2VydGVkIGFmdGVyICJ0ZXN0IiB0byB0cmlnZ2VyIGEgbWlzc3BlbGxl ZAorICogd29yZCBzcXVpZ2dseSB1bmRlciAidGVzdHVuZyIuIFRoZW4gInVuZyIgaXMgcmVtb3Zl ZCwgYW5kICJpbmciIGlzIHB1dCBpbgorICogaXRzIHBsYWNlLgorICoKKyAqIEZpbmFsbHksIGEg c3BhY2UgYW5kICJjYXNlIiBhcmUgaW5zZXJ0ZWQuCisgKgorICogQnVnIDc5MDQ3NSB3b3VsZCBt YXJrIHRoZSAiaW5nIiBpbiAidGVzdGluZyIgYXMgYSBtaXNzcGVsbGVkIHdvcmQgYWZ0ZXIKKyAq IHRoZSBzcGFjZSBhbmQgYW55IGNoYXJhY3RlciB3ZXJlIGluc2VydGVkIGFmdGVyIGl0LgorICov CisKK1NpbXBsZVRlc3Qud2FpdEZvckV4cGxpY2l0RmluaXNoKCk7CithZGRMb2FkRXZlbnQocnVu VGVzdCk7CisKK3ZhciBnTWlzc3BlbHRXb3JkczsKKworZnVuY3Rpb24gZ2V0RWRpdG9yKCkgewor ICB2YXIgQ2kgPSBDb21wb25lbnRzLmludGVyZmFjZXM7CisgIHZhciB3aW4gPSB3aW5kb3c7Cisg IHZhciBlZGl0aW5nU2Vzc2lvbiA9IHdpbi5RdWVyeUludGVyZmFjZShDaS5uc0lJbnRlcmZhY2VS ZXF1ZXN0b3IpCisgICAgICAgICAgICAgICAgICAgICAgICAgIC5nZXRJbnRlcmZhY2UoQ2kubnNJ V2ViTmF2aWdhdGlvbikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgLlF1ZXJ5SW50ZXJmYWNl KENpLm5zSUludGVyZmFjZVJlcXVlc3RvcikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgLmdl dEludGVyZmFjZShDaS5uc0lFZGl0aW5nU2Vzc2lvbik7CisgIHJldHVybiBlZGl0aW5nU2Vzc2lv bi5nZXRFZGl0b3JGb3JXaW5kb3cod2luKTsKK30KKworZnVuY3Rpb24gZ2V0U3BlbGxDaGVja1Nl bGVjdGlvbigpIHsKKyAgdmFyIGVkaXRvciA9IGdldEVkaXRvcigpOworICB2YXIgc2VsY29uID0g ZWRpdG9yLnNlbGVjdGlvbkNvbnRyb2xsZXI7CisgIHJldHVybiBzZWxjb24uZ2V0U2VsZWN0aW9u KHNlbGNvbi5TRUxFQ1RJT05fU1BFTExDSEVDSyk7Cit9CisKK2Z1bmN0aW9uIHJ1blRlc3QoKSB7 CisgIGdNaXNzcGVsdFdvcmRzID0gW107CisgIHZhciBlZGl0ID0gZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoImVkaXQiKTsKKyAgZWRpdC5mb2N1cygpOworCisgIFNpbXBsZVRlc3QuZXhlY3V0ZVNv b24oZnVuY3Rpb24oKSB7CisgICAgZ01pc3NwZWx0V29yZHMgPSBbXTsKKyAgICBpcyhpc1NwZWxs aW5nQ2hlY2tPaygpLCB0cnVlLCAiU2hvdWxkIG5vdCBmaW5kIGFueSBtaXNzcGVsbGluZ3MgeWV0 LiIpOworCisgICAgdmFyIG5ld1RleHROb2RlID0gZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoImlu ZyBzdHJpbmciKTsKKyAgICBlZGl0LmFwcGVuZENoaWxkKG5ld1RleHROb2RlKTsKKyAgICB2YXIg ZWRpdG9yID0gZ2V0RWRpdG9yKCk7CisgICAgdmFyIHNlbCA9IGVkaXRvci5zZWxlY3Rpb247Cisg ICAgc2VsLmNvbGxhcHNlKG5ld1RleHROb2RlLCBuZXdUZXh0Tm9kZS50ZXh0Q29udGVudC5sZW5n dGgpOworICAgIHN5bnRoZXNpemVLZXkoIiEiLCB7fSk7CisKKyAgICBlZGl0LmJsdXIoKTsKKwor ICAgIFNpbXBsZVRlc3QuZXhlY3V0ZVNvb24oZnVuY3Rpb24oKSB7CisgICAgICBpcyhpc1NwZWxs aW5nQ2hlY2tPaygpLCB0cnVlLCAiU2hvdWxkIG5vdCBoYXZlIGZvdW5kIGFueSBtaXNzcGVsbGlu Z3MuICIpOworICAgICAgU2ltcGxlVGVzdC5maW5pc2goKTsKKyAgICB9KTsKKyAgfSk7Cit9CisK K2Z1bmN0aW9uIGlzU3BlbGxpbmdDaGVja09rKCkgeworICBuZXRzY2FwZS5zZWN1cml0eS5Qcml2 aWxlZ2VNYW5hZ2VyLmVuYWJsZVByaXZpbGVnZSgiVW5pdmVyc2FsWFBDb25uZWN0Iik7CisKKyAg dmFyIHNlbCA9IGdldFNwZWxsQ2hlY2tTZWxlY3Rpb24oKTsKKyAgdmFyIG51bVdvcmRzID0gc2Vs LnJhbmdlQ291bnQ7CisKKyAgaXMobnVtV29yZHMsIGdNaXNzcGVsdFdvcmRzLmxlbmd0aCwgIkNv cnJlY3QgbnVtYmVyIG9mIG1pc3NwZWxsaW5ncyBhbmQgd29yZHMuIik7CisKKyAgaWYgKG51bVdv cmRzICE9IGdNaXNzcGVsdFdvcmRzLmxlbmd0aCkKKyAgICByZXR1cm4gZmFsc2U7CisKKyAgZm9y ICh2YXIgaSA9IDA7IGkgPCBudW1Xb3JkczsgaSsrKSB7CisgICAgdmFyIHdvcmQgPSBzZWwuZ2V0 UmFuZ2VBdChpKTsKKyAgICBpcyAod29yZCwgZ01pc3NwZWx0V29yZHNbaV0sICJNaXNzcGVsbGlu ZyBpcyB3aGF0IHdlIHRoaW5rIGl0IGlzLiIpOworICAgIGlmICh3b3JkICE9IGdNaXNzcGVsdFdv cmRzW2ldKQorICAgICAgcmV0dXJuIGZhbHNlOworICB9CisgIHJldHVybiB0cnVlOworfQorCis8 L3NjcmlwdD4KKzwvcHJlPgorCis8ZGl2IGlkPSJlZGl0IiBjb250ZW50ZWRpdGFibGU9InRydWUi PlRoaXMgaXMgYSB0ZXN0PC9kaXY+CisKKzwvYm9keT4KKzwvaHRtbD4K 675259 2012-10-25 13:11:38 -0700 2012-10-25 15:28:04 -0700 Regression test v3 790475-tests-v2.diff text/plain 3670 mconley ZGlmZiAtLWdpdCBhL2VkaXRvci9saWJlZGl0b3IvaHRtbC90ZXN0cy9NYWtlZmlsZS5pbiBiL2Vk aXRvci9saWJlZGl0b3IvaHRtbC90ZXN0cy9NYWtlZmlsZS5pbgotLS0gYS9lZGl0b3IvbGliZWRp dG9yL2h0bWwvdGVzdHMvTWFrZWZpbGUuaW4KKysrIGIvZWRpdG9yL2xpYmVkaXRvci9odG1sL3Rl c3RzL01ha2VmaWxlLmluCkBAIC03NiwxNiArNzYsMTcgQEAgTU9DSElURVNUX0ZJTEVTID0gXAog CQl0ZXN0X3NlbGVjdF9hbGxfd2l0aG91dF9ib2R5Lmh0bWwgXAogCQlmaWxlX3NlbGVjdF9hbGxf d2l0aG91dF9ib2R5Lmh0bWwgXAogCQl0ZXN0X3Jvb3RfZWxlbWVudF9yZXBsYWNlbWVudC5odG1s IFwKIAkJdGVzdF9idWc3MzgzNjYuaHRtbCBcCiAJCXRlc3RfYnVnNzU3MzcxLmh0bWwgXAogCQl0 ZXN0X2J1Zzc2NzY4NC5odG1sIFwKIAkJdGVzdF9idWc3ODAwMzUuaHRtbCBcCiAJCXRlc3RfYnVn Nzg3NDMyLmh0bWwgXAorCQl0ZXN0X2J1Zzc5MDQ3NS5odG1sIFwKIAkJdGVzdF9idWc3OTY4Mzku aHRtbCBcCiAJCXRlc3Rfc3BlbGxjaGVja19wcmVmLmh0bWwgXAogCQkkKE5VTEwpCiAKIF9EQVRB X0ZJTEVTID0gXAogCQlkYXRhL2NmaHRtbC1jaHJvbWl1bS50eHQgXAogCQlkYXRhL2NmaHRtbC1m aXJlZm94LnR4dCBcCiAJCWRhdGEvY2ZodG1sLWllLnR4dCBcCmRpZmYgLS1naXQgYS9lZGl0b3Iv bGliZWRpdG9yL2h0bWwvdGVzdHMvdGVzdF9idWc3OTA0NzUuaHRtbCBiL2VkaXRvci9saWJlZGl0 b3IvaHRtbC90ZXN0cy90ZXN0X2J1Zzc5MDQ3NS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Ci0t LSAvZGV2L251bGwKKysrIGIvZWRpdG9yL2xpYmVkaXRvci9odG1sL3Rlc3RzL3Rlc3RfYnVnNzkw NDc1Lmh0bWwKQEAgLTAsMCArMSw5NyBAQAorPCFET0NUWVBFIEhUTUw+Cis8aHRtbD4KKzwhLS0K K2h0dHBzOi8vYnVnemlsbGEubW96aWxsYS5vcmcvc2hvd19idWcuY2dpP2lkPTc5MDQ3NQorLS0+ Cis8aGVhZD4KKyAgPHRpdGxlPlRlc3QgZm9yIEJ1ZyA3OTA0NzU8L3RpdGxlPgorICA8c2NyaXB0 IHR5cGU9ImFwcGxpY2F0aW9uL2phdmFzY3JpcHQiIHNyYz0iL3Rlc3RzL1NpbXBsZVRlc3QvU2lt cGxlVGVzdC5qcyI+PC9zY3JpcHQ+CisgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgdHlwZT0idGV4 dC9jc3MiIGhyZWY9Ii90ZXN0cy9TaW1wbGVUZXN0L3Rlc3QuY3NzIi8+CisgIDxzY3JpcHQgdHlw ZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9Ii90ZXN0cy9TaW1wbGVUZXN0L0V2ZW50VXRpbHMuanMi Pjwvc2NyaXB0PiAgCis8L2hlYWQ+Cis8Ym9keT4KKzxhIHRhcmdldD0iX2JsYW5rIiBocmVmPSJo dHRwczovL2J1Z3ppbGxhLm1vemlsbGEub3JnL3Nob3dfYnVnLmNnaT9pZD03OTA0NzUiPk1vemls bGEgQnVnIDc5MDQ3NTwvYT4KKzxwIGlkPSJkaXNwbGF5Ij48L3A+Cis8ZGl2IGlkPSJjb250ZW50 IiBzdHlsZT0iZGlzcGxheTogbm9uZSI+PC9kaXY+Cis8cHJlIGlkPSJ0ZXN0Ij4KKzxzY3JpcHQg dHlwZT0iYXBwbGljYXRpb24vamF2YXNjcmlwdCI+CisKKy8qKgorICogVGVzdCBmb3IgQnVnIDc5 MDQ3NQorICoKKyAqIFRlc3RzIHRoYXQgaW5saW5lIHNwZWxsIGNoZWNraW5nIHdvcmtzIHByb3Bl cmx5IHRocm91Z2ggYWRqYWNlbnQgdGV4dCBub2Rlcy4KKyAqLworCitTaW1wbGVUZXN0LndhaXRG b3JFeHBsaWNpdEZpbmlzaCgpOworYWRkTG9hZEV2ZW50KHJ1blRlc3QpOworCit2YXIgZ01pc3Nw ZWx0V29yZHM7CisKK2Z1bmN0aW9uIGdldEVkaXRvcigpIHsKKyAgdmFyIENpID0gQ29tcG9uZW50 cy5pbnRlcmZhY2VzOworICB2YXIgd2luID0gd2luZG93OworICB2YXIgZWRpdGluZ1Nlc3Npb24g PSB3aW4uUXVlcnlJbnRlcmZhY2UoQ2kubnNJSW50ZXJmYWNlUmVxdWVzdG9yKQorICAgICAgICAg ICAgICAgICAgICAgICAgICAuZ2V0SW50ZXJmYWNlKENpLm5zSVdlYk5hdmlnYXRpb24pCisgICAg ICAgICAgICAgICAgICAgICAgICAgIC5RdWVyeUludGVyZmFjZShDaS5uc0lJbnRlcmZhY2VSZXF1 ZXN0b3IpCisgICAgICAgICAgICAgICAgICAgICAgICAgIC5nZXRJbnRlcmZhY2UoQ2kubnNJRWRp dGluZ1Nlc3Npb24pOworICByZXR1cm4gZWRpdGluZ1Nlc3Npb24uZ2V0RWRpdG9yRm9yV2luZG93 KHdpbik7Cit9CisKK2Z1bmN0aW9uIGdldFNwZWxsQ2hlY2tTZWxlY3Rpb24oKSB7CisgIHZhciBl ZGl0b3IgPSBnZXRFZGl0b3IoKTsKKyAgdmFyIHNlbGNvbiA9IGVkaXRvci5zZWxlY3Rpb25Db250 cm9sbGVyOworICByZXR1cm4gc2VsY29uLmdldFNlbGVjdGlvbihzZWxjb24uU0VMRUNUSU9OX1NQ RUxMQ0hFQ0spOworfQorCitmdW5jdGlvbiBydW5UZXN0KCkgeworICBnTWlzc3BlbHRXb3JkcyA9 IFtdOworICB2YXIgZWRpdCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJlZGl0Iik7CisgIGVk aXQuZm9jdXMoKTsKKworICBTaW1wbGVUZXN0LmV4ZWN1dGVTb29uKGZ1bmN0aW9uKCkgeworICAg IGdNaXNzcGVsdFdvcmRzID0gW107CisgICAgaXMoaXNTcGVsbGluZ0NoZWNrT2soKSwgdHJ1ZSwg IlNob3VsZCBub3QgZmluZCBhbnkgbWlzc3BlbGxpbmdzIHlldC4iKTsKKworICAgIHZhciBuZXdU ZXh0Tm9kZSA9IGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCJpbmcgc3RyaW5nIik7CisgICAgZWRp dC5hcHBlbmRDaGlsZChuZXdUZXh0Tm9kZSk7CisgICAgdmFyIGVkaXRvciA9IGdldEVkaXRvcigp OworICAgIHZhciBzZWwgPSBlZGl0b3Iuc2VsZWN0aW9uOworICAgIHNlbC5jb2xsYXBzZShuZXdU ZXh0Tm9kZSwgbmV3VGV4dE5vZGUudGV4dENvbnRlbnQubGVuZ3RoKTsKKyAgICBzeW50aGVzaXpl S2V5KCIhIiwge30pOworCisgICAgZWRpdC5ibHVyKCk7CisKKyAgICBTaW1wbGVUZXN0LmV4ZWN1 dGVTb29uKGZ1bmN0aW9uKCkgeworICAgICAgaXMoaXNTcGVsbGluZ0NoZWNrT2soKSwgdHJ1ZSwg IlNob3VsZCBub3QgaGF2ZSBmb3VuZCBhbnkgbWlzc3BlbGxpbmdzLiAiKTsKKyAgICAgIFNpbXBs ZVRlc3QuZmluaXNoKCk7CisgICAgfSk7CisgIH0pOworfQorCitmdW5jdGlvbiBpc1NwZWxsaW5n Q2hlY2tPaygpIHsKKyAgbmV0c2NhcGUuc2VjdXJpdHkuUHJpdmlsZWdlTWFuYWdlci5lbmFibGVQ cml2aWxlZ2UoIlVuaXZlcnNhbFhQQ29ubmVjdCIpOworCisgIHZhciBzZWwgPSBnZXRTcGVsbENo ZWNrU2VsZWN0aW9uKCk7CisgIHZhciBudW1Xb3JkcyA9IHNlbC5yYW5nZUNvdW50OworCisgIGlz KG51bVdvcmRzLCBnTWlzc3BlbHRXb3Jkcy5sZW5ndGgsICJDb3JyZWN0IG51bWJlciBvZiBtaXNz cGVsbGluZ3MgYW5kIHdvcmRzLiIpOworCisgIGlmIChudW1Xb3JkcyAhPSBnTWlzc3BlbHRXb3Jk cy5sZW5ndGgpCisgICAgcmV0dXJuIGZhbHNlOworCisgIGZvciAodmFyIGkgPSAwOyBpIDwgbnVt V29yZHM7IGkrKykgeworICAgIHZhciB3b3JkID0gc2VsLmdldFJhbmdlQXQoaSk7CisgICAgaXMg KHdvcmQsIGdNaXNzcGVsdFdvcmRzW2ldLCAiTWlzc3BlbGxpbmcgaXMgd2hhdCB3ZSB0aGluayBp dCBpcy4iKTsKKyAgICBpZiAod29yZCAhPSBnTWlzc3BlbHRXb3Jkc1tpXSkKKyAgICAgIHJldHVy biBmYWxzZTsKKyAgfQorICByZXR1cm4gdHJ1ZTsKK30KKworPC9zY3JpcHQ+Cis8L3ByZT4KKwor PGRpdiBpZD0iZWRpdCIgY29udGVudGVkaXRhYmxlPSJ0cnVlIj5UaGlzIGlzIGEgdGVzdDwvZGl2 PgorCis8L2JvZHk+Cis8L2h0bWw+Cg== 675332 2012-10-25 15:28:04 -0700 2012-10-25 15:28:04 -0700 Regression test v4 (r+'d by ehsan) 790475-tests-v4.diff text/plain 3664 mconley ZGlmZiAtLWdpdCBhL2VkaXRvci9saWJlZGl0b3IvaHRtbC90ZXN0cy9NYWtlZmlsZS5pbiBiL2Vk aXRvci9saWJlZGl0b3IvaHRtbC90ZXN0cy9NYWtlZmlsZS5pbgotLS0gYS9lZGl0b3IvbGliZWRp dG9yL2h0bWwvdGVzdHMvTWFrZWZpbGUuaW4KKysrIGIvZWRpdG9yL2xpYmVkaXRvci9odG1sL3Rl c3RzL01ha2VmaWxlLmluCkBAIC03NiwxNiArNzYsMTcgQEAgTU9DSElURVNUX0ZJTEVTID0gXAog CQl0ZXN0X3NlbGVjdF9hbGxfd2l0aG91dF9ib2R5Lmh0bWwgXAogCQlmaWxlX3NlbGVjdF9hbGxf d2l0aG91dF9ib2R5Lmh0bWwgXAogCQl0ZXN0X3Jvb3RfZWxlbWVudF9yZXBsYWNlbWVudC5odG1s IFwKIAkJdGVzdF9idWc3MzgzNjYuaHRtbCBcCiAJCXRlc3RfYnVnNzU3MzcxLmh0bWwgXAogCQl0 ZXN0X2J1Zzc2NzY4NC5odG1sIFwKIAkJdGVzdF9idWc3ODAwMzUuaHRtbCBcCiAJCXRlc3RfYnVn Nzg3NDMyLmh0bWwgXAorCQl0ZXN0X2J1Zzc5MDQ3NS5odG1sIFwKIAkJdGVzdF9idWc3OTY4Mzku aHRtbCBcCiAJCXRlc3Rfc3BlbGxjaGVja19wcmVmLmh0bWwgXAogCQkkKE5VTEwpCiAKIF9EQVRB X0ZJTEVTID0gXAogCQlkYXRhL2NmaHRtbC1jaHJvbWl1bS50eHQgXAogCQlkYXRhL2NmaHRtbC1m aXJlZm94LnR4dCBcCiAJCWRhdGEvY2ZodG1sLWllLnR4dCBcCmRpZmYgLS1naXQgYS9lZGl0b3Iv bGliZWRpdG9yL2h0bWwvdGVzdHMvdGVzdF9idWc3OTA0NzUuaHRtbCBiL2VkaXRvci9saWJlZGl0 b3IvaHRtbC90ZXN0cy90ZXN0X2J1Zzc5MDQ3NS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Ci0t LSAvZGV2L251bGwKKysrIGIvZWRpdG9yL2xpYmVkaXRvci9odG1sL3Rlc3RzL3Rlc3RfYnVnNzkw NDc1Lmh0bWwKQEAgLTAsMCArMSw5NiBAQAorPCFET0NUWVBFIEhUTUw+Cis8aHRtbD4KKzwhLS0K K2h0dHBzOi8vYnVnemlsbGEubW96aWxsYS5vcmcvc2hvd19idWcuY2dpP2lkPTc5MDQ3NQorLS0+ Cis8aGVhZD4KKyAgPHRpdGxlPlRlc3QgZm9yIEJ1ZyA3OTA0NzU8L3RpdGxlPgorICA8c2NyaXB0 IHR5cGU9ImFwcGxpY2F0aW9uL2phdmFzY3JpcHQiIHNyYz0iL3Rlc3RzL1NpbXBsZVRlc3QvU2lt cGxlVGVzdC5qcyI+PC9zY3JpcHQ+CisgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgdHlwZT0idGV4 dC9jc3MiIGhyZWY9Ii90ZXN0cy9TaW1wbGVUZXN0L3Rlc3QuY3NzIi8+CisgIDxzY3JpcHQgdHlw ZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9Ii90ZXN0cy9TaW1wbGVUZXN0L0V2ZW50VXRpbHMuanMi Pjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8YSB0YXJnZXQ9Il9ibGFuayIgaHJlZj0iaHR0 cHM6Ly9idWd6aWxsYS5tb3ppbGxhLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzkwNDc1Ij5Nb3ppbGxh IEJ1ZyA3OTA0NzU8L2E+Cis8cCBpZD0iZGlzcGxheSI+PC9wPgorPGRpdiBpZD0iY29udGVudCIg c3R5bGU9ImRpc3BsYXk6IG5vbmUiPjwvZGl2PgorPHByZSBpZD0idGVzdCI+Cis8c2NyaXB0IHR5 cGU9ImFwcGxpY2F0aW9uL2phdmFzY3JpcHQiPgorCisvKioKKyAqIFRlc3QgZm9yIEJ1ZyA3OTA0 NzUKKyAqCisgKiBUZXN0cyB0aGF0IGlubGluZSBzcGVsbCBjaGVja2luZyB3b3JrcyBwcm9wZXJs eSB0aHJvdWdoIGFkamFjZW50IHRleHQgbm9kZXMuCisgKi8KKworU2ltcGxlVGVzdC53YWl0Rm9y RXhwbGljaXRGaW5pc2goKTsKK2FkZExvYWRFdmVudChydW5UZXN0KTsKKwordmFyIGdNaXNzcGVs dFdvcmRzOworCitmdW5jdGlvbiBnZXRFZGl0b3IoKSB7CisgIGNvbnN0IENpID0gQ29tcG9uZW50 cy5pbnRlcmZhY2VzOworICB2YXIgZWRpdGluZ1Nlc3Npb24gPSB3aW5kb3cuUXVlcnlJbnRlcmZh Y2UoQ2kubnNJSW50ZXJmYWNlUmVxdWVzdG9yKQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAuZ2V0SW50ZXJmYWNlKENpLm5zSVdlYk5hdmlnYXRpb24pCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIC5RdWVyeUludGVyZmFjZShDaS5uc0lJbnRlcmZhY2VSZXF1ZXN0b3IpCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIC5nZXRJbnRlcmZhY2UoQ2kubnNJRWRpdGluZ1Nlc3Np b24pOworICByZXR1cm4gZWRpdGluZ1Nlc3Npb24uZ2V0RWRpdG9yRm9yV2luZG93KHdpbmRvdyk7 Cit9CisKK2Z1bmN0aW9uIGdldFNwZWxsQ2hlY2tTZWxlY3Rpb24oKSB7CisgIHZhciBlZGl0b3Ig PSBnZXRFZGl0b3IoKTsKKyAgdmFyIHNlbGNvbiA9IGVkaXRvci5zZWxlY3Rpb25Db250cm9sbGVy OworICByZXR1cm4gc2VsY29uLmdldFNlbGVjdGlvbihzZWxjb24uU0VMRUNUSU9OX1NQRUxMQ0hF Q0spOworfQorCitmdW5jdGlvbiBydW5UZXN0KCkgeworICBnTWlzc3BlbHRXb3JkcyA9IFtdOwor ICB2YXIgZWRpdCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJlZGl0Iik7CisgIGVkaXQuZm9j dXMoKTsKKworICBTaW1wbGVUZXN0LmV4ZWN1dGVTb29uKGZ1bmN0aW9uKCkgeworICAgIGdNaXNz cGVsdFdvcmRzID0gW107CisgICAgaXMoaXNTcGVsbGluZ0NoZWNrT2soKSwgdHJ1ZSwgIlNob3Vs ZCBub3QgZmluZCBhbnkgbWlzc3BlbGxpbmdzIHlldC4iKTsKKworICAgIHZhciBuZXdUZXh0Tm9k ZSA9IGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCJpbmcgc3RyaW5nIik7CisgICAgZWRpdC5hcHBl bmRDaGlsZChuZXdUZXh0Tm9kZSk7CisgICAgdmFyIGVkaXRvciA9IGdldEVkaXRvcigpOworICAg IHZhciBzZWwgPSBlZGl0b3Iuc2VsZWN0aW9uOworICAgIHNlbC5jb2xsYXBzZShuZXdUZXh0Tm9k ZSwgbmV3VGV4dE5vZGUudGV4dENvbnRlbnQubGVuZ3RoKTsKKyAgICBzeW50aGVzaXplS2V5KCIh Iiwge30pOworCisgICAgZWRpdC5ibHVyKCk7CisKKyAgICBTaW1wbGVUZXN0LmV4ZWN1dGVTb29u KGZ1bmN0aW9uKCkgeworICAgICAgaXMoaXNTcGVsbGluZ0NoZWNrT2soKSwgdHJ1ZSwgIlNob3Vs ZCBub3QgaGF2ZSBmb3VuZCBhbnkgbWlzc3BlbGxpbmdzLiAiKTsKKyAgICAgIFNpbXBsZVRlc3Qu ZmluaXNoKCk7CisgICAgfSk7CisgIH0pOworfQorCitmdW5jdGlvbiBpc1NwZWxsaW5nQ2hlY2tP aygpIHsKKyAgbmV0c2NhcGUuc2VjdXJpdHkuUHJpdmlsZWdlTWFuYWdlci5lbmFibGVQcml2aWxl Z2UoIlVuaXZlcnNhbFhQQ29ubmVjdCIpOworCisgIHZhciBzZWwgPSBnZXRTcGVsbENoZWNrU2Vs ZWN0aW9uKCk7CisgIHZhciBudW1Xb3JkcyA9IHNlbC5yYW5nZUNvdW50OworCisgIGlzKG51bVdv cmRzLCBnTWlzc3BlbHRXb3Jkcy5sZW5ndGgsICJDb3JyZWN0IG51bWJlciBvZiBtaXNzcGVsbGlu Z3MgYW5kIHdvcmRzLiIpOworCisgIGlmIChudW1Xb3JkcyAhPSBnTWlzc3BlbHRXb3Jkcy5sZW5n dGgpCisgICAgcmV0dXJuIGZhbHNlOworCisgIGZvciAodmFyIGkgPSAwOyBpIDwgbnVtV29yZHM7 IGkrKykgeworICAgIHZhciB3b3JkID0gc2VsLmdldFJhbmdlQXQoaSk7CisgICAgaXMgKHdvcmQs IGdNaXNzcGVsdFdvcmRzW2ldLCAiTWlzc3BlbGxpbmcgaXMgd2hhdCB3ZSB0aGluayBpdCBpcy4i KTsKKyAgICBpZiAod29yZCAhPSBnTWlzc3BlbHRXb3Jkc1tpXSkKKyAgICAgIHJldHVybiBmYWxz ZTsKKyAgfQorICByZXR1cm4gdHJ1ZTsKK30KKworPC9zY3JpcHQ+Cis8L3ByZT4KKworPGRpdiBp ZD0iZWRpdCIgY29udGVudGVkaXRhYmxlPSJ0cnVlIj5UaGlzIGlzIGEgdGVzdDwvZGl2PgorCis8 L2JvZHk+Cis8L2h0bWw+Cg==