Fix potential crashes when using string to equalizer string

james34602 · Feb 8, 2018 · eb33e3a · eb33e3a
1 parent 6912a4b
commit eb33e3a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Audio_Engine/eclipse_libjamesdsp_double/jni/ArbFIRGen.c b/Audio_Engine/eclipse_libjamesdsp_double/jni/ArbFIRGen.c
@@ -370,6 +370,7 @@ void InitArbitraryEq(ArbitraryEq* eqgain, int *filterLength, int isLinearPhase)
     eqgain->freqData = fftw_alloc_complex(eqgain->fLMul2);
     eqgain->filterLength = *filterLength;
     eqgain->isLinearPhase = isLinearPhase;
+	eqgain->nodes = 0;
 	eqgain->nodesCount = 0;
     if (!isLinearPhase)
     {
@@ -548,6 +549,8 @@ void ArbitraryEqString2SortedNodes(ArbitraryEq *eqgain, char *frArbitraryEqStrin
         {
             count++;
             double val = strtod(counter, &counter);
+			if (i == numOfNodes)
+				break;
             if (count % 2)
             {
                 nodes[i]->gain = val;

diff --git a/...pse_libjamesdsp_many_bands_Lollipop_Marshmallow_Nougat_PartialMultithread/jni/ArbFIRGen.c b/...pse_libjamesdsp_many_bands_Lollipop_Marshmallow_Nougat_PartialMultithread/jni/ArbFIRGen.c
@@ -370,6 +370,7 @@ void InitArbitraryEq(ArbitraryEq* eqgain, int *filterLength, int isLinearPhase)
     eqgain->freqData = fftwf_alloc_complex(eqgain->fLMul2);
     eqgain->filterLength = *filterLength;
     eqgain->isLinearPhase = isLinearPhase;
+	eqgain->nodes = 0;
 	eqgain->nodesCount = 0;
     if (!isLinearPhase)
     {
@@ -548,6 +549,8 @@ void ArbitraryEqString2SortedNodes(ArbitraryEq *eqgain, char *frArbitraryEqStrin
         {
             count++;
             float val = strtod(counter, &counter);
+			if (i == numOfNodes)
+				break;
             if (count % 2)
             {
                 nodes[i]->gain = val;