124409 2013-11-15 06:52:55 -0800 [Win] JavaScript crashes on 64-bit with JIT enabled. 2013-11-15 23:43:57 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) PC Unspecified RESOLVED FIXED P2 Normal --- 124450 1 peavo webkit-unassigned achristensen bfulgham commit-queue eflews.bot ggaren gyuyoung.kim msaboff rego+ews xan.lopez oldest_to_newest 951048 0 peavo 2013-11-15 06:52:55 -0800 I'm currently getting several different crashes when running WinCairo with JIT enabled on 64-bit. I've found the following issues: The saving of the frame pointer in callToJavaScript in JITStubsMSVC64.asm is wrong. The move instruction has flipped the arguments, compared to the GCC version. The registers rsi and rdi in callToJavaScript needs to be saved and restored. This is required by the Windows 64-bit ABI. The caller stores local variables in them, and if not saved and restored, we crash when returning to the caller. The getHostCallReturnValue function needs to be updated according to it's GCC counterpart. The methods JIT::appendCallWithExceptionCheck, and JIT::appendCallWithCallFrameRollbackOnException needs to allocate stack space for the 4 argument registers, as required by the Windows 64-bit ABI. 951057 1 217049 peavo 2013-11-15 07:09:19 -0800 Created attachment 217049 Patch 951098 2 217049 msaboff 2013-11-15 09:54:28 -0800 Comment on attachment 217049 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217049&action=review Thanks for the work. Looking pretty good. It needs a couple of changes. In addition to what is noted inline, the value that we sub/add to sp in callToJavaScript / returnFromJavaScript need to be adjusted for the additional pushes of rbi/rdi and for the space needed to make calls out. The value should be large enough for the space needed to call AND result in a 32 byte aligned SP. I think that means the new value should be 38h. In addition to changing 28h -> 38h, update the comment to include that the calling convention requires space for 4 Dwords. > Source/JavaScriptCore/jit/JITInlines.h:123 > + > +#if OS(WINDOWS) && CPU(X86_64) > + // According to Windows 64-bit ABI, we need to allocate space on the stack for the 4 argument registers. > + subPtr(TrustedImm32(32), stackPointerRegister); > +#endif > + Instead of making space here, we should increase the amount that we decrement from SP in callToJavaScript. > Source/JavaScriptCore/jit/JITInlines.h:142 > + > +#if OS(WINDOWS) && CPU(X86_64) > + // According to Windows 64-bit ABI, we need to allocate space on the stack for the 4 argument registers. > + subPtr(TrustedImm32(32), stackPointerRegister); > +#endif > + Ditto. > Source/JavaScriptCore/jit/JITStubsMSVC64.asm:36 > - mov rbp, rax ; Save previous frame pointer > + mov rax, rbp ; Save previous frame pointer This fix was taken care of in r159290: <http://trac.webkit.org/changeset/159290> 951124 3 peavo 2013-11-15 11:00:14 -0800 (In reply to comment #2) > (From update of attachment 217049 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=217049&action=review > > Thanks for the work. Looking pretty good. It needs a couple of changes. > In addition to what is noted inline, the value that we sub/add to sp in callToJavaScript / returnFromJavaScript need to be adjusted for the additional pushes of rbi/rdi and for the space needed to make calls out. The value should be large enough for the space needed to call AND result in a 32 byte aligned SP. I think that means the new value should be 38h. In addition to changing 28h -> 38h, update the comment to include that the calling convention requires space for 4 Dwords. Thanks for the feedback :) I updated the value to 38h, and removed the other two calls, but then I get a crash in: void JIT_OPERATION operationPutByIdNonStrictOptimize(ExecState* exec, StructureStubInfo* stubInfo, EncodedJSValue encodedValue, EncodedJSValue encodedBase, StringImpl* uid) I assume the 5. parameter here goes on the stack. According to http://msdn.microsoft.com/en-us/library/ms235286.aspx, the stack should be aligned to 16 bytes, but I'm not sure what's correct? 951128 4 msaboff 2013-11-15 11:09:37 -0800 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 217049 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=217049&action=review > > > > Thanks for the work. Looking pretty good. It needs a couple of changes. > > In addition to what is noted inline, the value that we sub/add to sp in callToJavaScript / returnFromJavaScript need to be adjusted for the additional pushes of rbi/rdi and for the space needed to make calls out. The value should be large enough for the space needed to call AND result in a 32 byte aligned SP. I think that means the new value should be 38h. In addition to changing 28h -> 38h, update the comment to include that the calling convention requires space for 4 Dwords. > > Thanks for the feedback :) > > I updated the value to 38h, and removed the other two calls, but then I get a crash in: > > void JIT_OPERATION operationPutByIdNonStrictOptimize(ExecState* exec, StructureStubInfo* stubInfo, EncodedJSValue encodedValue, EncodedJSValue encodedBase, StringImpl* uid) > > I assume the 5. parameter here goes on the stack. > > According to http://msdn.microsoft.com/en-us/library/ms235286.aspx, the stack should be aligned to 16 bytes, but I'm not sure what's correct? I take it things worked with your earlier patch. My math could be wrong on the 38h. Certainly 38h though is large enough for up to 7 values. Can you provide a stack trace for the crash and the faulting instruction? IIRC, The 32 byte requirement is for spilling xmm registers. 951146 5 peavo 2013-11-15 11:57:50 -0800 (In reply to comment #4) > I take it things worked with your earlier patch. My math could be wrong on the 38h. Certainly 38h though is large enough for up to 7 values. Can you provide a stack trace for the crash and the faulting instruction? > > IIRC, The 32 byte requirement is for spilling xmm registers. Yes, it worked with the previous patch. I had the exact same crash before, it was what made me add the SP subPtr/addPtr adjustments. The faulting instruction is the last instruction in the disassembly: void JIT_OPERATION operationPutByIdNonStrictOptimize(ExecState* exec, StructureStubInfo* stubInfo, EncodedJSValue encodedValue, EncodedJSValue encodedBase, StringImpl* uid) { 0000000002D01100 mov qword ptr [rsp+18h],rbx 0000000002D01105 push rbp 0000000002D01106 push rsi 0000000002D01107 push rdi 0000000002D01108 push r12 0000000002D0110A push r13 0000000002D0110C sub rsp,50h VM* vm = &exec->vm(); 0000000002D01110 mov rax,qword ptr [rcx+18h] NativeCallFrameTracer tracer(vm, exec); Identifier ident(vm, uid); 0000000002D01114 mov rbx,qword ptr [uid] 0000000002D0111C mov rdi,rdx 0000000002D0111F and rax,0FFFFFFFFFFFF0000h 0000000002D01125 mov rsi,r9 0000000002D01128 mov r13,r8 0000000002D0112B mov rdx,qword ptr [rax+468h] 0000000002D01132 mov rbp,rcx 0000000002D01135 mov qword ptr [rdx+9DB0h],rcx 0000000002D0113C mov eax,dword ptr [rbx+18h] Stacktrace of crash: > JavaScriptCore.dll!operationPutByIdNonStrictOptimize(JSC::ExecState * exec, JSC::StructureStubInfo * stubInfo, __int64 encodedValue, __int64 encodedBase, WTF::StringImpl * uid) Line 300 + 0x28 bytes C++ 0000000003d43e32() 0000000006035420() 000000000012ded8() 0000000005f2ff98() JavaScriptCore.dll!JSC::getCallLinkInfoReturnLocation(JSC::CallLinkInfo * callLinkInfo) Line 105 C++ 130a29aa8dcc1fb4() 0000000003c4f9b0() 0000e6c375e3872c() 000000000012ded8() 0000000005f2ff98() 0000000005f2ff98() 00000000ffffffff() 000000000012f288() 0000000003c4f9b0() 0000000001c40e68() 000000000012df30() JavaScriptCore.dll!JSC::JITCode::execute(JSC::JSStack * stack, JSC::ExecState * callFrame, JSC::VM * vm) Line 49 + 0x19 bytes C++ JavaScriptCore.dll!JSC::Interpreter::execute(JSC::ProgramExecutable * program, JSC::ExecState * callFrame, JSC::JSObject * thisObj) Line 883 + 0x28 bytes C++ JavaScriptCore.dll!JSC::evaluate(JSC::ExecState * exec, const JSC::SourceCode & source, JSC::JSValue thisValue, JSC::JSValue * returnedException) Line 85 C++ WebKit.dll!WebCore::ScriptController::evaluateInWorld(const WebCore::ScriptSourceCode & sourceCode, WebCore::DOMWrapperWorld & world) Line 145 + 0x41 bytes C++ WebKit.dll!WebCore::ScriptController::evaluate(const WebCore::ScriptSourceCode & sourceCode) Line 162 C++ WebKit.dll!WebCore::ScriptElement::executeScript(const WebCore::ScriptSourceCode & sourceCode) Line 310 + 0x14 bytes C++ WebKit.dll!WebCore::ScriptElement::prepareScript(const WTF::TextPosition & scriptStartPosition, WebCore::ScriptElement::LegacyTypeSupport supportLegacyTypes) Line 241 + 0x3d bytes C++ WebKit.dll!WebCore::HTMLScriptRunner::runScript(WebCore::Element * script, const WTF::TextPosition & scriptStartPosition) Line 304 C++ WebKit.dll!WebCore::HTMLScriptRunner::execute(WTF::PassRefPtr<WebCore::Element> * scriptElement, const WTF::TextPosition & scriptStartPosition) Line 177 C++ WebKit.dll!WebCore::HTMLDocumentParser::runScriptsForPausedTreeBuilder() Line 264 C++ WebKit.dll!WebCore::HTMLDocumentParser::pumpTokenizer(WebCore::HTMLDocumentParser::SynchronousMode mode) Line 527 + 0x41 bytes C++ WebKit.dll!WebCore::HTMLDocumentParser::resumeParsingAfterYield() Line 252 C++ WebKit.dll!WebCore::ThreadTimers::sharedTimerFiredInternal() Line 130 C++ WebKit.dll!WebCore::TimerWindowWndProc(HWND__ * hWnd, unsigned int message, unsigned __int64 wParam, __int64 lParam) Line 111 C++ 951151 6 msaboff 2013-11-15 12:08:39 -0800 (In reply to comment #5) What are the register values? 951154 7 peavo 2013-11-15 12:17:16 -0800 (In reply to comment #6) > (In reply to comment #5) > > What are the register values? RAX = 0000000003FA0000 RBX = 130A29AA8DCC1FB4 RCX = 0000000005F2FF48 RDX = 0000000001C30FD0 RSI = 0000000003DDFFB0 RDI = 0000000006026AA0 R8  = 0000000003D7DAF0 R9  = 0000000003DDFFB0 R10 = 0000000005F3E390 R11 = 0000000002D01100 R12 = 0000000001C40E68 R13 = 0000000003D7DAF0 R14 = FFFF000000000000 R15 = FFFF000000000002 RIP = 0000000002D0113C RSP = 000000000012DD00 RBP = 0000000005F2FF48 EFL = 00010204 951178 8 peavo 2013-11-15 13:34:05 -0800 I have probably misunderstood something, but below is the disassembly which calls operationPutByIdNonStrictOptimize; I thought we had to also adjust the stack pointer before this call, not only before the call in callToJavaScript? ... ... 00000000053D3E00 mov eax,edx 00000000053D3E02 mov r9,rax 00000000053D3E05 mov rdx,60E91B0h 00000000053D3E0F mov rcx,rbp 00000000053D3E12 mov dword ptr [rbp+2Ch],1Eh 00000000053D3E19 mov r11,1C0AD80h 00000000053D3E23 mov qword ptr [r11],rbp 00000000053D3E26 mov r11,2CE1100h 00000000053D3E30 call r11 < calls operationPutByIdNonStrictOptimize 951211 9 msaboff 2013-11-15 14:27:42 -0800 (In reply to comment #8) > I have probably misunderstood something, but below is the disassembly which calls operationPutByIdNonStrictOptimize; I thought we had to also adjust the stack pointer before this call, not only before the call in callToJavaScript? > > ... > ... > 00000000053D3E00 mov eax,edx > 00000000053D3E02 mov r9,rax > 00000000053D3E05 mov rdx,60E91B0h > 00000000053D3E0F mov rcx,rbp > 00000000053D3E12 mov dword ptr [rbp+2Ch],1Eh > 00000000053D3E19 mov r11,1C0AD80h > 00000000053D3E23 mov qword ptr [r11],rbp > 00000000053D3E26 mov r11,2CE1100h > 00000000053D3E30 call r11 < calls operationPutByIdNonStrictOptimize We shouldn't have to because the stack pointer shouldn't be changed by LLInt or JIT code. From the register dump, rbx is garbage. Could you provide more disassembly for the caller? I'm looking for where arg 5 is put on the stack. 951213 10 msaboff 2013-11-15 14:29:27 -0800 Actually, the value for rbx is the same as the PC for the caller of getCallLinkInfoReturnLocation() in the stack trace. 951219 11 peavo 2013-11-15 14:47:28 -0800 (In reply to comment #9) > We shouldn't have to because the stack pointer shouldn't be changed by LLInt or JIT code. From the register dump, rbx is garbage. Could you provide more disassembly for the caller? I'm looking for where arg 5 is put on the stack. 0000000005463CE8 add byte ptr [rax-75h],cl 0000000005463CEB xor byte ptr [r8-75h],r9b 0000000005463CEF push rbp 0000000005463CF0 or byte ptr [rax-75h],cl 0000000005463CF3 ins dword ptr [rdi],dx 0000000005463CF4 add byte ptr [rdx-3Dh],dl 0000000005463CF7 mov dword ptr [rbp+2Ch],0Ah 0000000005463CFE mov r11,1CCAD80h 0000000005463D08 mov qword ptr [r11],rbp 0000000005463D0B add rsp,0FFFFFFFFFFFFFFF0h 0000000005463D0F mov rcx,rsp 0000000005463D12 mov rdx,rbp 0000000005463D15 mov r8,606C520h 0000000005463D1F mov r11,2E55200h 0000000005463D29 call r11 0000000005463D2C pop rax 0000000005463D2D pop rdx 0000000005463D2E mov r11,1CCC830h 0000000005463D38 mov r11,qword ptr [r11] 0000000005463D3B test r11,r11 0000000005463D3E jne 0000000005463FD2 0000000005463D44 mov rax,qword ptr [rbp-28h] 0000000005463D48 jmp 0000000005463AA1 0000000005463D4D mov dword ptr [rbp+2Ch],0Dh 0000000005463D54 mov r11,1CCAD80h 0000000005463D5E mov qword ptr [r11],rbp 0000000005463D61 add rsp,0FFFFFFFFFFFFFFF0h 0000000005463D65 mov rcx,rsp 0000000005463D68 mov rdx,rbp 0000000005463D6B mov r8,606C538h 0000000005463D75 mov r11,2E58C70h 0000000005463D7F call r11 0000000005463D82 pop rax 0000000005463D83 pop rdx 0000000005463D84 mov r11,1CCC830h 0000000005463D8E mov r11,qword ptr [r11] 0000000005463D91 test r11,r11 0000000005463D94 jne 0000000005463FD2 0000000005463D9A mov rax,qword ptr [rbp+30h] 0000000005463D9E jmp 0000000005463ADD 0000000005463DA3 mov rdx,5F68120h 0000000005463DAD mov rcx,rbp 0000000005463DB0 mov dword ptr [rbp+2Ch],11h 0000000005463DB7 mov r11,1CCAD80h 0000000005463DC1 mov qword ptr [r11],rbp 0000000005463DC4 mov r11,2D95510h 0000000005463DCE call r11 0000000005463DD1 mov r11,1CCC830h 0000000005463DDB mov r11,qword ptr [r11] 0000000005463DDE test r11,r11 0000000005463DE1 jne 0000000005463FD2 0000000005463DE7 mov qword ptr [rbp-18h],rax 0000000005463DEB jmp 0000000005463B18 0000000005463DF0 mov r11,6065810h 0000000005463DFA mov qword ptr [rsp],r11 0000000005463DFE mov r8,rdx 0000000005463E01 mov r9,rax 0000000005463E04 mov rdx,6065540h 0000000005463E0E mov rcx,rbp 0000000005463E11 mov dword ptr [rbp+2Ch],1Eh 0000000005463E18 mov r11,1CCAD80h 0000000005463E22 mov qword ptr [r11],rbp 0000000005463E25 mov r11,2D91100h 0000000005463E2F call r11 951233 12 peavo 2013-11-15 15:20:12 -0800 (In reply to comment #10) > Actually, the value for rbx is the same as the PC for the caller of getCallLinkInfoReturnLocation() in the stack trace. I found the 5. parameter (StringImpl *) on the stack, it's located 20h off from where we actually read. 951238 13 msaboff 2013-11-15 15:35:26 -0800 (In reply to comment #12) > (In reply to comment #10) > > Actually, the value for rbx is the same as the PC for the caller of getCallLinkInfoReturnLocation() in the stack trace. > > I found the 5. parameter (StringImpl *) on the stack, it's located 20h off from where we actually read. Makes sense. Doesn't appear that we accounted for the first 4 args before poking arg5. The poke for arg5 is: 0000000005463DFA mov qword ptr [rsp],r11 That should be 0000000005463DFA mov qword ptr [rsp + 0x20],r11 I think the C call helper for 5 args for X86 win needs to account for the first 4 args. 951248 14 peavo 2013-11-15 15:48:03 -0800 (In reply to comment #13) > (In reply to comment #12) > > (In reply to comment #10) > > > Actually, the value for rbx is the same as the PC for the caller of getCallLinkInfoReturnLocation() in the stack trace. > > > > I found the 5. parameter (StringImpl *) on the stack, it's located 20h off from where we actually read. > > Makes sense. Doesn't appear that we accounted for the first 4 args before poking arg5. The poke for arg5 is: > 0000000005463DFA mov qword ptr [rsp],r11 > That should be 0000000005463DFA mov qword ptr [rsp + 0x20],r11 > > I think the C call helper for 5 args for X86 win needs to account for the first 4 args. Ah, I see... Thanks, will update the patch :) 951252 15 217094 peavo 2013-11-15 16:07:15 -0800 Created attachment 217094 Patch 951254 16 217094 eflews.bot 2013-11-15 16:11:55 -0800 Comment on attachment 217094 Patch Attachment 217094 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/24538011 951256 17 217094 msaboff 2013-11-15 16:14:40 -0800 Comment on attachment 217094 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217094&action=review > Source/JavaScriptCore/jit/JITStubsMSVC64.asm:35 > + mov r10, qword ptr[esp] Shouldn't this be rsp? 951261 18 217094 msaboff 2013-11-15 16:23:22 -0800 Comment on attachment 217094 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217094&action=review > Source/JavaScriptCore/jit/CCallHelpers.h:733 > +#if CPU(MIPS) || OS(WINDOWS) && CPU(X86_64) Parenthesize this expression. 951264 19 217097 peavo 2013-11-15 16:28:48 -0800 Created attachment 217097 Patch 951268 20 217099 peavo 2013-11-15 16:32:37 -0800 Created attachment 217099 Patch 951270 21 peavo 2013-11-15 16:34:08 -0800 (In reply to comment #17) > (From update of attachment 217094 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=217094&action=review > > > Source/JavaScriptCore/jit/JITStubsMSVC64.asm:35 > > + mov r10, qword ptr[esp] > > Shouldn't this be rsp? Yes :) 951271 22 msaboff 2013-11-15 16:34:30 -0800 r=me. Let's watch the EWS bots and then I can cq+ 951272 23 peavo 2013-11-15 16:35:38 -0800 (In reply to comment #22) > r=me. Let's watch the EWS bots and then I can cq+ Thanks, I hope I got it right now :) 951300 24 peavo 2013-11-15 17:22:02 -0800 (In reply to comment #22) > r=me. Let's watch the EWS bots and then I can cq+ Seems to build successfully now :) 951312 25 217099 commit-queue 2013-11-15 19:23:31 -0800 Comment on attachment 217099 Patch Clearing flags on attachment: 217099 Committed r159376: <http://trac.webkit.org/changeset/159376> 951313 26 commit-queue 2013-11-15 19:23:34 -0800 All reviewed patches have been landed. Closing bug. 217049 2013-11-15 07:09:19 -0800 2013-11-15 16:07:04 -0800 Patch bug-124409-20131115160733.patch text/plain 7460 peavo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU5MzM0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBA CisyMDEzLTExLTE1ICBwZWF2b0BvdXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgorCisg ICAgICAgIFtXaW5dIEphdmFTY3JpcHQgY3Jhc2hlcyBvbiA2NC1iaXQgd2l0aCBKSVQgZW5hYmxl ZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNDQw OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXNl IGFyZSBpc3N1ZXMgZm91bmQgd2l0aCBKSVQgb24gNjQtYml0OgorICAgICAgICAtIFRoZSBzYXZp bmcgb2YgdGhlIGZyYW1lIHBvaW50ZXIgaW4gY2FsbFRvSmF2YVNjcmlwdCBpbiBKSVRTdHVic01T VkM2NC5hc20gaXMgd3JvbmcuCisgICAgICAgICAgVGhlIG1vdmUgaW5zdHJ1Y3Rpb24gaGFzIGZs aXBwZWQgdGhlIGFyZ3VtZW50cywgY29tcGFyZWQgdG8gdGhlIEdDQyB2ZXJzaW9uLgorICAgICAg ICAtIFRoZSByZWdpc3RlcnMgcnNpIGFuZCByZGkgaW4gY2FsbFRvSmF2YVNjcmlwdCBuZWVkcyB0 byBiZSBzYXZlZCBhbmQgcmVzdG9yZWQuIFRoaXMgaXMgcmVxdWlyZWQgYnkgdGhlIFdpbmRvd3Mg NjQtYml0IEFCSS4KKyAgICAgICAgLSBUaGUgZ2V0SG9zdENhbGxSZXR1cm5WYWx1ZSBmdW5jdGlv biBuZWVkcyB0byBiZSB1cGRhdGVkIGFjY29yZGluZyB0byBpdCdzIEdDQyBjb3VudGVycGFydC4K KyAgICAgICAgLSBUaGUgbWV0aG9kcyBKSVQ6OmFwcGVuZENhbGxXaXRoRXhjZXB0aW9uQ2hlY2ss IGFuZCBKSVQ6OmFwcGVuZENhbGxXaXRoQ2FsbEZyYW1lUm9sbGJhY2tPbkV4Y2VwdGlvbiBuZWVk cworICAgICAgICAgIHRvIGFsbG9jYXRlIHN0YWNrIHNwYWNlIGZvciB0aGUgNCBhcmd1bWVudCBy ZWdpc3RlcnMsIGFzIHJlcXVpcmVkIGJ5IHRoZSBXaW5kb3dzIDY0LWJpdCBBQkkuCisKKyAgICAg ICAgKiBKYXZhU2NyaXB0Q29yZS52Y3hwcm9qL0phdmFTY3JpcHRDb3JlLnZjeHByb2o6IFJlLWFk ZGVkIEpJVFN0dWJzTVNWQzY0LmFzbSB0byBwcm9qZWN0LgorICAgICAgICAqIGppdC9DQ2FsbEhl bHBlcnMuaDogCisgICAgICAgIChKU0M6OkNDYWxsSGVscGVyczo6c2V0dXBBcmd1bWVudHMpOiBD b21waWxlIGZpeCwgYWRkZWQgbmVlZGVkIG1ldGhvZC4KKyAgICAgICAgKiBqaXQvSklUSW5saW5l cy5oOiBBbGxvY2F0ZSBhbmQgZGVhbGxvY2F0ZSBzdGFjayBzcGFjZSBmb3IgdGhlIDQgYXJndW1l bnQgcmVnaXN0ZXJzLgorICAgICAgICAoSlNDOjpKSVQ6OmFwcGVuZENhbGxXaXRoRXhjZXB0aW9u Q2hlY2spOgorICAgICAgICAoSlNDOjpKSVQ6OmFwcGVuZENhbGxXaXRoQ2FsbEZyYW1lUm9sbGJh Y2tPbkV4Y2VwdGlvbik6CisgICAgICAgICogaml0L0pJVFN0dWJzTVNWQzY0LmFzbTogU2F2ZSBm cmFtZSBwb2ludGVyIGluIHJlZ2lzdGVyIHJheC4KKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBTYXZlIGFuZCByZXN0b3JlIHJlZ2lzdGVycyByc2kgYW5kIHJkaS4KKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBVcGRhdGUgZ2V0SG9zdENhbGxSZXR1cm5WYWx1ZSBh Y2NvcmRpbmcgdG8gdGhlIEdDQyB2ZXJzaW9uLgorCiAyMDEzLTExLTE0ICBPbGl2ZXIgSHVudCAg PG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBDTG9vcCBlYXNpZXIgdG8gYnVpbGQs IGFuZCBtYWtlIGl0IHdvcmsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0 Q29yZS52Y3hwcm9qL0phdmFTY3JpcHRDb3JlLnZjeHByb2oKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnZjeHByb2ovSmF2YVNjcmlwdENvcmUudmN4 cHJvagkocmV2aXNpb24gMTU5Mjc4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3Jp cHRDb3JlLnZjeHByb2ovSmF2YVNjcmlwdENvcmUudmN4cHJvagkod29ya2luZyBjb3B5KQpAQCAt MTMxMSwxNSArMTMxMSwxMSBAQAogICA8SXRlbUdyb3VwPg0KICAgICA8TUFTTSBJbmNsdWRlPSIu LlxqaXRcSklUU3R1YnNNU1ZDNjQuYXNtIj4NCiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29u ZGl0aW9uPSInJChDb25maWd1cmF0aW9uKXwkKFBsYXRmb3JtKSc9PSdSZWxlYXNlX1dpbkNhaXJv fFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRGcm9tQnVpbGQ+DQotICAgICAgPEV4Y2x1ZGVkRnJvbUJ1 aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nUmVsZWFzZV9X aW5DYWlyb3x4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4NCiAgICAgICA8RXhjbHVkZWRG cm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0aW9uKXwkKFBsYXRmb3JtKSc9PSdSZWxl YXNlfFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRGcm9tQnVpbGQ+DQotICAgICAgPEV4Y2x1ZGVkRnJv bUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nUmVsZWFz ZXx4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4NCiAgICAgICA8RXhjbHVkZWRGcm9tQnVp bGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0aW9uKXwkKFBsYXRmb3JtKSc9PSdQcm9kdWN0aW9u fFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRGcm9tQnVpbGQ+DQogICAgICAgPEV4Y2x1ZGVkRnJvbUJ1 aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nUHJvZHVjdGlv bnx4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4NCiAgICAgICA8RXhjbHVkZWRGcm9tQnVp bGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0aW9uKXwkKFBsYXRmb3JtKSc9PSdEZWJ1Z19XaW5D YWlyb3xXaW4zMiciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1aWxkPg0KLSAgICAgIDxFeGNsdWRlZEZy b21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J0RlYnVn X1dpbkNhaXJvfHg2NCciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1aWxkPg0KICAgICAgIDxFeGNsdWRl ZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J0Rl YnVnfFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRGcm9tQnVpbGQ+DQotICAgICAgPEV4Y2x1ZGVkRnJv bUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nRGVidWd8 eDY0JyI+dHJ1ZTwvRXhjbHVkZWRGcm9tQnVpbGQ+DQogICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxk IENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nRGVidWdTdWZmaXh8 V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4NCiAgICAgICA8RXhjbHVkZWRGcm9tQnVp bGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0aW9uKXwkKFBsYXRmb3JtKSc9PSdEZWJ1Z1N1ZmZp eHx4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4NCiAgICAgPC9NQVNNPg0KSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQ0NhbGxIZWxwZXJzLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9DQ2FsbEhlbHBlcnMuaAkocmV2aXNpb24gMTU5Mjc4KQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9DQ2FsbEhlbHBlcnMuaAkod29ya2luZyBjb3B5 KQpAQCAtOTYyLDcgKzk2MiwxNSBAQCBwdWJsaWM6CiAgICAgICAgIG1vdmUoYXJnMiwgR1BSSW5m bzo6YXJndW1lbnRHUFIxKTsKICAgICAgICAgbW92ZShhcmc0LCBHUFJJbmZvOjphcmd1bWVudEdQ UjMpOwogICAgIH0KLSAgICAKKworICAgIEFMV0FZU19JTkxJTkUgdm9pZCBzZXR1cEFyZ3VtZW50 cyhHUFJSZWcgYXJnMSwgR1BSUmVnIGFyZzIsIFRydXN0ZWRJbW1QdHIgYXJnMywgVHJ1c3RlZElt bTMyIGFyZzQsIEdQUlJlZyBhcmc1KQorICAgIHsKKyAgICAgICAgcG9rZShhcmc1LCBQT0tFX0FS R1VNRU5UX09GRlNFVCk7CisgICAgICAgIHNldHVwVHdvU3R1YkFyZ3NHUFI8R1BSSW5mbzo6YXJn dW1lbnRHUFIwLCBHUFJJbmZvOjphcmd1bWVudEdQUjE+KGFyZzEsIGFyZzIpOworICAgICAgICBt b3ZlKGFyZzMsIEdQUkluZm86OmFyZ3VtZW50R1BSMik7CisgICAgICAgIG1vdmUoYXJnNCwgR1BS SW5mbzo6YXJndW1lbnRHUFIzKTsKKyAgICB9CisKICAgICBBTFdBWVNfSU5MSU5FIHZvaWQgc2V0 dXBBcmd1bWVudHMoR1BSUmVnIGFyZzEsIEdQUlJlZyBhcmcyLCBUcnVzdGVkSW1tUHRyIGFyZzMs IFRydXN0ZWRJbW0zMiBhcmc0LCBHUFJSZWcgYXJnNSwgR1BSUmVnIGFyZzYpCiAgICAgewogICAg ICAgICBwb2tlKGFyZzYsIFBPS0VfQVJHVU1FTlRfT0ZGU0VUICsgMSk7CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaml0L0pJVElubGluZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaml0L0pJVElubGluZXMuaAkocmV2aXNpb24gMTU5Mjc4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2ppdC9KSVRJbmxpbmVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTExNSw3 ICsxMTUsMTggQEAgQUxXQVlTX0lOTElORSB2b2lkIEpJVDo6dXBkYXRlVG9wQ2FsbEZyYQogQUxX QVlTX0lOTElORSBNYWNyb0Fzc2VtYmxlcjo6Q2FsbCBKSVQ6OmFwcGVuZENhbGxXaXRoRXhjZXB0 aW9uQ2hlY2soY29uc3QgRnVuY3Rpb25QdHImIGZ1bmN0aW9uKQogewogICAgIHVwZGF0ZVRvcENh bGxGcmFtZSgpOworCisjaWYgT1MoV0lORE9XUykgJiYgQ1BVKFg4Nl82NCkKKyAgICAvLyBBY2Nv cmRpbmcgdG8gV2luZG93cyA2NC1iaXQgQUJJLCB3ZSBuZWVkIHRvIGFsbG9jYXRlIHNwYWNlIG9u IHRoZSBzdGFjayBmb3IgdGhlIDQgYXJndW1lbnQgcmVnaXN0ZXJzLgorICAgIHN1YlB0cihUcnVz dGVkSW1tMzIoMzIpLCBzdGFja1BvaW50ZXJSZWdpc3Rlcik7CisjZW5kaWYKKwogICAgIE1hY3Jv QXNzZW1ibGVyOjpDYWxsIGNhbGwgPSBhcHBlbmRDYWxsKGZ1bmN0aW9uKTsKKyAgICAKKyNpZiBP UyhXSU5ET1dTKSAmJiBDUFUoWDg2XzY0KQorICAgIGFkZFB0cihUcnVzdGVkSW1tMzIoMzIpLCBz dGFja1BvaW50ZXJSZWdpc3Rlcik7CisjZW5kaWYKKwogICAgIGV4Y2VwdGlvbkNoZWNrKCk7CiAg ICAgcmV0dXJuIGNhbGw7CiB9CkBAIC0xMjMsNyArMTM0LDE4IEBAIEFMV0FZU19JTkxJTkUgTWFj cm9Bc3NlbWJsZXI6OkNhbGwgSklUOjoKIEFMV0FZU19JTkxJTkUgTWFjcm9Bc3NlbWJsZXI6OkNh bGwgSklUOjphcHBlbmRDYWxsV2l0aENhbGxGcmFtZVJvbGxiYWNrT25FeGNlcHRpb24oY29uc3Qg RnVuY3Rpb25QdHImIGZ1bmN0aW9uKQogewogICAgIHVwZGF0ZVRvcENhbGxGcmFtZSgpOyAvLyBU aGUgY2FsbGVlIGlzIHJlc3BvbnNpYmxlIGZvciBzZXR0aW5nIHRvcENhbGxGcmFtZSB0byB0aGVp ciBjYWxsZXIKKworI2lmIE9TKFdJTkRPV1MpICYmIENQVShYODZfNjQpCisgICAgLy8gQWNjb3Jk aW5nIHRvIFdpbmRvd3MgNjQtYml0IEFCSSwgd2UgbmVlZCB0byBhbGxvY2F0ZSBzcGFjZSBvbiB0 aGUgc3RhY2sgZm9yIHRoZSA0IGFyZ3VtZW50IHJlZ2lzdGVycy4KKyAgICBzdWJQdHIoVHJ1c3Rl ZEltbTMyKDMyKSwgc3RhY2tQb2ludGVyUmVnaXN0ZXIpOworI2VuZGlmCisKICAgICBNYWNyb0Fz c2VtYmxlcjo6Q2FsbCBjYWxsID0gYXBwZW5kQ2FsbChmdW5jdGlvbik7CisKKyNpZiBPUyhXSU5E T1dTKSAmJiBDUFUoWDg2XzY0KQorICAgIGFkZFB0cihUcnVzdGVkSW1tMzIoMzIpLCBzdGFja1Bv aW50ZXJSZWdpc3Rlcik7CisjZW5kaWYKKwogICAgIGV4Y2VwdGlvbkNoZWNrV2l0aENhbGxGcmFt ZVJvbGxiYWNrKCk7CiAgICAgcmV0dXJuIGNhbGw7CiB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaml0L0pJVFN0dWJzTVNWQzY0LmFzbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvaml0L0pJVFN0dWJzTVNWQzY0LmFzbQkocmV2aXNpb24gMTU5Mjc4KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVic01TVkM2NC5hc20JKHdvcmtpbmcgY29weSkK QEAgLTMzLDEzICszMywxNSBAQCBfVEVYVCAgIFNFR01FTlQKIAogY2FsbFRvSmF2YVNjcmlwdCBQ Uk9DCiAgICAgcHVzaCByYnAKLSAgICBtb3YgcmJwLCByYXggOyBTYXZlIHByZXZpb3VzIGZyYW1l IHBvaW50ZXIKKyAgICBtb3YgcmF4LCByYnAgOyBTYXZlIHByZXZpb3VzIGZyYW1lIHBvaW50ZXIK ICAgICBtb3YgcmJwLCByc3AKICAgICBwdXNoIHIxMgogICAgIHB1c2ggcjEzCiAgICAgcHVzaCBy MTQKICAgICBwdXNoIHIxNQogICAgIHB1c2ggcmJ4CisgICAgcHVzaCByc2kKKyAgICBwdXNoIHJk aQogCiAgICAgOyBKSVQgb3BlcmF0aW9ucyBjYW4gdXNlIHVwIHRvIDYgYXJncyAoNCBpbiByZWdp c3RlcnMgYW5kIDIgb24gdGhlIHN0YWNrKS4KICAgICA7IEluIGFkZGl0aW9uLCBYODZfNjQgQUJJ IHNwZWNpZmllcyB0aGF0IHRoZSB3b3JzZSBjYXNlIHN0YWNrIGFsaWdubWVudApAQCAtNTMsNiAr NTUsOCBAQCBjYWxsVG9KYXZhU2NyaXB0IFBST0MKICAgICBtb3YgcjE1LCAwRkZGRjAwMDAwMDAw MDAwMmgKICAgICBjYWxsIHJjeAogICAgIGFkZCByc3AsIDI4aAorICAgIHBvcCByZGkKKyAgICBw b3AgcnNpCiAgICAgcG9wIHJieAogICAgIHBvcCByMTUKICAgICBwb3AgcjE0CkBAIC02NCw2ICs2 OCw4IEBAIGNhbGxUb0phdmFTY3JpcHQgRU5EUAogCiByZXR1cm5Gcm9tSmF2YVNjcmlwdCBQUk9D CiAgICAgYWRkIHJzcCwgMjhoCisgICAgcG9wIHJkaQorICAgIHBvcCByc2kKICAgICBwb3AgcmJ4 CiAgICAgcG9wIHIxNQogICAgIHBvcCByMTQKQEAgLTc0LDggKzgwLDggQEAgcmV0dXJuRnJvbUph dmFTY3JpcHQgUFJPQwogcmV0dXJuRnJvbUphdmFTY3JpcHQgRU5EUAogCQogZ2V0SG9zdENhbGxS ZXR1cm5WYWx1ZSBQUk9DCi0gICAgc3ViIHIxMywgNDAKLSAgICBtb3YgcjEzLCByZGkKKyAgICBt b3YgcmJwLCBbcmJwXSA7IENhbGxGcmFtZQorICAgIG1vdiByY3gsIHJicCA7IHJjeCBpcyBmaXJz dCBhcmd1bWVudCByZWdpc3RlciBvbiBXaW5kb3dzCiAgICAgam1wIGdldEhvc3RDYWxsUmV0dXJu VmFsdWVXaXRoRXhlY1N0YXRlCiBnZXRIb3N0Q2FsbFJldHVyblZhbHVlIEVORFAKIAo= 217094 2013-11-15 16:07:15 -0800 2013-11-15 16:28:39 -0800 Patch bug-124409-20131116010528.patch text/plain 5727 peavo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU5MzY3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDEzLTExLTE1ICBwZWF2b0BvdXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgorCisg ICAgICAgIFtXaW5dIEphdmFTY3JpcHQgY3Jhc2hlcyBvbiA2NC1iaXQgd2l0aCBKSVQgZW5hYmxl ZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNDQw OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXNl IGFyZSBpc3N1ZXMgZm91bmQgd2l0aCBKSVQgb24gNjQtYml0OgorICAgICAgICAtIFRoZSByZWdp c3RlcnMgcnNpIGFuZCByZGkgaW4gY2FsbFRvSmF2YVNjcmlwdCBuZWVkcyB0byBiZSBzYXZlZCBh bmQgcmVzdG9yZWQuIFRoaXMgaXMgcmVxdWlyZWQgYnkgdGhlIFdpbmRvd3MgNjQtYml0IEFCSS4K KyAgICAgICAgLSBUaGUgZ2V0SG9zdENhbGxSZXR1cm5WYWx1ZSBmdW5jdGlvbiBuZWVkcyB0byBi ZSB1cGRhdGVkIGFjY29yZGluZyB0byBpdCdzIEdDQyBjb3VudGVycGFydC4KKyAgICAgICAgLSBU aGUgcG9rZSBhcmd1bWVudCBvZmZzZXQgbmVlZHMgdG8gYmUgMjBoLCBiZWNhdXNlIFdpbmRvd3Mg NjQtYml0IEFCSSByZXF1aXJlcyBzdGFjayBzcGFjZSBhbGxvY2F0ZWQgZm9yIHRoZSA0IGFyZ3Vt ZW50IHJlZ2lzdGVycy4KKworICAgICAgICAqIEphdmFTY3JpcHRDb3JlLnZjeHByb2ovSmF2YVNj cmlwdENvcmUudmN4cHJvajogUmUtYWRkZWQgSklUU3R1YnNNU1ZDNjQuYXNtIHRvIHByb2plY3Qu CisgICAgICAgICogaml0L0NDYWxsSGVscGVycy5oOiBTZXQgcG9rZSBhcmd1bWVudCBvZmZzZXQu CisgICAgICAgIChKU0M6OkNDYWxsSGVscGVyczo6c2V0dXBBcmd1bWVudHMpOiBDb21waWxlIGZp eCwgYWRkZWQgbmVlZGVkIG1ldGhvZC4KKyAgICAgICAgKiBqaXQvSklUU3R1YnNNU1ZDNjQuYXNt OiBTYXZlIGFuZCByZXN0b3JlIHJlZ2lzdGVycyByc2kgYW5kIHJkaS4KKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBVcGRhdGUgZ2V0SG9zdENhbGxSZXR1cm5WYWx1ZSBhY2NvcmRp bmcgdG8gdGhlIEdDQyB2ZXJzaW9uLgorCiAyMDEzLTExLTE1ICBNYXJrIEhhaG5lbmJlcmcgIDxt aGFobmVuYmVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIEpTQ2h1bmsKSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS52Y3hwcm9qL0phdmFTY3JpcHRDb3Jl LnZjeHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRD b3JlLnZjeHByb2ovSmF2YVNjcmlwdENvcmUudmN4cHJvagkocmV2aXNpb24gMTU5MzY3KQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnZjeHByb2ovSmF2YVNjcmlwdENv cmUudmN4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMTMxMCwxNSArMTMxMCwxMSBAQAogICA8SXRl bUdyb3VwPg0KICAgICA8TUFTTSBJbmNsdWRlPSIuLlxqaXRcSklUU3R1YnNNU1ZDNjQuYXNtIj4N CiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0aW9uKXwk KFBsYXRmb3JtKSc9PSdSZWxlYXNlX1dpbkNhaXJvfFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRGcm9t QnVpbGQ+DQotICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJh dGlvbil8JChQbGF0Zm9ybSknPT0nUmVsZWFzZV9XaW5DYWlyb3x4NjQnIj50cnVlPC9FeGNsdWRl ZEZyb21CdWlsZD4NCiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25m aWd1cmF0aW9uKXwkKFBsYXRmb3JtKSc9PSdSZWxlYXNlfFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRG cm9tQnVpbGQ+DQotICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmln dXJhdGlvbil8JChQbGF0Zm9ybSknPT0nUmVsZWFzZXx4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21C dWlsZD4NCiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0 aW9uKXwkKFBsYXRmb3JtKSc9PSdQcm9kdWN0aW9ufFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRGcm9t QnVpbGQ+DQogICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJh dGlvbil8JChQbGF0Zm9ybSknPT0nUHJvZHVjdGlvbnx4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21C dWlsZD4NCiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0 aW9uKXwkKFBsYXRmb3JtKSc9PSdEZWJ1Z19XaW5DYWlyb3xXaW4zMiciPnRydWU8L0V4Y2x1ZGVk RnJvbUJ1aWxkPg0KLSAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZp Z3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J0RlYnVnX1dpbkNhaXJvfHg2NCciPnRydWU8L0V4Y2x1 ZGVkRnJvbUJ1aWxkPg0KICAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENv bmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J0RlYnVnfFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRG cm9tQnVpbGQ+DQotICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmln dXJhdGlvbil8JChQbGF0Zm9ybSknPT0nRGVidWd8eDY0JyI+dHJ1ZTwvRXhjbHVkZWRGcm9tQnVp bGQ+DQogICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlv bil8JChQbGF0Zm9ybSknPT0nRGVidWdTdWZmaXh8V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21C dWlsZD4NCiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0 aW9uKXwkKFBsYXRmb3JtKSc9PSdEZWJ1Z1N1ZmZpeHx4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21C dWlsZD4NCiAgICAgPC9NQVNNPg0KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQ0Nh bGxIZWxwZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9DQ2Fs bEhlbHBlcnMuaAkocmV2aXNpb24gMTU5MzY3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2pp dC9DQ2FsbEhlbHBlcnMuaAkod29ya2luZyBjb3B5KQpAQCAtNzMwLDcgKzczMCw3IEBAIHB1Ymxp YzoKICAgICAgICAgc2V0dXBUaHJlZVN0dWJBcmdzR1BSPEdQUkluZm86OmFyZ3VtZW50R1BSMSwg R1BSSW5mbzo6YXJndW1lbnRHUFIyLCBHUFJJbmZvOjphcmd1bWVudEdQUjM+KGFyZzEsIGFyZzIs IGFyZzMpOwogICAgIH0KIAotI2lmIENQVShNSVBTKQorI2lmIENQVShNSVBTKSB8fCBPUyhXSU5E T1dTKSAmJiBDUFUoWDg2XzY0KQogI2RlZmluZSBQT0tFX0FSR1VNRU5UX09GRlNFVCA0CiAjZWxz ZQogI2RlZmluZSBQT0tFX0FSR1VNRU5UX09GRlNFVCAwCkBAIC05NjIsNyArOTYyLDE1IEBAIHB1 YmxpYzoKICAgICAgICAgbW92ZShhcmcyLCBHUFJJbmZvOjphcmd1bWVudEdQUjEpOwogICAgICAg ICBtb3ZlKGFyZzQsIEdQUkluZm86OmFyZ3VtZW50R1BSMyk7CiAgICAgfQotICAgIAorCisgICAg QUxXQVlTX0lOTElORSB2b2lkIHNldHVwQXJndW1lbnRzKEdQUlJlZyBhcmcxLCBHUFJSZWcgYXJn MiwgVHJ1c3RlZEltbVB0ciBhcmczLCBUcnVzdGVkSW1tMzIgYXJnNCwgR1BSUmVnIGFyZzUpCisg ICAgeworICAgICAgICBwb2tlKGFyZzUsIFBPS0VfQVJHVU1FTlRfT0ZGU0VUKTsKKyAgICAgICAg c2V0dXBUd29TdHViQXJnc0dQUjxHUFJJbmZvOjphcmd1bWVudEdQUjAsIEdQUkluZm86OmFyZ3Vt ZW50R1BSMT4oYXJnMSwgYXJnMik7CisgICAgICAgIG1vdmUoYXJnMywgR1BSSW5mbzo6YXJndW1l bnRHUFIyKTsKKyAgICAgICAgbW92ZShhcmc0LCBHUFJJbmZvOjphcmd1bWVudEdQUjMpOworICAg IH0KKwogICAgIEFMV0FZU19JTkxJTkUgdm9pZCBzZXR1cEFyZ3VtZW50cyhHUFJSZWcgYXJnMSwg R1BSUmVnIGFyZzIsIFRydXN0ZWRJbW1QdHIgYXJnMywgVHJ1c3RlZEltbTMyIGFyZzQsIEdQUlJl ZyBhcmc1LCBHUFJSZWcgYXJnNikKICAgICB7CiAgICAgICAgIHBva2UoYXJnNiwgUE9LRV9BUkdV TUVOVF9PRkZTRVQgKyAxKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1 YnNNU1ZDNjQuYXNtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklU U3R1YnNNU1ZDNjQuYXNtCShyZXZpc2lvbiAxNTkzNjcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvaml0L0pJVFN0dWJzTVNWQzY0LmFzbQkod29ya2luZyBjb3B5KQpAQCAtMzIsNyArMzIsNyBA QCBQVUJMSUMgZ2V0SG9zdENhbGxSZXR1cm5WYWx1ZQogX1RFWFQgICBTRUdNRU5UCiAKIGNhbGxU b0phdmFTY3JpcHQgUFJPQwotICAgIG1vdiByMTAsIHF3b3JkIHB0cltzcF0KKyAgICBtb3YgcjEw LCBxd29yZCBwdHJbZXNwXQogICAgIHB1c2ggcmJwCiAgICAgbW92IHJheCwgcmJwIDsgU2F2ZSBw cmV2aW91cyBmcmFtZSBwb2ludGVyCiAgICAgbW92IHJicCwgcnNwCkBAIC00MSw2ICs0MSw4IEBA IGNhbGxUb0phdmFTY3JpcHQgUFJPQwogICAgIHB1c2ggcjE0CiAgICAgcHVzaCByMTUKICAgICBw dXNoIHJieAorICAgIHB1c2ggcnNpCisgICAgcHVzaCByZGkKIAogICAgIDsgSklUIG9wZXJhdGlv bnMgY2FuIHVzZSB1cCB0byA2IGFyZ3MgKDQgaW4gcmVnaXN0ZXJzIGFuZCAyIG9uIHRoZSBzdGFj aykuCiAgICAgOyBJbiBhZGRpdGlvbiwgWDg2XzY0IEFCSSBzcGVjaWZpZXMgdGhhdCB0aGUgd29y c2UgY2FzZSBzdGFjayBhbGlnbm1lbnQKQEAgLTU1LDYgKzU3LDggQEAgY2FsbFRvSmF2YVNjcmlw dCBQUk9DCiAgICAgbW92IHIxNSwgMEZGRkYwMDAwMDAwMDAwMDJoCiAgICAgY2FsbCByY3gKICAg ICBhZGQgcnNwLCAyOGgKKyAgICBwb3AgcmRpCisgICAgcG9wIHJzaQogICAgIHBvcCByYngKICAg ICBwb3AgcjE1CiAgICAgcG9wIHIxNApAQCAtNjYsNiArNzAsOCBAQCBjYWxsVG9KYXZhU2NyaXB0 IEVORFAKIAogcmV0dXJuRnJvbUphdmFTY3JpcHQgUFJPQwogICAgIGFkZCByc3AsIDI4aAorICAg IHBvcCByZGkKKyAgICBwb3AgcnNpCiAgICAgcG9wIHJieAogICAgIHBvcCByMTUKICAgICBwb3Ag cjE0CkBAIC03Niw4ICs4Miw4IEBAIHJldHVybkZyb21KYXZhU2NyaXB0IFBST0MKIHJldHVybkZy b21KYXZhU2NyaXB0IEVORFAKIAkKIGdldEhvc3RDYWxsUmV0dXJuVmFsdWUgUFJPQwotICAgIHN1 YiByMTMsIDQwCi0gICAgbW92IHIxMywgcmRpCisgICAgbW92IHJicCwgW3JicF0gOyBDYWxsRnJh bWUKKyAgICBtb3YgcmN4LCByYnAgOyByY3ggaXMgZmlyc3QgYXJndW1lbnQgcmVnaXN0ZXIgb24g V2luZG93cwogICAgIGptcCBnZXRIb3N0Q2FsbFJldHVyblZhbHVlV2l0aEV4ZWNTdGF0ZQogZ2V0 SG9zdENhbGxSZXR1cm5WYWx1ZSBFTkRQCiAK 217097 2013-11-15 16:28:48 -0800 2013-11-15 16:32:28 -0800 Patch bug-124409-20131116012701.patch text/plain 5949 peavo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU5MzY3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDEzLTExLTE1ICBwZWF2b0BvdXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgorCisg ICAgICAgIFtXaW5dIEphdmFTY3JpcHQgY3Jhc2hlcyBvbiA2NC1iaXQgd2l0aCBKSVQgZW5hYmxl ZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNDQw OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXNl IGFyZSBpc3N1ZXMgZm91bmQgd2l0aCBKSVQgb24gNjQtYml0OgorICAgICAgICAtIFRoZSByZWdp c3RlcnMgcnNpIGFuZCByZGkgaW4gY2FsbFRvSmF2YVNjcmlwdCBuZWVkcyB0byBiZSBzYXZlZCBh bmQgcmVzdG9yZWQuIFRoaXMgaXMgcmVxdWlyZWQgYnkgdGhlIFdpbmRvd3MgNjQtYml0IEFCSS4K KyAgICAgICAgLSBUaGUgZ2V0SG9zdENhbGxSZXR1cm5WYWx1ZSBmdW5jdGlvbiBuZWVkcyB0byBi ZSB1cGRhdGVkIGFjY29yZGluZyB0byBpdCdzIEdDQyBjb3VudGVycGFydC4KKyAgICAgICAgLSBU aGUgcG9rZSBhcmd1bWVudCBvZmZzZXQgbmVlZHMgdG8gYmUgMjBoLCBiZWNhdXNlIFdpbmRvd3Mg NjQtYml0IEFCSSByZXF1aXJlcyBzdGFjayBzcGFjZSBhbGxvY2F0ZWQgZm9yIHRoZSA0IGFyZ3Vt ZW50IHJlZ2lzdGVycy4KKworICAgICAgICAqIEphdmFTY3JpcHRDb3JlLnZjeHByb2ovSmF2YVNj cmlwdENvcmUudmN4cHJvajogUmUtYWRkZWQgSklUU3R1YnNNU1ZDNjQuYXNtIHRvIHByb2plY3Qu CisgICAgICAgICogaml0L0NDYWxsSGVscGVycy5oOiBTZXQgcG9rZSBhcmd1bWVudCBvZmZzZXQu CisgICAgICAgIChKU0M6OkNDYWxsSGVscGVyczo6c2V0dXBBcmd1bWVudHMpOiBDb21waWxlIGZp eCwgYWRkZWQgbmVlZGVkIG1ldGhvZC4KKyAgICAgICAgKiBqaXQvSklUU3R1YnNNU1ZDNjQuYXNt OiBTYXZlIGFuZCByZXN0b3JlIHJlZ2lzdGVycyByc2kgYW5kIHJkaS4KKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBVcGRhdGUgZ2V0SG9zdENhbGxSZXR1cm5WYWx1ZSBhY2NvcmRp bmcgdG8gdGhlIEdDQyB2ZXJzaW9uLgorCiAyMDEzLTExLTE1ICBNYXJrIEhhaG5lbmJlcmcgIDxt aGFobmVuYmVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIEpTQ2h1bmsKSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS52Y3hwcm9qL0phdmFTY3JpcHRDb3Jl LnZjeHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRD b3JlLnZjeHByb2ovSmF2YVNjcmlwdENvcmUudmN4cHJvagkocmV2aXNpb24gMTU5MzY3KQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnZjeHByb2ovSmF2YVNjcmlwdENv cmUudmN4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMTMxMCwxNSArMTMxMCwxMSBAQAogICA8SXRl bUdyb3VwPg0KICAgICA8TUFTTSBJbmNsdWRlPSIuLlxqaXRcSklUU3R1YnNNU1ZDNjQuYXNtIj4N CiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0aW9uKXwk KFBsYXRmb3JtKSc9PSdSZWxlYXNlX1dpbkNhaXJvfFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRGcm9t QnVpbGQ+DQotICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJh dGlvbil8JChQbGF0Zm9ybSknPT0nUmVsZWFzZV9XaW5DYWlyb3x4NjQnIj50cnVlPC9FeGNsdWRl ZEZyb21CdWlsZD4NCiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25m aWd1cmF0aW9uKXwkKFBsYXRmb3JtKSc9PSdSZWxlYXNlfFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRG cm9tQnVpbGQ+DQotICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmln dXJhdGlvbil8JChQbGF0Zm9ybSknPT0nUmVsZWFzZXx4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21C dWlsZD4NCiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0 aW9uKXwkKFBsYXRmb3JtKSc9PSdQcm9kdWN0aW9ufFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRGcm9t QnVpbGQ+DQogICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJh dGlvbil8JChQbGF0Zm9ybSknPT0nUHJvZHVjdGlvbnx4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21C dWlsZD4NCiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0 aW9uKXwkKFBsYXRmb3JtKSc9PSdEZWJ1Z19XaW5DYWlyb3xXaW4zMiciPnRydWU8L0V4Y2x1ZGVk RnJvbUJ1aWxkPg0KLSAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZp Z3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J0RlYnVnX1dpbkNhaXJvfHg2NCciPnRydWU8L0V4Y2x1 ZGVkRnJvbUJ1aWxkPg0KICAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENv bmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J0RlYnVnfFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRG cm9tQnVpbGQ+DQotICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmln dXJhdGlvbil8JChQbGF0Zm9ybSknPT0nRGVidWd8eDY0JyI+dHJ1ZTwvRXhjbHVkZWRGcm9tQnVp bGQ+DQogICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlv bil8JChQbGF0Zm9ybSknPT0nRGVidWdTdWZmaXh8V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21C dWlsZD4NCiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0 aW9uKXwkKFBsYXRmb3JtKSc9PSdEZWJ1Z1N1ZmZpeHx4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21C dWlsZD4NCiAgICAgPC9NQVNNPg0KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQ0Nh bGxIZWxwZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9DQ2Fs bEhlbHBlcnMuaAkocmV2aXNpb24gMTU5MzY3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2pp dC9DQ2FsbEhlbHBlcnMuaAkod29ya2luZyBjb3B5KQpAQCAtNzMwLDcgKzczMCw3IEBAIHB1Ymxp YzoKICAgICAgICAgc2V0dXBUaHJlZVN0dWJBcmdzR1BSPEdQUkluZm86OmFyZ3VtZW50R1BSMSwg R1BSSW5mbzo6YXJndW1lbnRHUFIyLCBHUFJJbmZvOjphcmd1bWVudEdQUjM+KGFyZzEsIGFyZzIs IGFyZzMpOwogICAgIH0KIAotI2lmIENQVShNSVBTKQorI2lmIENQVShNSVBTKSB8fCBPUyhXSU5E T1dTKSAmJiBDUFUoWDg2XzY0KQogI2RlZmluZSBQT0tFX0FSR1VNRU5UX09GRlNFVCA0CiAjZWxz ZQogI2RlZmluZSBQT0tFX0FSR1VNRU5UX09GRlNFVCAwCkBAIC05NjIsNyArOTYyLDcgQEAgcHVi bGljOgogICAgICAgICBtb3ZlKGFyZzIsIEdQUkluZm86OmFyZ3VtZW50R1BSMSk7CiAgICAgICAg IG1vdmUoYXJnNCwgR1BSSW5mbzo6YXJndW1lbnRHUFIzKTsKICAgICB9Ci0gICAgCisKICAgICBB TFdBWVNfSU5MSU5FIHZvaWQgc2V0dXBBcmd1bWVudHMoR1BSUmVnIGFyZzEsIEdQUlJlZyBhcmcy LCBUcnVzdGVkSW1tUHRyIGFyZzMsIFRydXN0ZWRJbW0zMiBhcmc0LCBHUFJSZWcgYXJnNSwgR1BS UmVnIGFyZzYpCiAgICAgewogICAgICAgICBwb2tlKGFyZzYsIFBPS0VfQVJHVU1FTlRfT0ZGU0VU ICsgMSk7CkBAIC0xNDg2LDYgKzE0ODYsMTQgQEAgcHVibGljOgogICAgICAgICBwb2tlKGFyZzQs IFBPS0VfQVJHVU1FTlRfT0ZGU0VUKTsKICAgICAgICAgc2V0dXBBcmd1bWVudHNXaXRoRXhlY1N0 YXRlKGFyZzEsIGFyZzIsIGFyZzMpOwogICAgIH0KKworICAgIEFMV0FZU19JTkxJTkUgdm9pZCBz ZXR1cEFyZ3VtZW50cyhHUFJSZWcgYXJnMSwgR1BSUmVnIGFyZzIsIFRydXN0ZWRJbW1QdHIgYXJn MywgVHJ1c3RlZEltbTMyIGFyZzQsIEdQUlJlZyBhcmc1KQorICAgIHsKKyAgICAgICAgcG9rZShh cmc1LCBQT0tFX0FSR1VNRU5UX09GRlNFVCk7CisgICAgICAgIHNldHVwVHdvU3R1YkFyZ3NHUFI8 R1BSSW5mbzo6YXJndW1lbnRHUFIwLCBHUFJJbmZvOjphcmd1bWVudEdQUjE+KGFyZzEsIGFyZzIp OworICAgICAgICBtb3ZlKGFyZzMsIEdQUkluZm86OmFyZ3VtZW50R1BSMik7CisgICAgICAgIG1v dmUoYXJnNCwgR1BSSW5mbzo6YXJndW1lbnRHUFIzKTsKKyAgICB9CiAjZW5kaWYgLy8gTlVNQkVS X09GX0FSR1VNRU5UX1JFR0lTVEVSUyA9PSA0CiAKICNpZiBOVU1CRVJfT0ZfQVJHVU1FTlRfUkVH SVNURVJTID49IDUKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnNNU1ZD NjQuYXNtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnNN U1ZDNjQuYXNtCShyZXZpc2lvbiAxNTkzNjcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0 L0pJVFN0dWJzTVNWQzY0LmFzbQkod29ya2luZyBjb3B5KQpAQCAtMzIsNyArMzIsNyBAQCBQVUJM SUMgZ2V0SG9zdENhbGxSZXR1cm5WYWx1ZQogX1RFWFQgICBTRUdNRU5UCiAKIGNhbGxUb0phdmFT Y3JpcHQgUFJPQwotICAgIG1vdiByMTAsIHF3b3JkIHB0cltzcF0KKyAgICBtb3YgcjEwLCBxd29y ZCBwdHJbcnNwXQogICAgIHB1c2ggcmJwCiAgICAgbW92IHJheCwgcmJwIDsgU2F2ZSBwcmV2aW91 cyBmcmFtZSBwb2ludGVyCiAgICAgbW92IHJicCwgcnNwCkBAIC00MSw2ICs0MSw4IEBAIGNhbGxU b0phdmFTY3JpcHQgUFJPQwogICAgIHB1c2ggcjE0CiAgICAgcHVzaCByMTUKICAgICBwdXNoIHJi eAorICAgIHB1c2ggcnNpCisgICAgcHVzaCByZGkKIAogICAgIDsgSklUIG9wZXJhdGlvbnMgY2Fu IHVzZSB1cCB0byA2IGFyZ3MgKDQgaW4gcmVnaXN0ZXJzIGFuZCAyIG9uIHRoZSBzdGFjaykuCiAg ICAgOyBJbiBhZGRpdGlvbiwgWDg2XzY0IEFCSSBzcGVjaWZpZXMgdGhhdCB0aGUgd29yc2UgY2Fz ZSBzdGFjayBhbGlnbm1lbnQKQEAgLTU1LDYgKzU3LDggQEAgY2FsbFRvSmF2YVNjcmlwdCBQUk9D CiAgICAgbW92IHIxNSwgMEZGRkYwMDAwMDAwMDAwMDJoCiAgICAgY2FsbCByY3gKICAgICBhZGQg cnNwLCAyOGgKKyAgICBwb3AgcmRpCisgICAgcG9wIHJzaQogICAgIHBvcCByYngKICAgICBwb3Ag cjE1CiAgICAgcG9wIHIxNApAQCAtNjYsNiArNzAsOCBAQCBjYWxsVG9KYXZhU2NyaXB0IEVORFAK IAogcmV0dXJuRnJvbUphdmFTY3JpcHQgUFJPQwogICAgIGFkZCByc3AsIDI4aAorICAgIHBvcCBy ZGkKKyAgICBwb3AgcnNpCiAgICAgcG9wIHJieAogICAgIHBvcCByMTUKICAgICBwb3AgcjE0CkBA IC03Niw4ICs4Miw4IEBAIHJldHVybkZyb21KYXZhU2NyaXB0IFBST0MKIHJldHVybkZyb21KYXZh U2NyaXB0IEVORFAKIAkKIGdldEhvc3RDYWxsUmV0dXJuVmFsdWUgUFJPQwotICAgIHN1YiByMTMs IDQwCi0gICAgbW92IHIxMywgcmRpCisgICAgbW92IHJicCwgW3JicF0gOyBDYWxsRnJhbWUKKyAg ICBtb3YgcmN4LCByYnAgOyByY3ggaXMgZmlyc3QgYXJndW1lbnQgcmVnaXN0ZXIgb24gV2luZG93 cwogICAgIGptcCBnZXRIb3N0Q2FsbFJldHVyblZhbHVlV2l0aEV4ZWNTdGF0ZQogZ2V0SG9zdENh bGxSZXR1cm5WYWx1ZSBFTkRQCiAK 217099 2013-11-15 16:32:37 -0800 2013-11-15 19:23:31 -0800 Patch bug-124409-20131116013051.patch text/plain 5636 peavo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU5MzY3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDEzLTExLTE1ICBwZWF2b0BvdXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgorCisg ICAgICAgIFtXaW5dIEphdmFTY3JpcHQgY3Jhc2hlcyBvbiA2NC1iaXQgd2l0aCBKSVQgZW5hYmxl ZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNDQw OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXNl IGFyZSBpc3N1ZXMgZm91bmQgd2l0aCBKSVQgb24gNjQtYml0OgorICAgICAgICAtIFRoZSByZWdp c3RlcnMgcnNpIGFuZCByZGkgaW4gY2FsbFRvSmF2YVNjcmlwdCBuZWVkcyB0byBiZSBzYXZlZCBh bmQgcmVzdG9yZWQuIFRoaXMgaXMgcmVxdWlyZWQgYnkgdGhlIFdpbmRvd3MgNjQtYml0IEFCSS4K KyAgICAgICAgLSBUaGUgZ2V0SG9zdENhbGxSZXR1cm5WYWx1ZSBmdW5jdGlvbiBuZWVkcyB0byBi ZSB1cGRhdGVkIGFjY29yZGluZyB0byBpdCdzIEdDQyBjb3VudGVycGFydC4KKyAgICAgICAgLSBU aGUgcG9rZSBhcmd1bWVudCBvZmZzZXQgbmVlZHMgdG8gYmUgMjBoLCBiZWNhdXNlIFdpbmRvd3Mg NjQtYml0IEFCSSByZXF1aXJlcyBzdGFjayBzcGFjZSBhbGxvY2F0ZWQgZm9yIHRoZSA0IGFyZ3Vt ZW50IHJlZ2lzdGVycy4KKworICAgICAgICAqIEphdmFTY3JpcHRDb3JlLnZjeHByb2ovSmF2YVNj cmlwdENvcmUudmN4cHJvajogUmUtYWRkZWQgSklUU3R1YnNNU1ZDNjQuYXNtIHRvIHByb2plY3Qu CisgICAgICAgICogaml0L0NDYWxsSGVscGVycy5oOiBTZXQgcG9rZSBhcmd1bWVudCBvZmZzZXQu CisgICAgICAgIChKU0M6OkNDYWxsSGVscGVyczo6c2V0dXBBcmd1bWVudHMpOiBDb21waWxlIGZp eCwgYWRkZWQgbmVlZGVkIG1ldGhvZC4KKyAgICAgICAgKiBqaXQvSklUU3R1YnNNU1ZDNjQuYXNt OiBTYXZlIGFuZCByZXN0b3JlIHJlZ2lzdGVycyByc2kgYW5kIHJkaS4KKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBVcGRhdGUgZ2V0SG9zdENhbGxSZXR1cm5WYWx1ZSBhY2NvcmRp bmcgdG8gdGhlIEdDQyB2ZXJzaW9uLgorCiAyMDEzLTExLTE1ICBNYXJrIEhhaG5lbmJlcmcgIDxt aGFobmVuYmVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIEpTQ2h1bmsKSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS52Y3hwcm9qL0phdmFTY3JpcHRDb3Jl LnZjeHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRD b3JlLnZjeHByb2ovSmF2YVNjcmlwdENvcmUudmN4cHJvagkocmV2aXNpb24gMTU5MzY3KQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnZjeHByb2ovSmF2YVNjcmlwdENv cmUudmN4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMTMxMCwxNSArMTMxMCwxMSBAQAogICA8SXRl bUdyb3VwPg0KICAgICA8TUFTTSBJbmNsdWRlPSIuLlxqaXRcSklUU3R1YnNNU1ZDNjQuYXNtIj4N CiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0aW9uKXwk KFBsYXRmb3JtKSc9PSdSZWxlYXNlX1dpbkNhaXJvfFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRGcm9t QnVpbGQ+DQotICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJh dGlvbil8JChQbGF0Zm9ybSknPT0nUmVsZWFzZV9XaW5DYWlyb3x4NjQnIj50cnVlPC9FeGNsdWRl ZEZyb21CdWlsZD4NCiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25m aWd1cmF0aW9uKXwkKFBsYXRmb3JtKSc9PSdSZWxlYXNlfFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRG cm9tQnVpbGQ+DQotICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmln dXJhdGlvbil8JChQbGF0Zm9ybSknPT0nUmVsZWFzZXx4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21C dWlsZD4NCiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0 aW9uKXwkKFBsYXRmb3JtKSc9PSdQcm9kdWN0aW9ufFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRGcm9t QnVpbGQ+DQogICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJh dGlvbil8JChQbGF0Zm9ybSknPT0nUHJvZHVjdGlvbnx4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21C dWlsZD4NCiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0 aW9uKXwkKFBsYXRmb3JtKSc9PSdEZWJ1Z19XaW5DYWlyb3xXaW4zMiciPnRydWU8L0V4Y2x1ZGVk RnJvbUJ1aWxkPg0KLSAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZp Z3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J0RlYnVnX1dpbkNhaXJvfHg2NCciPnRydWU8L0V4Y2x1 ZGVkRnJvbUJ1aWxkPg0KICAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENv bmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J0RlYnVnfFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRG cm9tQnVpbGQ+DQotICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmln dXJhdGlvbil8JChQbGF0Zm9ybSknPT0nRGVidWd8eDY0JyI+dHJ1ZTwvRXhjbHVkZWRGcm9tQnVp bGQ+DQogICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlv bil8JChQbGF0Zm9ybSknPT0nRGVidWdTdWZmaXh8V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21C dWlsZD4NCiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0 aW9uKXwkKFBsYXRmb3JtKSc9PSdEZWJ1Z1N1ZmZpeHx4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21C dWlsZD4NCiAgICAgPC9NQVNNPg0KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQ0Nh bGxIZWxwZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9DQ2Fs bEhlbHBlcnMuaAkocmV2aXNpb24gMTU5MzY3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2pp dC9DQ2FsbEhlbHBlcnMuaAkod29ya2luZyBjb3B5KQpAQCAtNzMwLDcgKzczMCw3IEBAIHB1Ymxp YzoKICAgICAgICAgc2V0dXBUaHJlZVN0dWJBcmdzR1BSPEdQUkluZm86OmFyZ3VtZW50R1BSMSwg R1BSSW5mbzo6YXJndW1lbnRHUFIyLCBHUFJJbmZvOjphcmd1bWVudEdQUjM+KGFyZzEsIGFyZzIs IGFyZzMpOwogICAgIH0KIAotI2lmIENQVShNSVBTKQorI2lmIENQVShNSVBTKSB8fCAoT1MoV0lO RE9XUykgJiYgQ1BVKFg4Nl82NCkpCiAjZGVmaW5lIFBPS0VfQVJHVU1FTlRfT0ZGU0VUIDQKICNl bHNlCiAjZGVmaW5lIFBPS0VfQVJHVU1FTlRfT0ZGU0VUIDAKQEAgLTE0ODYsNiArMTQ4NiwxNCBA QCBwdWJsaWM6CiAgICAgICAgIHBva2UoYXJnNCwgUE9LRV9BUkdVTUVOVF9PRkZTRVQpOwogICAg ICAgICBzZXR1cEFyZ3VtZW50c1dpdGhFeGVjU3RhdGUoYXJnMSwgYXJnMiwgYXJnMyk7CiAgICAg fQorCisgICAgQUxXQVlTX0lOTElORSB2b2lkIHNldHVwQXJndW1lbnRzKEdQUlJlZyBhcmcxLCBH UFJSZWcgYXJnMiwgVHJ1c3RlZEltbVB0ciBhcmczLCBUcnVzdGVkSW1tMzIgYXJnNCwgR1BSUmVn IGFyZzUpCisgICAgeworICAgICAgICBwb2tlKGFyZzUsIFBPS0VfQVJHVU1FTlRfT0ZGU0VUKTsK KyAgICAgICAgc2V0dXBUd29TdHViQXJnc0dQUjxHUFJJbmZvOjphcmd1bWVudEdQUjAsIEdQUklu Zm86OmFyZ3VtZW50R1BSMT4oYXJnMSwgYXJnMik7CisgICAgICAgIG1vdmUoYXJnMywgR1BSSW5m bzo6YXJndW1lbnRHUFIyKTsKKyAgICAgICAgbW92ZShhcmc0LCBHUFJJbmZvOjphcmd1bWVudEdQ UjMpOworICAgIH0KICNlbmRpZiAvLyBOVU1CRVJfT0ZfQVJHVU1FTlRfUkVHSVNURVJTID09IDQK IAogI2lmIE5VTUJFUl9PRl9BUkdVTUVOVF9SRUdJU1RFUlMgPj0gNQpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVic01TVkM2NC5hc20KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVic01TVkM2NC5hc20JKHJldmlzaW9uIDE1OTM2NykK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnNNU1ZDNjQuYXNtCSh3b3JraW5n IGNvcHkpCkBAIC0zMiw3ICszMiw3IEBAIFBVQkxJQyBnZXRIb3N0Q2FsbFJldHVyblZhbHVlCiBf VEVYVCAgIFNFR01FTlQKIAogY2FsbFRvSmF2YVNjcmlwdCBQUk9DCi0gICAgbW92IHIxMCwgcXdv cmQgcHRyW3NwXQorICAgIG1vdiByMTAsIHF3b3JkIHB0cltyc3BdCiAgICAgcHVzaCByYnAKICAg ICBtb3YgcmF4LCByYnAgOyBTYXZlIHByZXZpb3VzIGZyYW1lIHBvaW50ZXIKICAgICBtb3YgcmJw LCByc3AKQEAgLTQxLDYgKzQxLDggQEAgY2FsbFRvSmF2YVNjcmlwdCBQUk9DCiAgICAgcHVzaCBy MTQKICAgICBwdXNoIHIxNQogICAgIHB1c2ggcmJ4CisgICAgcHVzaCByc2kKKyAgICBwdXNoIHJk aQogCiAgICAgOyBKSVQgb3BlcmF0aW9ucyBjYW4gdXNlIHVwIHRvIDYgYXJncyAoNCBpbiByZWdp c3RlcnMgYW5kIDIgb24gdGhlIHN0YWNrKS4KICAgICA7IEluIGFkZGl0aW9uLCBYODZfNjQgQUJJ IHNwZWNpZmllcyB0aGF0IHRoZSB3b3JzZSBjYXNlIHN0YWNrIGFsaWdubWVudApAQCAtNTUsNiAr NTcsOCBAQCBjYWxsVG9KYXZhU2NyaXB0IFBST0MKICAgICBtb3YgcjE1LCAwRkZGRjAwMDAwMDAw MDAwMmgKICAgICBjYWxsIHJjeAogICAgIGFkZCByc3AsIDI4aAorICAgIHBvcCByZGkKKyAgICBw b3AgcnNpCiAgICAgcG9wIHJieAogICAgIHBvcCByMTUKICAgICBwb3AgcjE0CkBAIC02Niw2ICs3 MCw4IEBAIGNhbGxUb0phdmFTY3JpcHQgRU5EUAogCiByZXR1cm5Gcm9tSmF2YVNjcmlwdCBQUk9D CiAgICAgYWRkIHJzcCwgMjhoCisgICAgcG9wIHJkaQorICAgIHBvcCByc2kKICAgICBwb3AgcmJ4 CiAgICAgcG9wIHIxNQogICAgIHBvcCByMTQKQEAgLTc2LDggKzgyLDggQEAgcmV0dXJuRnJvbUph dmFTY3JpcHQgUFJPQwogcmV0dXJuRnJvbUphdmFTY3JpcHQgRU5EUAogCQogZ2V0SG9zdENhbGxS ZXR1cm5WYWx1ZSBQUk9DCi0gICAgc3ViIHIxMywgNDAKLSAgICBtb3YgcjEzLCByZGkKKyAgICBt b3YgcmJwLCBbcmJwXSA7IENhbGxGcmFtZQorICAgIG1vdiByY3gsIHJicCA7IHJjeCBpcyBmaXJz dCBhcmd1bWVudCByZWdpc3RlciBvbiBXaW5kb3dzCiAgICAgam1wIGdldEhvc3RDYWxsUmV0dXJu VmFsdWVXaXRoRXhlY1N0YXRlCiBnZXRIb3N0Q2FsbFJldHVyblZhbHVlIEVORFAKIAo=