Merge commit '0030b3e299e240972c6f3632ea6078a81b3d9c1e'

Author: timschneeb

libjamesdsp/subtree/Main/libjamesdsp/jni/jamesdsp/jdsp/Effects/crossfeed.c

@@ -58,11 +58,13 @@ void CrossfeedEnable(JamesDSPLib *jdsp, char enable)
 		{
 			TwoStageFFTConvolver2x4x2Free(jdsp->advXF.convLong_T_S);
 			free(jdsp->advXF.convLong_T_S);
+			jdsp->advXF.convLong_T_S = NULL;
 		}
 		if (jdsp->advXF.convLong_S_S)
 		{
 			FFTConvolver2x4x2Free(jdsp->advXF.convLong_S_S);
 			free(jdsp->advXF.convLong_S_S);
+			jdsp->advXF.convLong_S_S = NULL;
 		}
 		jdsp->advXF.conv[0] = (FFTConvolver2x4x2 *)malloc(sizeof(FFTConvolver2x4x2));
 		FFTConvolver2x4x2Init(jdsp->advXF.conv[0]);
@@ -139,4 +141,4 @@ void CrossfeedProcess(JamesDSPLib *jdsp, size_t n)
 		FFTConvolver2x4x2Process(jdsp->advXF.conv[jdsp->advXF.mode - 2], jdsp->tmpBuffer[0], jdsp->tmpBuffer[1], jdsp->tmpBuffer[0], jdsp->tmpBuffer[1], (unsigned int)n);
 	else
 		jdsp->advXF.process(jdsp, (unsigned int)n);
-}
+}

libjamesdsp/subtree/Main/libjamesdsp/jni/jamesdsp/jdsp/Effects/liveprogWrapper.c

@@ -154,9 +154,17 @@ void LiveProgProcess(JamesDSPLib *jdsp, size_t n)
 		{
 			*eel->input1 = jdsp->tmpBuffer[0][i];
 			*eel->input2 = jdsp->tmpBuffer[1][i];
-			NSEEL_code_execute(eel->codehandleProcess);
-			jdsp->tmpBuffer[0][i] = (float)*eel->input1;
-			jdsp->tmpBuffer[1][i] = (float)*eel->input2;
+				NSEEL_code_execute(eel->codehandleProcess);
+			    // Prevent broken scripts (returning NaN or inf) causing permanent audio loss
+			    if(isinf((float)*eel->input1) || isnan((float)*eel->input1))
+				jdsp->tmpBuffer[0][i] = 0;
+			    else
+				jdsp->tmpBuffer[0][i] = (float)*eel->input1;
+		
+			    if(isinf((float)*eel->input2) || isnan((float)*eel->input2))
+				jdsp->tmpBuffer[1][i] = 0;
+			    else
+				jdsp->tmpBuffer[1][i] = (float)*eel->input2;
 		}
 	}
 }